From 156dbab600d7727c13790e8b9a677107cfad2387 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 08 五月 2025 10:40:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 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 84ab2b7..fccc5a1 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
@@ -44,6 +44,8 @@
<result property="opStatus" column="op_status" />
<result property="nextOpName" column="next_op_name" />
<result property="unmatchedQuantity" column="unmatched_quantity" />
+ <result property="productionBase" column="production_base" />
+ <result property="orderCreateTime" column="order_create_time" />
<result property="professionalAffiliation" column="professional_affiliation" />
<result property="requireId" column="require_id" />
</resultMap>
@@ -56,6 +58,7 @@
standby_stock, next_process_deparment, is_suspended, is_outsourcing, account, advanced_materials,
advanced_document_number, advanced_requirement_day, is_plan_complete, is_stock_complete,
has_turnback, has_risk, std_op, op_status, next_op_name ,unmatched_quantity,professional_affiliation
+ , production_base, order_create_time
from aps_plate_plan
</sql>
@@ -292,4 +295,15 @@
set unmatched_quantity=#{unmatched_quantity},version=version+1
where id=#{id} and version=#{version}
</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'
+ <if test="documentNumber != null and documentNumber != ''">
+ and document_number like '%' || #{documentNumber} || '%'
+ </if>
+ <if test="itemNumber != null and itemNumber != ''">
+ and item_number like '%' || #{itemNumber} || '%'
+ </if>
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3