From df6d74daca55095ebdb105386ee840872ed10492 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Thu, 1 Aug 2024 15:49:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E6=8E=A5=E5=8F=A3sql?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/mes/MesMapper.xml   | 34 ++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml
index 171739763..4d619ce2e 100644
--- a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml
+++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml
@@ -362,22 +362,24 @@
         group by check_result
     </select>
     <select id="getPorOrderList" resultType="com.op.mes.domain.ProOrderWorkorder">
-        select pow.workorder_code_sap workorderCodeSap,
-               pow.product_name productName,
-               powb.batch_code batchCode,
-               powb.batch_quantity quantitySplit,
-               t.quantityFeedback quantityProduced
-        from pro_order_workorder  pow
-                 left join pro_order_workorder_batch powb on powb.workorder_id = pow.workorder_id
-                 left join (
-            select workorder_code,batch,sum(quantity_feedback) quantityFeedback from mes_report_work
-            where CONVERT(varchar(10),feedback_time, 120) = CONVERT(varchar(10),GETDATE(), 120)
-              and del_flag = '0'
-            group by workorder_code,batch
-        )t on pow.workorder_code = t.workorder_code and powb.batch_code = t.batch
-        where pow.del_flag = '0' and CONVERT(varchar(10),pow.product_date, 120) = CONVERT(varchar(10),GETDATE(), 120)
-          and pow.workorder_name = #{equCode} and pow.parent_order ='0' and powb.del_flag = '0'
-        order by powb.batch_code
+        select t0.*,t.quantityFeedback from
+            (
+                select pow.workorder_code_sap workorderCodeSap,
+                       pow.product_name productName,
+                       powb.batch_code batchCode,
+                       powb.batch_quantity quantitySplit
+                from pro_order_workorder  pow
+                         left join pro_order_workorder_batch powb on powb.workorder_id = pow.workorder_id
+                where pow.del_flag = '0' and CONVERT(varchar(10),pow.product_date, 120) = CONVERT(varchar(10),GETDATE(), 120)
+                  and pow.workorder_name = #{equCode} and pow.parent_order ='0' and powb.del_flag = '0'
+            ) t0
+            left join (
+                select workorder_code,batch,sum(quantity_feedback) quantityFeedback from mes_report_work
+                where CONVERT(varchar(10),feedback_time, 120) = CONVERT(varchar(10),GETDATE(), 120)
+                  and del_flag = '0'
+                group by workorder_code,batch
+            )t on t0.workorderCodeSap = t.workorder_code and t0.batchCode = t.batch
+        order by t0.batchCode
     </select>
     <select id="getHFProInfo" resultType="com.op.system.api.domain.dto.BoardDTO">
         select t.*,isnull(be.unit_working_hours,0) unitPro from