From a211d4a01281065d9e95ce13649a4567f47fc982 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Wed, 20 Sep 2023 18:36:20 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=AC=A7=E6=B4=BE=E8=8E=B7=E5=8F=96=E6=94=B6?=
 =?UTF-8?q?=E8=B4=A7=E6=95=B0=E6=8D=AE=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/factory/oupai/service/IOuPaiFactoryService.java | 2 +-
 .../oupai/service/impl/OuPaiFactoryDataServiceImpl.java   | 3 ++-
 .../oupai/service/impl/OuPaiFactoryServiceImpl.java       | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/IOuPaiFactoryService.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/IOuPaiFactoryService.java
index 0cd835fdd..e7fced789 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/IOuPaiFactoryService.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/IOuPaiFactoryService.java
@@ -11,7 +11,7 @@ public interface IOuPaiFactoryService {
 	String saveOuPaiFactoryOrderDTOByCarCarNumber(String carNumber);
 
 
-	String saveOuPaiPackageStatusByCode(String orderCode,Integer event);
+	String saveOuPaiPackageStatusByCode(String orderPackageCode,Integer event);
 
 	String saveOuPaiOutGoingOrderByCode(String orderCode, Integer event);
 
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryDataServiceImpl.java
index f70834684..56cab1033 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryDataServiceImpl.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryDataServiceImpl.java
@@ -25,6 +25,7 @@ public class OuPaiFactoryDataServiceImpl implements IOuPaiFactoryDataService {
 		Integer event = ouPaiDataPushVO.getEvent();
 		String typeName = ouPaiDataPushVO.getTypeName();
 		String orderCode = ouPaiDataPushVO.getOrderCode();
+		String key = ouPaiDataPushVO.getKey();
 		String code = null;
 		if(StringUtil.isBlank(typeName)){
 			log.info("#############saveData: 事件类型为空 typeName={}",typeName);
@@ -36,7 +37,7 @@ public class OuPaiFactoryDataServiceImpl implements IOuPaiFactoryDataService {
 			//收货单完成收货
 		}else if(event == 2){
 			//包件收货
-			code = ouPaiFactoryService.saveOuPaiPackageStatusByCode(orderCode,event);
+			code = ouPaiFactoryService.saveOuPaiPackageStatusByCode(key,event);
 		}else if(event == 3){
 			// 收货单创建
 			// 获取需要处理的数据并存入数据库
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java
index 53de52a46..8e0490e1a 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java
@@ -83,7 +83,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 	}
 
 	@Override
-	public String saveOuPaiPackageStatusByCode(String orderCode, Integer event) {
+	public String saveOuPaiPackageStatusByCode(String orderPackageCode, Integer event) {
 		//
 //		String url = ouPaiProperties.getUri() + "tims_odata_api/api/odata/ReceivingOrder?$filter=Code eq '" + orderCode + "'&select=Code,Type,Status,Plate,PackagesCount,ReceivePackageCount,PlateNum,CarNumber,CarrierCode,SendTime,ArrivalTime,ReceiveTime,CreateTime,ReturnNumber\n" +
 //			"&$expand=" +
@@ -99,13 +99,13 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 //		handlePackageData(url, event);
 		//orderCode现在是包件码
 		QueryWrapper<FactoryPackageEntity> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("oid",orderCode);
+		queryWrapper.eq("oid",orderPackageCode);
 		FactoryPackageEntity packageEntity = factoryPackageService.getOne(queryWrapper);
 		packageEntity.setPackageStatus(5);
 		factoryPackageService.updateById(packageEntity);
 
 		JSONObject jo = new JSONObject();
-		jo.put("orderPackageCode",orderCode);
+		jo.put("orderPackageCode",orderPackageCode);
 		jo.put("receivingTime",CommonUtil.dateToString(packageEntity.getUpdateTime()));
 
 		//真正的处理需要的数据
@@ -122,7 +122,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 
 		log.info("############saveOuPaiPackageStatusByCode: 数据处理结束");
 
-		return orderCode;
+		return orderPackageCode;
 	}
 
 	@Override