From b8982b86a15d186c4cf6144fface700d9769fa95 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 21 三月 2025 09:13:13 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml b/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
index 19bb99a..7e9e30c 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
@@ -310,7 +310,7 @@
on rw.order_id = ogd.order_id and dd.order_number = ogd.order_number
<where> dd.breakage_quantity-dd.quantity>0 and dd.available=0 and (dd.responsible_process=rw.this_process or (dd.quality_ins_status!=1)) and rw.reviewed_state!=-1
- and o.create_order>0
+ and o.create_order>0 and dd.patch_status=0
<if test="patchLogAddDTO.orderId != null and patchLogAddDTO.orderId != ''">
and o.order_id regexp #{patchLogAddDTO.orderId}
</if>
@@ -411,5 +411,11 @@
update pp.patch_log set reviewer=null,review_status=0,update_time=now() where id=#{patchLog.id}
</update>
+ <select id="selectProjectCount">
+ SELECT COUNT(*)
+ FROM patch_log
+ WHERE process_id= #{processId} and patch_id=#{patchId} and technology_number = #{technologyNumber}
+ and project_no IS not NULL;
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0