From 8d0b466ef4fe497932e15c186688679e55a26f62 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期五, 22 八月 2025 10:45:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingInboundMapper.xml |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingInboundMapper.xml b/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingInboundMapper.xml
index 9745da6..8a3b768 100644
--- a/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingInboundMapper.xml
+++ b/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingInboundMapper.xml
@@ -2,4 +2,22 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.cms.mapper.CuttingInboundMapper">
 
+    <select id="exportList" resultType="org.jeecg.modules.cms.vo.CuttingInboundExportVo">
+        SELECT
+            t1.id,
+            t1.order_status AS oderStatus,
+            t1.receiver AS  receiver,
+            t1.receive_time AS  receiveTime,
+            t1.receive_comment AS  receiveComment,
+            t1.confirmer AS  confirmer,
+            t1.confirm_time AS  confirmTime,
+            t1.confirm_comment AS confirmComment,
+            t2.order_id AS orderId,
+            t2.cutting_id AS cuttingId,
+            t2.receive_number AS receiveNumber
+        FROM
+            cms_cutting_inbound t1
+                LEFT JOIN
+            cms_cutting_inbound_detail t2 on t1.id=t2.order_id
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3