From 9a59617c3a024b4935781ce639ec0cb866b1f9b8 Mon Sep 17 00:00:00 2001
From: jiang <BnsGit@123!>
Date: Sun, 16 Nov 2025 18:11:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../devchange/mapper/DevChangeMapper.java     |  2 ++
 .../service/DevChangeServiceImpl.java         | 12 ++++++++++
 .../material/devchange/DevChangeMapper.xml    | 24 +++++++++++++++++++
 3 files changed, 38 insertions(+)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/mapper/DevChangeMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/mapper/DevChangeMapper.java
index a1959eb..fd5b5b9 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/mapper/DevChangeMapper.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/mapper/DevChangeMapper.java
@@ -261,4 +261,6 @@ public interface DevChangeMapper {
     void updateGj(CsDeviceDetails entity);
 
     void updateZb(CsDeviceDetails entity);
+
+    List<CsDeviceDetails> getOutAllList(CsDeviceDetails dto);
 }
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeServiceImpl.java
index ea4afd8..012124b 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeServiceImpl.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeServiceImpl.java
@@ -513,7 +513,19 @@ public class DevChangeServiceImpl implements DevChangeService {
     public AjaxResult outAll(CsDeviceDetails entity) {
 
         try {
+            List<CsDeviceDetails> outAllList = mapper.getOutAllList(entity);
+
             Integer out = mapper.outAll(entity);
+            if (out > 0) {
+                outAllList.forEach(item -> {
+                    if (item.getDevType().equals("1")) {
+                        mapper.updateZb(item);
+                    } else {
+                        mapper.updateGj(item);
+                    }
+                });
+            }
+
             return out > 0 ? AjaxResult.success("出库成功") : AjaxResult.error("出库失败");
         } catch (Exception e) {
             log.error(e.getMessage());
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/DevChangeMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/DevChangeMapper.xml
index 95bfd24..4bee5bb 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/DevChangeMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/DevChangeMapper.xml
@@ -544,6 +544,30 @@
         ORDER BY temp.createTime
         DESC
     </select>
+    <select id="getOutAllList" resultType="com.bonus.material.devchange.domain.CsDeviceDetails">
+        SELECT COALESCE(
+                       CASE
+                           WHEN cdcd.dev_type = '1' THEN CONCAT(a.ma_id, '')
+                           WHEN cdcd.dev_type = '2' THEN CONCAT(b.id, '')
+                           ELSE ''
+                           END, ''
+               )                                                  AS id,
+               cdcd.dev_type                                      AS devType,
+               COALESCE(cdcd.num, 0) - COALESCE(cdcd.real_num, 0) AS outNum
+        FROM cs_device_change_details cdcd
+
+                 LEFT JOIN ma_dev_info a
+                           ON cdcd.dev_type = '1'
+                               AND cdcd.dev_code = a.`code`
+
+                 LEFT JOIN tool_ledger b
+                           ON cdcd.dev_type = '2'
+                               AND cdcd.dev_type_id = b.type_id
+                               AND (cdcd.dev_code = '/' OR cdcd.dev_code = b.tool_code)
+        WHERE cdcd.del_flag = 0
+          AND cdcd.dev_type IN ('1', '2')
+          AND cdcd.change_id = #{id}
+    </select>
 
     <insert id="addChangeInfoNew" keyProperty="id" useGeneratedKeys="true">
         insert into cs_device_change(change_status, type, lease_type, pro_code, pro_name,