From 29f45e61036e800d2101e1768b48ecd507031175 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Mon, 19 Aug 2024 13:53:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=AE=A1=E6=A0=B8=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java  | 2 ++
 .../main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java | 4 ++--
 .../sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java     | 1 +
 3 files changed, 5 insertions(+), 2 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 546fe56..40c2e99 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
@@ -163,6 +163,8 @@ public class LeaseOutDetails implements Serializable {
     @ApiModelProperty(value = "数量出库 -> 操作前库存量")
     private Integer num;
 
+    /** 操作前库存 */
+    private int preStoreNum;
     /** 操作后库存 */
     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 5907c54..debc989 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
@@ -291,7 +291,7 @@ public class LogAspect
                     bmStorageLog.setTaskId(String.valueOf(lod.getTaskId()));
                     bmStorageLog.setTypeId(lod.getTypeId());
                     bmStorageLog.setTypeName(lod.getMaCode());
-                    bmStorageLog.setPreStoreNum(Objects.isNull(lod.getNum()) ? 0 : lod.getNum().intValue());
+                    bmStorageLog.setPreStoreNum(lod.getPreStoreNum());
                     bmStorageLog.setOutNum(Objects.isNull(lod.getInputNum()) ? 0 : lod.getInputNum().intValue());
                     bmStorageLog.setPostStoreNum(lod.getPostStoreNum());
                     bmStorageLogList.add(bmStorageLog);
@@ -303,7 +303,7 @@ public class LogAspect
                 bmStorageLog.setTaskId(String.valueOf(lod.getTaskId()));
                 bmStorageLog.setTypeId(lod.getTypeId());
                 bmStorageLog.setTypeName(lod.getMaCode());
-                bmStorageLog.setPreStoreNum(lod.getNum());
+                bmStorageLog.setPreStoreNum(lod.getPreStoreNum());
                 bmStorageLog.setOutNum(Objects.isNull(lod.getInputNum()) ? 0 : lod.getInputNum().intValue());
                 bmStorageLog.setPostStoreNum(lod.getPostStoreNum());
                 bmStorageLogList.add(bmStorageLog);
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java
index 85c13fb..32ba8fc 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java
@@ -149,6 +149,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
         try {
             // 1、判断是否重复提交
             res = checkRepeatSubmit(record);
+            record.setPreStoreNum(getStorageNum(record));
             if (res > 0) {
                 if ((record.getManageType() == 1 || record.getManageType() == 2) && record.getInputNum() != null) {
                     record.setOutNum(record.getInputNum().doubleValue());