From b4986a84fff89c7b32ad489e28d1d371435a5728 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Sat, 28 Sep 2024 15:44:21 +0800
Subject: [PATCH] =?UTF-8?q?wms=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/OdsProcureOrderServiceImpl.java      |  9 ++++--
 .../mapper/wms/OdsProcureOutOrderMapper.xml   | 29 ++++++++++++-------
 .../wms/WmsOdsMateStorageNewsSnMapper.xml     |  1 +
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java
index ecc8bc0e..bfb3c643 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java
@@ -1562,7 +1562,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
                 OdsProcureOutOrder odsProcureOutOrder1 = new OdsProcureOutOrder();
                 odsProcureOutOrder1.setID(IdUtils.fastSimpleUUID());
                 odsProcureOutOrder1.setSiteCode(order1.getFactoryCode());
-                odsProcureOutOrder1.setProduceCode(order.getProduceCode());
+                odsProcureOutOrder1.setProduceCode(order1.getWorkorderCode());
                 odsProcureOutOrder1.setOutNumber(new BigDecimal("0"));
                 //odsProcureOutOrder1.setLocCode(order.getWarehouseNo());
                 odsProcureOutOrder1.setMaterialCode(order1.getMaterialCode());
@@ -1920,6 +1920,10 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
         DynamicDataSourceContextHolder.push("ds_" + factoryCode);
         //如果这样的话，就区分出来单子和对应的物料。然后根据集合放入暂收集合中
         List<OdsProcureOrder>   orderList1=new ArrayList<>();//
+        for (OdsProcureOrder    order:
+                orderList) {
+            System.out.println(order.toString());
+        }
         for (OdsProcureOrder    order:
         orderList) {
             OdsProcureOrder order1=   odsProcureOrderMapper.selectOdsProcureOrderCardByUserDefined1(order);
@@ -1953,10 +1957,11 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
             }
             odsProcureOrder.setCzNumber(czNumber);
         }
-        Map paramMap=new HashMap<>();
+
         List<Map> mapList = new ArrayList<>();
         for (OdsProcureOrder  order :
         orderList1) {
+            Map paramMap=new HashMap<>();
             paramMap.put("EBELN",order.getProcureCode());//
             paramMap.put("EBELP",order.getUserDefined3());//行项目
             paramMap.put("MATNR",order.getMaterialCode());//物料
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml
index 27428f02..3fdfe374 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml
@@ -731,18 +731,27 @@
 	</select>
 	<select id="selectMesPrepareDetailBC"	parameterType="OdsProcureOutOrder" resultMap="OdsProcureOutOrderResult">
 		SELECT
-			material_code	Material_Code,
-			material_name	Material_Desc,
-			unit	Unit,
-			quantity	Plan_Number,
-			factory_code	Site_code,
-			need_date	needDate,
-			recoil	User_Defined3
+			mp.workorder_name workorderCode,
+			mpd.material_code Material_Code,
+			mpd.material_name Material_Desc,
+			mpd.quantity	Plan_Number,
+			mpd.unit	Unit,
+			mpd.fund_quanlity fundQuanlity,
+			mpd.factory_code Site_code,
+			mpd.recoil	User_Defined3,
+			ow.product_date needDate
 		FROM
-			mes_prepare_detail
+			pro_order_workorder ow
+				LEFT JOIN mes_prepare mp ON ow.workorder_code = mp.workorder_code
+				LEFT JOIN mes_prepare_detail mpd ON mp.prepare_id = mpd.prepare_id
 		WHERE
-			parent_work_order=#{workorderCode}	and
-			del_flag = '0'	and	recoil=	''
+			ow.belong_work_order =#{workorderCode}
+		  AND ow.del_flag = '0'
+		  AND mpd.recoil =''
+		  AND mp.del_flag = '0'
+		  AND mpd.del_flag = '0'
+		ORDER BY
+			mpd.recoil
 	</select>
 	<select id="selectWmsOdsProcureOutOrderByID" parameterType="String" resultMap="OdsProcureOutOrderResult">
 		SELECT
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsSnMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsSnMapper.xml
index f0656dc2..a41e7a44 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsSnMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsSnMapper.xml
@@ -73,6 +73,7 @@
             <if test="factoryCode != null  and factoryCode != ''">and factory_code = #{factoryCode}</if>
             <if test="sapFactoryCode != null  and sapFactoryCode != ''">and sap_factory_code = #{sapFactoryCode}</if>
         </where>
+        ORDER BY	gmt_create	DESC
     </select>
 
     <select id="selectWmsOdsMateStorageNewsSnByMateOrderInSnId" parameterType="Long"