From fdd7037ee55b3587f3c922815e1da9e347d9679d Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Mon, 5 Aug 2024 22:44:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/base/api/domain/LeaseOutDetails.java | 2 +- .../sgzb/common/log/aspect/LogAspect.java | 37 ++++++++++++++++--- .../impl/LeaseOutDetailsServiceImpl.java | 2 +- .../material/domain/PurchaseMacodeInfo.java | 12 ++++++ .../material/PurchaseMacodeInfoMapper.xml | 1 + 5 files changed, 47 insertions(+), 7 deletions(-) diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java index f0fd3062..1e59f687 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java @@ -177,6 +177,6 @@ public class LeaseOutDetails implements Serializable { private Integer num; /** 操作后库存 */ - private String postStoreNum; + private int postStoreNum; } \ No newline at end of file diff --git a/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java b/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java index b27b4f12..c9beda82 100644 --- a/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java +++ b/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java @@ -268,8 +268,8 @@ public class LogAspect BmStorageLog bmStorageLog = new BmStorageLog(); bmStorageLog.setTypeId(Integer.parseInt(machineDto.getTypeId())); bmStorageLog.setTypeName(machineDto.getMaCode()); - bmStorageLog.setPreStoreNum(machineDto.getNum().intValue()); - bmStorageLog.setInNum(machineDto.getPutInStoreNum().intValue()); + bmStorageLog.setPreStoreNum(Objects.isNull(machineDto.getNum()) ? 0 : machineDto.getNum().intValue()); + bmStorageLog.setInNum(Objects.isNull(machineDto.getPutInStoreNum()) ? 0 : machineDto.getPutInStoreNum().intValue()); bmStorageLog.setPostStoreNum(bmStorageLog.getPreStoreNum() + bmStorageLog.getInNum()); bmStorageLogList.add(bmStorageLog); } @@ -279,17 +279,44 @@ public class LogAspect MaInputVO maInputVO = (MaInputVO) joinPoint.getArgs()[0]; for (MaInputRecord maInputRecord : maInputVO.getInputRecordList()) { BmStorageLog bmStorageLog = new BmStorageLog(); - bmStorageLog.setTypeId(maInputRecord.getTypeId().intValue()); + bmStorageLog.setTypeId(Objects.isNull(maInputRecord.getTypeId()) ? 0 : maInputRecord.getTypeId().intValue()); bmStorageLog.setTypeName(maInputRecord.getMaCode()); - bmStorageLog.setPreStoreNum(maInputRecord.getNum().intValue()); - bmStorageLog.setInNum(maInputRecord.getInputNum().intValue()); + bmStorageLog.setPreStoreNum(Objects.isNull(maInputRecord.getNum()) ? 0: maInputRecord.getNum().intValue()); + bmStorageLog.setInNum(Objects.isNull(maInputRecord.getInputNum()) ? 0: maInputRecord.getInputNum().intValue()); bmStorageLog.setPostStoreNum(bmStorageLog.getPreStoreNum() + bmStorageLog.getInNum()); bmStorageLog.setTaskId(String.valueOf(maInputRecord.getTaskId())); bmStorageLogList.add(bmStorageLog); } } // 领料出库 + if (joinPoint.getArgs()[0] instanceof List && + ((List) joinPoint.getArgs()[0]).stream().noneMatch((o -> !(o instanceof LeaseOutDetails)))) { + List leaseOutDetails = (List)joinPoint.getArgs()[0]; + for (LeaseOutDetails lod : leaseOutDetails) { + BmStorageLog bmStorageLog = new BmStorageLog(); + bmStorageLog.setPreStoreNum(lod.getNum()); + bmStorageLog.setOutNum(Objects.isNull(lod.getOutNum()) ? 0 : lod.getOutNum().intValue()); + bmStorageLog.setPostStoreNum(lod.getPostStoreNum()); + bmStorageLogList.add(bmStorageLog); + } + } + if (joinPoint.getArgs()[0] instanceof LeaseOutDetails) { + LeaseOutDetails lod = (LeaseOutDetails)joinPoint.getArgs()[0]; + BmStorageLog bmStorageLog = new BmStorageLog(); + bmStorageLog.setPreStoreNum(lod.getNum()); + bmStorageLog.setOutNum(Objects.isNull(lod.getOutNum()) ? 0 : lod.getOutNum().intValue()); + bmStorageLog.setPostStoreNum(lod.getPostStoreNum()); + bmStorageLogList.add(bmStorageLog); + } // 退料接收-完成退料 + if (joinPoint.getArgs()[0] instanceof LeaseOutDetails) { + LeaseOutDetails lod = (LeaseOutDetails)joinPoint.getArgs()[0]; + BmStorageLog bmStorageLog = new BmStorageLog(); + bmStorageLog.setPreStoreNum(lod.getNum()); + bmStorageLog.setOutNum(Objects.isNull(lod.getOutNum()) ? 0 : lod.getOutNum().intValue()); + bmStorageLog.setPostStoreNum(lod.getPostStoreNum()); + bmStorageLogList.add(bmStorageLog); + } // 二级库出入库 } } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java index bb20754c..7738be23 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java @@ -185,7 +185,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { if (res == 0) { throw new RuntimeException("出库失败,插入结算记录失败"); } - record.setPostStoreNum(String.valueOf(getStorageNum(record))); + record.setPostStoreNum(getStorageNum(record)); } else { return AjaxResult.error("领料出库失败,机具库存不足"); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java index 3505c1a7..78116a02 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java @@ -80,6 +80,10 @@ public class PurchaseMacodeInfo extends BaseEntity @ApiModelProperty(value = "机具ID") private long maId; + /** 实时库存 */ + @ApiModelProperty(value = "实时库存") + private BigDecimal num; + /** 采购数量 */ @ApiModelProperty(value = "采购数量") private Long purchaseNum; @@ -286,6 +290,14 @@ public class PurchaseMacodeInfo extends BaseEntity this.maId = maId; } + public BigDecimal getNum() { + return num; + } + + public void setNum(BigDecimal num) { + this.num = num; + } + public Long getPurchaseNum() { return purchaseNum; } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml index 445008b4..f310d79d 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml @@ -362,6 +362,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pcd.type_id typeId, pcd.task_id taskId, mt.CODE specsCode, + mt.num num, mt1.CODE typeCode, CASE WHEN pmi.ma_code IS NULL THEN