From ec1e75adab2aacb7b49f06c663944b30de46160b Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 08 九月 2025 12:17:14 +0800
Subject: [PATCH] 提交 报工补片条件修改
---
north-glass-erp/src/main/resources/mapper/pp/DamageDetails.xml | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 c29e5ef..4f0dd57 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/DamageDetails.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/DamageDetails.xml
@@ -8,13 +8,14 @@
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
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
and b.reviewed_state>=0
and b.this_process in (WITH RECURSIVE cte AS (
SELECT 1 AS n
@@ -24,21 +25,25 @@
SELECT REGEXP_SUBSTR(#{behindProcess}, '[^,]+', 1, n) AS process
FROM cte
WHERE REGEXP_SUBSTR(#{behindProcess}, '[^,]+', 1, n) IS NOT NULL)
+ and c.review_status = 0
</select>
<select id="getNotReview">
- select a.*
+ 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">
+ <if test="orderNumber!= null || orderNumber!=''">
and a.order_number = #{orderNumber}
</if>
and a.technology_number = #{technologyNumber}
- and a.patch_status=0
and a.breakage_quantity>0
+ and c.review_status = 0
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0