From 555fdbae1f338a404da8d5f4c52c0afb8003bce6 Mon Sep 17 00:00:00 2001
From: lixiangyu <lixiangyu@xalxzn.com>
Date: 星期二, 09 九月 2025 17:54:38 +0800
Subject: [PATCH] feat(cms): 添加库存刀具列表接口并优化相关功能

---
 src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingReceiveDetailMapper.xml |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingReceiveDetailMapper.xml b/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingReceiveDetailMapper.xml
index f8277af..643a8fc 100644
--- a/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingReceiveDetailMapper.xml
+++ b/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingReceiveDetailMapper.xml
@@ -9,11 +9,15 @@
             t1.cutting_id cuttingId,
             t1.workpiece_material workpieceMaterial,
             t1.used_life usedLife,
-            t2.cutting_code cuttingCode,
-            t2.cutting_name cuttingName
+            t2.cutting_barcode cuttingCBarcode,
+            t2.inventory_status inventoryStatus,
+            t2.current_life currentLife,
+            t3.cutting_code cuttingCode,
+            t3.cutting_name cuttingName
         FROM
             cms_cutting_receive_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