From f99e7de6d1ed98913398fc5a725ba83b1c5a007d Mon Sep 17 00:00:00 2001
From: lixiangyu <lixiangyu@xalxzn.com>
Date: 星期一, 15 九月 2025 18:06:46 +0800
Subject: [PATCH] feat(cms): 更新刀具库存状态管理

---
 src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingScrapDetailMapper.xml |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingScrapDetailMapper.xml b/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingScrapDetailMapper.xml
index d6f927e..16423f4 100644
--- a/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingScrapDetailMapper.xml
+++ b/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingScrapDetailMapper.xml
@@ -7,11 +7,20 @@
             t1.id,
             t1.order_id orderId,
             t1.cutting_id cuttingId,
-            t2.cutting_code cuttingCode,
-            t2.cutting_name cuttingName
+            t1.inventory_id inventoryId,
+            -- t1.workpiece_material workpieceMaterial,
+            -- t1.used_life usedLife,
+            t2.cutting_barcode cuttingBarcode,
+            t2.inventory_status inventoryStatus,
+            t2.current_life currentLife,
+            t2.id,
+            t3.id,
+            t3.cutting_code cuttingCode,
+            t3.cutting_name cuttingName
         FROM
             cms_cutting_scrap_detail t1
-                LEFT JOIN cms_cutting_tool t2 ON t1.cutting_id = t2.id
+                LEFT JOIN cms_cutting_inventory t2 ON t1.inventory_id = t2.id
+                LEFT JOIN cms_cutting_tool t3 ON t1.cutting_id = t3.id
         WHERE t1.order_id = #{orderId}
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3