From c3125ca18bd6d6d997ae3c56143b5d658d71ebeb Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Sat, 9 Mar 2024 11:01:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=9B=E5=BB=BA=E5=8A=A0?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/plan/ProOrderWorkorderMapper.xml       | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

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 ac5ed3a1..6d48cb75 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
@@ -189,9 +189,18 @@
         </where>
     </select>
     <select id="selectProOrderWorkorderByWorkorderId" parameterType="String" resultMap="ProOrderWorkorderResult">
-        <include refid="selectProOrderWorkorderVo"/>
-        where (workorder_code = #{workorderId} or workorder_id = #{workorderId})
-        and del_flag = '0'
+        select pow.workorder_id, pow.workorder_code, pow.workorder_name, pow.order_id, pow.order_code, pow.product_id,
+               pow.product_code, pow.product_name,
+               pow.product_spc, pow.unit, pow.quantity_produced, pow.quantity_split, pow.route_code, pow.prod_line_code,
+               pow.product_date,
+               pow.shift_id, pow.parent_order, pow.ancestors, pow.status, pow.remark, pow.attr1,
+               pow.attr3, pow.attr4, pow.create_by, pow.create_time,
+               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, po.atrr2 attr2
+        from pro_order_workorder pow
+                 left join pro_order po on pow.order_code = po.order_code
+        where (pow.workorder_code = #{workorderId} or pow.workorder_id = #{workorderId})
+          and pow.del_flag = '0'
     </select>
 
     <select id="selectFirWorkOrder" parameterType="String" resultMap="ProOrderWorkorderResult">