From 8821a4d7bfb4e0eaed9a40a2fd317f6b2b256bb4 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 11 九月 2025 18:08:23 +0800
Subject: [PATCH] 提交 入库箱号判断条件

---
 north-glass-erp/src/main/resources/mapper/pp/DamageDetails.xml |    9 ++++++---
 1 files changed, 6 insertions(+), 3 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 4f0dd57..b8b646a 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,10 @@
     left join pp.reporting_work as b
     on a.reporting_work_id = b.reporting_work_id
     left join patch_log as c
-    on a.reporting_work_id = c.reporting_work_id and a.process_id = c.process_id and a.order_number = c.order_sort
+    on a.reporting_work_id = c.reporting_work_id
+           and a.process_id = c.process_id
+           and a.order_number = c.order_sort
+           and a.technology_number = c.technology_number
     WHERE a.process_id = #{processId}
     <if test="needOrderNumber!=null">
     and a.order_number = #{orderNumber}
@@ -25,7 +28,7 @@
                            SELECT REGEXP_SUBSTR(#{behindProcess}, '[^,]+', 1, n) AS process
                            FROM cte
                            WHERE REGEXP_SUBSTR(#{behindProcess}, '[^,]+', 1, n) IS NOT NULL)
-    and c.review_status = 0
+    and ifnull(c.review_status,0) = 0
 
 </select>
     <select id="getNotReview">
@@ -43,7 +46,7 @@
   </if>
     and a.technology_number = #{technologyNumber}
     and a.breakage_quantity>0
-    and c.review_status = 0
+    and ifnull(c.review_status,0) = 0
 
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0