增加老系统的库内作业 码板打托 数据推送

blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java

@@ -416,7 +416,6 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 				distributionStockArticleEntity.setMallName(takeCompany);
 
 
-
 				distributionStockArticleEntity.setWarehouseEntryTime(date);
 				distributionStockArticleEntity.setTotalNumber(total);
 				distributionStockArticleEntity.setHandQuantity(0);
@@ -541,43 +540,9 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 				distributionStockArticleClient.saveOrUpdate(distributionStockArticleEntity);
 
 			}
-
 			//保存包件信息
 			saveOrderPackage(unitNo, distributionStockArticleEntity, basicdataWarehouseEntity, waybillNoNum,operationTime);
 
-			//---------------------2023-10-20 17:23:00 增加打托数据
-//			Integer oldId = basicdataWarehouseEntity.getOldId();
-//			Long warehouseEntityId = basicdataWarehouseEntity.getId();
-//			try{
-//				saveTrayTypeInfoPackage(unitNo,oldId,warehouseEntityId);
-//			}catch (Exception e){
-//				logger.error("################handleDataToPlatform: unitNo={} 打托失败",unitNo);
-//			}
-
-//			String waybillNumber = distributionStockArticleEntity.getWaybillNumber();
-//			if(!waybillNumber.contains(waybillNoNum)){
-//				waybillNumber = waybillNumber+","+waybillNoNum;
-//			}
-//			distributionStockArticleEntity.setWaybillNumber(waybillNumber);
-//
-//			// 修改入库状态
-//			distributionStockArticleEntity.setHandQuantity(distributionStockArticleEntity.getHandQuantity() +1);
-//			String orderStatus = checkDistributionStockArticleOrderStatus(distributionStockArticleEntity);
-//			distributionStockArticleEntity.setOrderStatus(orderStatus);
-//
-//			// 修改收货
-//			if(distributionStockArticleEntity.getOrderStatus().equals(OrderStatusConstant.ruku.getValue())){
-//				distributionStockArticleEntity.setOrderReceiveStatus(OrderReceiveStatusConstant.yishouhuo.getValue());
-//				// 更新齐套状态
-//				// todo 这里需要多仓齐套的查询条件
-//				distributionStockArticleEntity.setCompleteSet(1);
-//			}
-//			// 修改最新的入库时间
-//			distributionStockArticleEntity.setWarehouseEntryTimeEnd(new Date());
-//			distributionStockArticleClient.saveOrUpdate(distributionStockArticleEntity);
-
-//			包件保存成功去修改订单的数量
-//			distributionStockArticleClient.addHandQuantity(id, 1);
 			logger.info("#################handleDataToPlatform: 数据处理完成");
 		} else {
 			//已存在包件信息那就不处理

blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java

@@ -50,14 +50,14 @@ public class DealWithDataHandler {
 		String unitNo = orderStatusDTO.getUnitNo();
 		String operationTime = orderStatusDTO.getOperationTime();
 		Integer trayId = orderStatusDTO.getTrayId();
-		if ("4".equals(status) || "2".equals(status)) {
+		if ("4".equals(status) || "2".equals(status) || "1".equals(status)) {
 			//继续判断是否到达目的仓
 			String currentWarehouseId = orderStatusDTO.getCurrentWarehouse();//当前仓Id
 			//查询destinationWarehouse logiBillNo plantId数据
 			Map<String, String> supplyData = advanceDetailClient.getSupplyData(unitNo);
-			if(supplyData == null){
-				log.error("##############dealWithDataHandler: unitNo={} 没有查询到数据",unitNo);
-				return ;
+			if (supplyData == null) {
+				log.error("##############dealWithDataHandler: unitNo={} 没有查询到数据", unitNo);
+				return;
 			}
 			String destinationWarehouseId = supplyData.get("destinationWarehouseId");//目的仓id
 			if (StringUtil.isBlank(currentWarehouseId) || StringUtil.isBlank(destinationWarehouseId)) {
@@ -69,16 +69,25 @@ public class DealWithDataHandler {
 //					channel.basicAck(deliveryTag,false);
 				} else {
 					//真正的处理需要的数据
-					if("38".equals(currentWarehouseId) || "124".equals(currentWarehouseId) || "30".equals(currentWarehouseId)){
+					if ("38".equals(currentWarehouseId) || "124".equals(currentWarehouseId) || "30".equals(currentWarehouseId)) {
 						try {
-							if ("4".equals(status)) {
+
+							if ("1".equals(status)) {
+
+								// 始发仓和目的仓入库
+								panFactoryDataService.handleDataToPlatform(unitNo, operationTime);
+								bladeRedis.setEx("tray-" + unitNo, trayId, 30L);
+
+							} else if ("4".equals(status)) {
 								panFactoryDataService.handleDataToPlatform(unitNo, operationTime);
-							}else if("2".equals(status)){
-								bladeRedis.setEx("tray-"+unitNo,trayId,30L);
+							} else if ("2".equals(status)) {
+								bladeRedis.setEx("tray-" + unitNo, trayId, 30L);
+							} else {
+								log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>> 错误的状态");
 							}
 
 							//同步打托数据
-							factoryCommonService.syncTrayTypeData(unitNo,trayId,currentWarehouseId);
+							factoryCommonService.syncTrayTypeData(unitNo, trayId, currentWarehouseId);
 
 						} catch (Exception e) {
 							log.error(e.getMessage());