From 9e97ded95f71e4c736bf11464ea2c25860d2aab8 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 10 九月 2025 11:47:27 +0800
Subject: [PATCH] art: 下料接口,上下料查询接口修改

---
 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