From 6c9e4733f4379dc4b32d542bf2a16ce6833dbe95 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <123456>
Date: Tue, 29 Aug 2023 17:50:45 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=AD=A3=E6=AC=A7=E6=B4=BE=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BC=A0=E9=80=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OupaiFactoryDataController.java           | 12 +++----
 .../factory/oupai/vo/OuPaiDataPushVO.java     | 31 +++++++++++++++++--
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/controller/OupaiFactoryDataController.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/controller/OupaiFactoryDataController.java
index cedc1fb81..98c69773a 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/controller/OupaiFactoryDataController.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/controller/OupaiFactoryDataController.java
@@ -50,11 +50,11 @@ public class OupaiFactoryDataController {
 		factoryLogService.save(orderStatusLog);
 		String carNum = null;
 		try {
-			carNum = mtFactoryDataService.saveData(ouPaiDataPushVO);
+//			carNum = mtFactoryDataService.saveData(ouPaiDataPushVO);
 			orderStatusLog.setDataStatus(1);
 
 		} catch (ServiceException  e) {
-			log.warn("############data: 保存数据失败 carNum={}",ouPaiDataPushVO.getCarNum());
+//			log.warn("############data: 保存数据失败 carNum={}",ouPaiDataPushVO.getCarNum());
 			log.error("############data: 保存数据失败",e);
 			//修改保存数据的状态
 			orderStatusLog.setDataStatus(2);
@@ -62,10 +62,10 @@ public class OupaiFactoryDataController {
 		factoryLogService.saveOrUpdate(orderStatusLog);
 
 		//开启异步线程处理数据
-		if(ObjectUtils.isNotNull(carNum)){
-			syncDataService.handlerOuPaiDataToHt(ouPaiDataPushVO.getCarNum());
-		}
-		return R.data(ouPaiDataPushVO.getCarNum());
+//		if(ObjectUtils.isNotNull(carNum)){
+//			syncDataService.handlerOuPaiDataToHt(ouPaiDataPushVO.getCarNum());
+//		}
+		return R.data(ouPaiDataPushVO.getOrderCode());
 
 
 
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/vo/OuPaiDataPushVO.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/vo/OuPaiDataPushVO.java
index 2332706eb..3d1d57fc4 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/vo/OuPaiDataPushVO.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/vo/OuPaiDataPushVO.java
@@ -6,8 +6,35 @@ import lombok.Data;
 public class OuPaiDataPushVO {
 
 	/**
-	 * 发车单号
+	 * 仓库名称
 	 */
-	private String carNum;
+	private String WarehouseName;
+	/**
+	 * 对象实体的名称
+	 */
+	private String TypeName;
+	/**
+	 * 0：收货单开始收货
+	 * 1：收货单完成收货
+	 * 2：包件收货
+	 * 3：收货单创建
+	 * 4：配送单发运
+	 * 5：签收单签收
+	 * 6：签收单部分签收
+	 */
+	private int Event;
+	/**
+	 * 相关单号
+	 */
+	private String OrderCode;
+	/**
+	 * 对象key值，Type实体对象对应的OID值（唯一
+	 */
+	private String Key;
+
+	/**
+	 * 签名，暂时为空
+	 */
+	private String Sign;
 
 }