From 191b8ae5c768fbb97c7cdea87edde77d0a10e7da Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 09 五月 2025 15:15:41 +0800
Subject: [PATCH] 钣金需求匹配-完善工时计算

---
 aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 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 98edeba..623bc32 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
@@ -271,8 +271,7 @@
 
     <select id="selectPlatePlanByPlantMajor" parameterType="ApsPlatePlan" resultMap="ApsPlatePlanResult">
         select  id,document_number,main_part_number,item_number,plant,professional_affiliation,production_quantity,require_id,
-        unmatched_quantity,version, production_base,
-        (case   when custom_time is null then plan_end_day else custom_time end ) as plan_end_day
+        unmatched_quantity,version, production_base,plan_end_day
         from aps_plate_plan
         <where>
             <if test="plant != null "> and plant = #{plant}</if>
@@ -287,7 +286,8 @@
              unmatched_quantity,version
         from aps_plate_plan
         where  del_flag='0' and professional_affiliation !='0' and unmatched_quantity > 0
-        <if test="plant != null  and plan !='' "> and plant = #{plant}</if>
+        <if test="plant != null  and plant !='' "> and plant = #{plant}</if>
+        <if test="itemNumber != null  and itemNumber !='' "> and item_number = #{itemNumber}</if>
         order by document_number asc,id asc
         limit 1
     </select>

--
Gitblit v1.9.3