From b0e98c1409054c3749399381d883fb5da0b749cf Mon Sep 17 00:00:00 2001
From: liweidong-hj <liweidong-hj@huafang.com>
Date: Mon, 19 Jan 2026 10:04:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/entity/LdTwoOutStorageDetail.java           |  6 ++++++
 .../service/Impl/LdTwoOutStorageServiceImpl.java     | 12 ++++++++++++
 .../resources/mapper/LdTwoOutStorageDetailMapper.xml |  1 +
 3 files changed, 19 insertions(+)

diff --git a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoOutStorageDetail.java b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoOutStorageDetail.java
index f95a878..aa77f4f 100644
--- a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoOutStorageDetail.java
+++ b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoOutStorageDetail.java
@@ -106,4 +106,10 @@ public class LdTwoOutStorageDetail implements Serializable {
      */
     @TableField("opt_time")
     private Date optTime;
+
+    /**
+     * 库存 出库后剩余数量
+     */
+    @TableField("residue_num")
+    private BigDecimal residueNum;
 }
\ No newline at end of file
diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java
index ef29838..b64ca66 100644
--- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java
+++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java
@@ -109,6 +109,18 @@ public class LdTwoOutStorageServiceImpl extends ServiceImpl<LdTwoOutStorageMappe
             ldTwoOutStorageDetail.setTwoOutDetailCode(serialNumberUtil.generateSimple("SOD"));
             ldTwoOutStorageDetail.setShipperStatus(BatchConstant.NO_SHIPPED_OUT);
             ldTwoOutStorageDetail.setOptTime(new Date());
+            //处理剩余库存
+            BigDecimal num = null;
+            if(BatchConstant.CONSUMER.equals(ldTwoOutStorageDetail.getType())){
+                LdConsumerForm consumerForm = consumerFormService.getById(ldTwoOutStorageDetail.getTwoInventoryId());
+                num = consumerForm.getNum();
+            }else {
+                LdDurableForm durableForm = durableFormService.getById(ldTwoOutStorageDetail.getTwoInventoryId());
+                num = durableForm.getNum();
+            }
+            BigDecimal result = num.subtract(ldTwoOutStorageDetail.getNum());
+            ldTwoOutStorageDetail.setResidueNum(result);
+
             list.add(ldTwoOutStorageDetail);
         }
         boolean saveDetailResult = twoOutStorageDetailService.saveBatch(list);
diff --git a/src/main/resources/mapper/LdTwoOutStorageDetailMapper.xml b/src/main/resources/mapper/LdTwoOutStorageDetailMapper.xml
index ab8a7e7..ade02f1 100644
--- a/src/main/resources/mapper/LdTwoOutStorageDetailMapper.xml
+++ b/src/main/resources/mapper/LdTwoOutStorageDetailMapper.xml
@@ -19,6 +19,7 @@
         <result column="remark" property="remark"/>
         <result column="shipper_status" property="shipperStatus"/>
         <result column="opt_time" property="optTime"/>
+        <result column="residue_num" property="residueNum"/>
     </resultMap>
     <select id="selectByTwoOutStorageId" resultType="com.nov.KgLowDurable.pojo.entity.LdTwoOutStorageDetail">
         select * from ld_two_out_storage_detail where two_out_storage_id = #{twoOutStorageId}