From 07c7aa498a776f0eee584e7622a910df7fee41f9 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Wed, 31 Jan 2024 14:40:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BD=E5=9D=AF=E5=B7=A5=E5=8D=95=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B52?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/op/plan/mapper/ProOrderWorkorderMapper.java | 3 +++
 .../plan/service/impl/ProOrderWorkorderServiceImpl.java  | 5 +++++
 .../resources/mapper/plan/ProOrderWorkorderMapper.xml    | 9 +++++++--
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java
index 9bd51bca7..3dd9f5aef 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java
@@ -2,6 +2,7 @@ package com.op.plan.mapper;
 
 import com.op.plan.domain.ProOrder;
 import com.op.plan.domain.ProOrderWorkorder;
+import com.op.plan.domain.ProWetMaterialPlanDetail;
 import com.op.system.api.domain.dto.BaseBomComponentDTO;
 import com.op.system.api.domain.dto.MesPrepareDTO;
 import com.op.system.api.domain.dto.MesPrepareDetailDTO;
@@ -168,5 +169,7 @@ public interface ProOrderWorkorderMapper {
     ProOrderWorkorder getPWorkOrder(ProOrderWorkorder whiteOrder);
 
     List<ProOrderWorkorder> selectProOrderWorkorderList999(ProOrderWorkorder proOrderWorkorder);
+
+    ProWetMaterialPlanDetail getWetMaterial(String workorderId);
 }
 
diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
index 453791066..a23f44bf0 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
@@ -99,6 +99,11 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
         String factoryCode = request.getHeader(key.substring(8)).replace("ds_","");
         if("999".equals(factoryCode)){
             workorderList = proOrderWorkorderMapper.selectProOrderWorkorderList999(proOrderWorkorder);
+            for(ProOrderWorkorder owork:workorderList){
+                ProWetMaterialPlanDetail material = proOrderWorkorderMapper.getWetMaterial(owork.getWorkorderId());
+                owork.setMaterialCode(material.getMaterialCode());
+                owork.setMaterialName(material.getMaterialName());
+            }
         }else{
             workorderList = proOrderWorkorderMapper.selectProOrderWorkorderList(proOrderWorkorder);
         }
diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
index 9ca3c1f23..4de92b326 100644
--- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
+++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
@@ -94,7 +94,6 @@
             pow.update_by, pow.update_time, pow.prod_type, pow.factory_code , pow.end_flag , pow.car_num,pow.sort_no,
             pow.workorder_code_sap,pwd.material_code,pwd.material_name
         from pro_order_workorder pow
-        left join pro_wet_material_plan_detail pwd on pow.workorder_id = pwd.workorder_id
         <where>
             <if test="workorderCode != null  and workorderCode != ''"> and pow.workorder_code like concat('%', #{workorderCode}, '%')</if>
             <if test="workorderName != null  and workorderName != ''"> and pow.workorder_name like concat('%', #{workorderName}, '%')</if>
@@ -124,7 +123,7 @@
             <if test="endFlag != null  and endFlag != ''"> and pow.end_flag = #{endFlag}</if>
             <if test="productDateStart != null "> and CONVERT(varchar(10),pow.product_date, 120) >= '${productDateStart}'</if>
             <if test="productDateEnd != null "> and '${productDateEnd}%' >= CONVERT(varchar(10),pow.product_date, 120)</if>
-            and pow.del_flag = '0' and pwd.del_flag = '0'
+            and pow.del_flag = '0'
         </where>
     </select>
     <select id="selectProOrderWorkorderByWorkorderId" parameterType="String" resultMap="ProOrderWorkorderResult">
@@ -414,6 +413,12 @@
         where workorder_code = #{workorderCode}
         and del_flag = '0'
     </select>
+    <select id="getWetMaterial" resultType="com.op.plan.domain.ProWetMaterialPlanDetail">
+        select top 1 material_code materialCode,
+               material_name materialName
+        from pro_wet_material_plan_detail
+        where workorder_id = #{workorderId} and del_flag = '0'
+    </select>
 
     <insert id="createPrepareDetails">
         insert into mes_prepare_detail