From 7aac0b821663de152ef665a030ebbef1d34b41f2 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 16 四月 2025 11:31:20 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/ReportingWorkDetail.xml | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 dc42609..6509338 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWorkDetail.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWorkDetail.xml
@@ -7,7 +7,7 @@
<resultMap id="reworkAdd" type="com.example.erp.entity.pp.ReportingWorkDetail">
<id column="id" property="id"/>
<result column="rework_team" property="reworkTeam"/>
- <result column="breakage_number" property="breakageNumber"/>
+ <result column="breakage_quantity" property="breakageQuantity"/>
<result column="return_process" property="returnProcess"/>
<result column="breakage_reason" property="breakageReason"/>
<result column="responsible_equipment" property="responsibleEquipment"/>
@@ -79,6 +79,9 @@
<result column="child_height" property="childHeight"/>
<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>
@@ -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 = #{thisProcess}
+ </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