From 684399b665ef8c25c43faff0fdc821a0b72b39ba Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 26 四月 2024 14:03:50 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

---
 north-glass-erp/src/main/resources/mapper/pp/ReportingWorkDetail.xml |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/pp/ReportingWorkDetail.xml b/north-glass-erp/src/main/resources/mapper/pp/ReportingWorkDetail.xml
index ec48c5f..dcdc2fb 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWorkDetail.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWorkDetail.xml
@@ -80,6 +80,9 @@
             <result column="child_width" property="childWidth"/>
 
         </association>
+        <association property="OrderProcessDetail" javaType="com.example.erp.entity.sd.OrderProcessDetail">
+            <result column="reporting_work_num" property="reportingWorkNum"/>
+        </association>
 
 
     </resultMap>
@@ -161,7 +164,14 @@
         where reporting_work_id =  #{reportingWorkId}
     </select>
 
-
+    <select id="selectInventory">
+        select reporting_work_num
+        FROM sd.order_process_detail as opd
+        where opd.process_id = #{processId}
+          and opd.order_number = #{orderNumber}
+          and opd.technology_number = #{technologyNumber}
+          and opd.process = '鍖呰'
+    </select>
     <!--<where>
 
             create_time <![CDATA[>=]]> #{startTime} and create_time <![CDATA[<=]]> #{endTime}}
@@ -252,4 +262,6 @@
                   `b`.`available` = 1)
     </select>-->
 
+
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0