Merge remote-tracking branch 'origin/dev' into dev

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

@@ -422,6 +422,8 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 				distributionStockArticleEntity.setHandQuantity(0);
 				distributionStockArticleEntity.setTenantId(TenantNum.HUITONGCODE);// 对应租户ID
 //				distributionStockArticleEntity.setWaybillNumber();// 运单号
+				distributionStockArticleEntity.setMallName(advanceEntity.getDealerName());
+				distributionStockArticleEntity.setMallCode(advanceEntity.getDealerCode());
 
 				//判断是否齐套 查询该订单自编号下面的包件是都全部都交由汇通了
 				Integer allNum = advanceDetailClient.getAllNumByOrderNo(orderSelfNum);

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

@@ -69,7 +69,7 @@ public class DealWithDataHandler {
 //					channel.basicAck(deliveryTag,false);
 				} else {
 					//真正的处理需要的数据
-					if("38".equals(currentWarehouseId) || "124".equals(currentWarehouseId)){
+					if("38".equals(currentWarehouseId) || "124".equals(currentWarehouseId) || "30".equals(currentWarehouseId)){
 						try {
 							if ("4".equals(status)) {
 								panFactoryDataService.handleDataToPlatform(unitNo, operationTime);

blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java

@@ -1277,6 +1277,8 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 			distributionStockArticleEntity.setWarehouseId(basicdataWarehouseEntity.getId());
 			distributionStockArticleEntity.setDealerCode(advanceEntity.getDealerCode());
 			distributionStockArticleEntity.setDealerName(advanceEntity.getDealerName());
+			distributionStockArticleEntity.setMallName(advanceEntity.getDealerName());
+			distributionStockArticleEntity.setMallCode(advanceEntity.getDealerCode());
 
 			if (ObjectUtils.isNotNull(wayBillEntity)) {
 				distributionStockArticleEntity.setConsigneeUnit(wayBillEntity.getTakeCompany());//收货单位（经销商）

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -264,12 +264,16 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			throw new CustomerException(400,"配载计划不存在");
 		}
 		String loadStatus = carsLoadEntity.getLoadStatus();
-		if(!"10".equals(loadStatus) && !"30".equals(loadStatus)){
-			log.warn("#############arriveCarByLoadId: 配载计划未发车 loadStatus={}",loadStatus);
-			throw new CustomerException(400,"配载计划未发车");
+		if("20".equals(loadStatus) || "40".equals(loadStatus)){
+			log.warn("#############arriveCarByLoadId: 配载计划已到车 loadStatus={}",loadStatus);
+			throw new CustomerException(400,"配载计划已到车");
+		}else{
+			if(!"10".equals(loadStatus) && !"30".equals(loadStatus)){
+				log.warn("#############arriveCarByLoadId: 配载计划未发车 loadStatus={}",loadStatus);
+				throw new CustomerException(400,"配载计划未发车");
+			}
 		}
 
-
 		Long nowWarehouseId = carsLoadEntity.getNowWarehouseId();
 
 		TrunklineCarsLoadLineEntity currentCarsLoadLineEntity = trunklineCarsLoadLineService.findEntityByLoadIdAndNodeId(loadId, nowWarehouseId);
@@ -547,6 +551,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		}else{
 			carsLoadEntity.setLoadStatus("30");
 		}
+		carsLoadEntity.setNowWarehouseId(aheadNodeId);
 		carsLoadEntity.setArriveTime(aheadCarsLoadLineEntity.getArriveDate());
 		updateById(carsLoadEntity);
 
@@ -1902,6 +1907,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		for (LoadingPackageDTO loadingPackageDTO : packageList) {
 			String orderPackageCode = loadingPackageDTO.getOrderPackageCode();
 			loadingScan(loadId,warehouseId,orderPackageCode,trayCode);
+			pacakagNum = pacakagNum + 1;
 		}
 
 		for (LoadingZeroDTO loadingZeroDTO : zeroList) {
@@ -1909,6 +1915,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			Integer enterNum = loadingZeroDTO.getEnterNum();
 			String orderCode = loadingZeroDTO.getOrderCode();
 			loadingZero(loadId,warehouseId,waybillNo,orderCode,trayCode,enterNum,"整托正常装车");
+			zeroNum = zeroNum + enterNum;
 		}
 
 		//下架托盘
@@ -2278,14 +2285,14 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			carsLoadScanEntity.setUnloadNodeName(warehouseName);
 			carsLoadScanEntity.setUnloadNum(carsLoadScanEntity.getNum());
 			carsLoadScanEntity.setScanStatus("2");
+			trayCode = carsLoadScanEntity.getTrayCode();
+			if(!StringUtil.isBlank(trayCode)){
+				BasicdataTrayEntity trayEntity = basicdataTrayClient.getTrayByTrayCode(trayCode);
+				trayId = trayEntity.getId();
+				trayName = trayEntity.getPalletName();
+			}
 			if(unbindTray == 1){
-				trayCode = carsLoadScanEntity.getTrayCode();
-				if(!StringUtil.isBlank(trayCode)){
-					BasicdataTrayEntity trayEntity = basicdataTrayClient.getTrayByTrayCode(trayCode);
-					trayId = trayEntity.getId();
-					trayName = trayEntity.getPalletName();
-				}
-				updownTypeClient.downPackageOrDelTray(orderPackageCode,warehouseId);
+				updownTypeClient.downPackageOrDelTray(orderPackageCode,fromWarehouseId);
 			}
 			trunklineCarsLoadScanService.updateById(carsLoadScanEntity);