From fec9f42e00f2df68a2a20cbf132b17bdeed8e63a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 25 八月 2025 09:19:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/resources/mapper/pp/DamageDetails.xml | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/DamageDetails.xml b/north-glass-erp/src/main/resources/mapper/pp/DamageDetails.xml
index 3ad6b5f..c29e5ef 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/DamageDetails.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/DamageDetails.xml
@@ -9,7 +9,9 @@
left join pp.reporting_work as b
on a.reporting_work_id = b.reporting_work_id
WHERE a.process_id = #{processId}
+ <if test="needOrderNumber!=null">
and a.order_number = #{orderNumber}
+ </if>
and a.technology_number =#{technologyNumber}
and a.breakage_quantity>0
and a.patch_status=0
@@ -24,5 +26,19 @@
WHERE REGEXP_SUBSTR(#{behindProcess}, '[^,]+', 1, n) IS NOT NULL)
</select>
+ <select id="getNotReview">
+ select a.*
+ from damage_details as a
+ left join reporting_work as b
+ on a.reporting_work_id = b.reporting_work_id
+ where a.process_id=#{processId}
+ and b.reviewed_state>=0
+ <if test="orderNumber!= null">
+ and a.order_number = #{orderNumber}
+ </if>
+ and a.technology_number = #{technologyNumber}
+ and a.patch_status=0
+ and a.breakage_quantity>0
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0