From ccf06f8c9494cdebdb14531764f009cfd9be3072 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Wed, 20 Dec 2023 10:18:24 +0800
Subject: [PATCH] =?UTF-8?q?wms=E4=BF=AE=E6=94=B99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/OdsProcureOrderServiceImpl.java      |  6 ++--
 .../mapper/wms/OdsProcureOutOrderMapper.xml   | 30 +++++++++++--------
 2 files changed, 21 insertions(+), 15 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 723ddc47..6b12e696 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
@@ -298,7 +298,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
 				odsProcureOutOrder.setUserDefined1(orderLine1.getBatchNo());
 				odsProcureOutOrder.setActive("1");
 				odsProcureOutOrder.setOrderStatus("1");
-				odsProcureOutOrder.setPlanNumber(orderLine1.getPlanNumber());
+				odsProcureOutOrder.setPlanNumber(orderLine1.getQty());
 				odsProcureOutOrder.setUserDefined2(orderLine1.getOrderLineNo());
 				odsProcureOutOrder.setUserDefined3(orderLine1.getUserDefined3());
 				odsProcureOutOrder.setUserDefined10("1");
@@ -324,7 +324,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
 					odsProcureOutOrder.setActive("1");
 					odsProcureOutOrder.setOrderStatus("1");
 					odsProcureOutOrder.setUserDefined10("1");
-					odsProcureOutOrder.setPlanNumber(orderLine1.getPlanNumber());
+					odsProcureOutOrder.setPlanNumber(orderLine1.getQty());
 					odsProcureOutOrder.setUserDefined2(orderLine1.getOrderLineNo());
 					//odsProcureOutOrder.set
 					odsProcureOutOrder.setUserDefined3(orderLine1.getUserDefined3());
@@ -770,7 +770,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
 				orderLine.put("orderLineNo", orderLine1.getOrderLineNo());
 				orderLine.put("sku", orderLine1.getMaterialCode());
 				orderLine.put("batchNo",orderLine1.getBatchNo());
-				orderLine.put("qty", orderLine1.getPlanNumber());
+				orderLine.put("qty", orderLine1.getQty());
 				orderLine.put("qualityStatus", 1);
 				orderLine.put("location", orderLine1.getStationNo());
 				orderLines.add(orderLine);
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 c589f17b..c5088b30 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
@@ -229,18 +229,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	</select>
 	<select id="selectmesPrepareDetail" parameterType="OdsProcureOutOrder" resultMap="OdsProcureOutOrderResult">
-		SELECT		record_id	ID,
-				  prepare_id	User_Defined2,
-				  material_code	Material_Code,
-				  material_name	Material_Desc,
-				  prod_type	User_Defined1,
-					unit	Unit,
-					quantity Plan_Number,
-					recoil	User_Defined3,
-				  factory_code	Site_code
-		FROM	mes_prepare_detail
-		WHERE	prepare_id=#{ID}
-
+		SELECT
+			mes_prepare_detail.record_id ID,
+			mes_prepare.workorder_name,
+			mes_prepare_detail.prepare_id User_Defined2,
+			mes_prepare_detail.material_code Material_Code,
+			mes_prepare_detail.material_name Material_Desc,
+			mes_prepare_detail.prod_type User_Defined1,
+			mes_prepare_detail.unit Unit,
+			mes_prepare_detail.quantity Plan_Number,
+			COALESCE(out_order.Plan_Number, 0)		Out_Number,
+			mes_prepare_detail.recoil User_Defined3,
+			mes_prepare_detail.factory_code Site_code
+		FROM
+			mes_prepare_detail
+				LEFT JOIN mes_prepare ON mes_prepare.prepare_id= mes_prepare_detail.prepare_id
+				LEFT JOIN (SELECT	Produce_Code,Material_Code,SUM(Plan_Number)	Plan_Number	FROM	ods_procure_out_order	GROUP BY	Produce_Code,Material_Code)AS	out_order	 ON out_order.Produce_Code= mes_prepare.workorder_name AND	out_order.Material_Code=mes_prepare_detail.material_code
+		WHERE
+			mes_prepare_detail.prepare_id= #{ID}
 	</select>
 	<insert id="insertWmsRawMissionOut"	>
 		insert into wms_raw_mission_out(id,