From 199e7868b91d3571732d517dab53633686315b0a Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Tue, 20 Aug 2024 15:51:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E8=AF=86=E5=8D=A1=E6=89=B9=E6=AC=A1?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/wms/WmsProductPutMapper.xml        | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml
index 9e07573b6..c731dae69 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml
@@ -386,33 +386,35 @@
     </update>
     <select id="WmsProductPutByWorkOrderqueryBS" resultMap="WmsProductPutResult">
         SELECT
-            mes_report_work.report_code work_order,
+            pro_order_workorder.workorder_code work_order,
             pro_order_workorder.workorder_code_sap product_order,
-            mes_report_work.product_code,
-            mes_report_work.product_name,
-            mes_report_work.unit unit_of_measure,
-            mes_report_work.batch batch_number,
-            mes_report_work.quantity plan_quantity,
-            ( mes_report_work.quantity- put.put_quantity ) attr3
+            pro_order_workorder.product_code,
+            pro_order_workorder.product_name,
+            pro_order_workorder.unit unit_of_measure,
+            pro_order_workorder_batch.batch_code batch_number,
+            pro_order_workorder_batch.batch_quantity plan_quantity,
+            ( pro_order_workorder_batch.batch_quantity- put.put_quantity ) attr3
         FROM
             pro_order_workorder
-                LEFT JOIN mes_report_work ON pro_order_workorder.workorder_code	= mes_report_work.workorder_code
+                LEFT JOIN pro_order_workorder_batch ON pro_order_workorder.workorder_id	= pro_order_workorder_batch.workorder_id
                 LEFT JOIN (
                 SELECT SUM
                            ( wms_product_put.put_quantity ) AS put_quantity,
-                       wms_product_put.work_order AS work_order,
+                       wms_product_put.batch_number AS batch_number,
                        wms_product_put.product_code AS product_code
                 FROM
                     wms_product_put
                 GROUP BY
-                    wms_product_put.work_order,
+                    wms_product_put.batch_number,
                     wms_product_put.product_code
-            ) put ON put.work_order= mes_report_work.report_code
+            ) put ON put.batch_number= pro_order_workorder_batch.batch_code
                 AND put.product_code= pro_order_workorder.workorder_code_sap
         WHERE
-            pro_order_workorder.workorder_code_sap=#{attribute1}
-          AND mes_report_work.batch=#{attribute2}
-          AND mes_report_work.parent_order = '0'
+            pro_order_workorder.workorder_code_sap= #{attribute1}
+          AND pro_order_workorder_batch.batch_code= #{attribute2}
+          AND pro_order_workorder_batch.del_flag = '0'
+
+
     </select>
     <select id="selectProOrderWorkorderBatchPallet" resultMap="WmsProductPutResult">
         SELECT