From aace8fb9e58c7972f81cf32b199a86043a726c10 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Fri, 8 Dec 2023 10:44:51 +0800
Subject: [PATCH] =?UTF-8?q?wms=E4=BF=AE=E6=94=B9=EF=BC=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/service/IWmsToWCSmissionService.java  |  3 +-
 .../impl/OdsProcureOrderServiceImpl.java      | 28 ++++++++++++++-----
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsToWCSmissionService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsToWCSmissionService.java
index 9d247385d..ad5616dc1 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsToWCSmissionService.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsToWCSmissionService.java
@@ -1,9 +1,10 @@
 package com.op.wms.service;
 
 import com.op.wms.domain.WmsToWCSDTO;
+import com.op.wms.domain.WmsToWCSODTO;
 
 public interface IWmsToWCSmissionService {
-    WmsToWCSDTO packagingStorage(WmsToWCSDTO wcsdto);
+    WmsToWCSODTO packagingStorage(WmsToWCSDTO wcsdto);
 
     WmsToWCSDTO packingMaterialsInboundCompleted(WmsToWCSDTO wcsdto);
 
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 9e7bf1263..8b27513df 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
@@ -268,15 +268,29 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
 			orderLine1.setOrderLineNo(String.format("%05d", orderItem));
 			orderLine1.setBatchNo("00001");
 		}
-		//String	meg=	addPurchaseOrderOutboundSAP(orderLine);
-		//if ("OK".equals(meg)){//成功
+		String	meg=	addPurchaseOrderOutboundSAP(orderLine);
+		if ("OK".equals(meg)){//成功
+		for (OrderLine	orderLine1:
+				orderList) {
 			OdsProcureOutOrder	odsProcureOutOrder=new OdsProcureOutOrder();
 			odsProcureOutOrder.setID(IdUtils.fastSimpleUUID());
 			odsProcureOutOrder.setProduceCode(orderLine.getOrderNo());
+			odsProcureOutOrder.setMaterialCode(orderLine1.getMaterialCode());
+			odsProcureOutOrder.setMaterialDesc(orderLine1.getMaterialDesc());
+			odsProcureOutOrder.setPlanDate(new Date());
+			odsProcureOutOrder.setUnit(orderLine1.getUnit());
+			odsProcureOutOrder.setProductionLineCode(orderLine1.getStationNo());
+			odsProcureOutOrder.setUserDefined1(orderLine1.getBatchNo());
+			odsProcureOutOrder.setActive("1");
+			odsProcureOutOrder.setOrderStatus("1");
+			odsProcureOutOrder.setPlanNumber(orderLine1.getPlanNumber());
+			odsProcureOutOrder.setUserDefined2(orderLine1.getOrderLineNo());
 			//odsProcureOutOrder.set
 			odsProcureOutOrderMapper.insertOdsProcureOutOrder(odsProcureOutOrder);
-			//修改库存
-		//}
+		}
+
+
+		}
 		return orderLine;
 	}
 
@@ -390,7 +404,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
 			Date date = new Date();
 			String formattedDate = dateFormat.format(date);
 			JSONObject payload = new JSONObject();
-			payload.put("reqCode", "eb7f8e9f-d1e8-499e-9bcb-e72d3ac195b0");
+			payload.put("reqCode", IdUtils.fastSimpleUUID());
 			payload.put("reqTime",formattedDate );
 			payload.put("warehouseNo", orderLinete.getWarehouseNo());
 			payload.put("orderNo", orderLinete.getOrderNo());
@@ -401,9 +415,9 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
 					 orderList	 ) {
 				JSONObject orderLine = new JSONObject();
 				orderLine.put("orderLineNo", orderLine1.getOrderLineNo());
-				orderLine.put("sku", orderLine1.getSku());
+				orderLine.put("sku", orderLine1.getMaterialCode());
 				orderLine.put("batchNo",orderLine1.getBatchNo());
-				orderLine.put("qty", orderLine1.getQty());
+				orderLine.put("qty", orderLine1.getPlanNumber());
 				orderLine.put("qualityStatus", 1);
 				orderLine.put("location", orderLine1.getStationNo());
 				orderLines.add(orderLine);