From ff56f7872ba406740106d5684ff60a8b724739a3 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <123456>
Date: Thu, 28 Sep 2023 18:01:18 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=AF=B9=E6=8E=A5=E6=AC=A7=E6=B4=BE=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../factory/oupai/receiver/OpOldReceivingDataHandler.java | 8 ++++++--
 .../com/logpm/factory/receiver/DealWithDataHandler.java   | 4 ++++
 .../factory/zb/controller/ZbFactoryDataController.java    | 4 +++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpOldReceivingDataHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpOldReceivingDataHandler.java
index c7762487b..d0784bf44 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpOldReceivingDataHandler.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpOldReceivingDataHandler.java
@@ -18,6 +18,7 @@ import jodd.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.RabbitConstant;
 import org.springblade.core.redis.cache.BladeRedis;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitHandler;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
@@ -74,6 +75,7 @@ public class OpOldReceivingDataHandler {
 		String thirdPackName = object.getString("thirdPackName");
 
 
+		String scanTime = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss");
 		QueryWrapper warehouseQueryWrapper = new QueryWrapper();
 		warehouseQueryWrapper.eq("code", orderPackageCode);
 
@@ -82,6 +84,7 @@ public class OpOldReceivingDataHandler {
 		log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>  查询包件数据 end >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> packageEntity {}", packageEntity);
 
 
+
 		//真正的处理需要的数据
 		try {
 			// 保存数据
@@ -107,7 +110,7 @@ public class OpOldReceivingDataHandler {
 						//订单自编号
 						reqMap.put("orderSelfNum", orderSelfNum);
 						//扫描时间
-						reqMap.put("scan_time", new Date());
+						reqMap.put("scan_time",  scanTime);
 						//扫描人
 						reqMap.put("scan_user", "");
 						//车次号
@@ -122,7 +125,8 @@ public class OpOldReceivingDataHandler {
 						reqMap.put("thirdPackName", thirdPackName);
 						//物料名称
 						reqMap.put("productname", packageDetailNames);
-
+						//包条码
+						reqMap.put("unitNo", orderPackageCode);
 
 						boolean isSuccess = sendPackageData(reqMap);
 						if (isSuccess) {
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java
index 6e47739ae..d1f9b4289 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java
@@ -48,6 +48,10 @@ public class DealWithDataHandler {
 			String currentWarehouseId = orderStatusDTO.getCurrentWarehouse();//当前仓Id
 			//查询destinationWarehouse logiBillNo plantId数据
 			Map<String, String> supplyData = advanceDetailClient.getSupplyData(unitNo);
+			if(supplyData == null){
+				log.error("##############dealWithDataHandler: unitNo={} 没有查询到数据",unitNo);
+				return ;
+			}
 			String destinationWarehouseId = supplyData.get("destinationWarehouseId");//目的仓id
 			if (StringUtil.isBlank(currentWarehouseId) || StringUtil.isBlank(destinationWarehouseId)) {
 				log.warn("##############dealWithDataHandler: 仓库数据有问题currentWarehouseId={} destinationWarehouseId={}", currentWarehouseId, destinationWarehouseId);
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/controller/ZbFactoryDataController.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/controller/ZbFactoryDataController.java
index b3e3bfa5e..59c5cbde1 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/controller/ZbFactoryDataController.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/controller/ZbFactoryDataController.java
@@ -7,6 +7,7 @@ import com.logpm.factory.comfac.service.IOrderStatusLogService;
 import com.logpm.factory.snm.entity.OrderStatusLog;
 import com.logpm.factory.zb.bean.ZbResp;
 import com.logpm.factory.zb.dto.ZBReceiptDTO;
+import com.logpm.factory.zb.entity.ZbOrderLogEntity;
 import com.logpm.factory.zb.service.IZbFactoryDataService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -30,7 +31,6 @@ import java.util.Objects;
 @Api(value = "工厂数据", tags = "工厂数据接口")
 public class ZbFactoryDataController {
 
-	private RabbitTemplate rabbitTemplate;
 	private final IOrderStatusLogService orderStatusLogService;
 
 	private final IZbFactoryDataService zbFactoryDataService;
@@ -56,6 +56,8 @@ public class ZbFactoryDataController {
 		orderStatusLog.setStatus(1);
 		orderStatusLog.setType(3);
 		orderStatusLog.setBrand("志邦");
+
+
 		orderStatusLogService.save(orderStatusLog);
 
 //		//判断数据是否已存入