From 3d9e0ec1c1e457ed3fd2b334cf4c4dd66c10eead Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 23 十二月 2025 11:09:46 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/DamageDetails.xml | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 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..ac4583a 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/DamageDetails.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/DamageDetails.xml
@@ -8,11 +8,18 @@
FROM pp.damage_details as a
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
+ and a.technology_number = c.technology_number
WHERE a.process_id = #{processId}
+ <if test="needOrderNumber!=null">
and a.order_number = #{orderNumber}
+ </if>
+ and a.available=0
and a.technology_number =#{technologyNumber}
and a.breakage_quantity>0
- and a.patch_status=0
and b.reviewed_state>=0
and b.this_process in (WITH RECURSIVE cte AS (
SELECT 1 AS n
@@ -22,7 +29,26 @@
SELECT REGEXP_SUBSTR(#{behindProcess}, '[^,]+', 1, n) AS process
FROM cte
WHERE REGEXP_SUBSTR(#{behindProcess}, '[^,]+', 1, n) IS NOT NULL)
+ and ifnull(c.review_status,0) = 0
</select>
+ <select id="getNotReview">
+ select a.*,ifnull(c.review_status,0) as reviewed_state
+ from damage_details as a
+ left join 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
+ and a.technology_number = c.technology_number
+ where a.process_id=#{processId}
+ and b.reviewed_state>=0
+ <if test="orderNumber!= null || orderNumber!=''">
+ and a.order_number = #{orderNumber}
+ </if>
+ and a.available=0
+ and a.technology_number = #{technologyNumber}
+ and a.breakage_quantity>0
+ and ifnull(c.review_status,0) = 0
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0