From feddd20a4323e49ef9f424d07e53c12e715203fc Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期二, 13 五月 2025 14:45:20 +0800
Subject: [PATCH] 修改冲突
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml
index b53581e..0575604 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml
@@ -300,7 +300,7 @@
</update>
<select id="selectPlateRedundantOrderList" parameterType="ApsPlatePlan" resultMap="ApsPlatePlanResult">
select document_number, item_number, production_quantity, unmatched_quantity, plant, production_base, plan_start_day, plan_end_day, order_create_time
- from aps_plate_plan where unmatched_quantity>0 and professional_affiliation!='0'
+ from aps_plate_plan where unmatched_quantity>0 and professional_affiliation!='0' and del_flag='0'
<if test="documentNumber != null and documentNumber != ''">
and document_number like '%' || #{documentNumber} || '%'
</if>
--
Gitblit v1.9.3