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

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

@@ -803,15 +803,6 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		//计算扫码入库的包件是否需要把运单和提货单挂上
 		openOrderAsyncService.dealwithBillladingInfo(advanceIds,warehouseId,warehouseName,waybillId,waybillNo);
 
-		//判断是否是开单及入库的配置
-		Boolean aBoolean = basicdataOpenIncomingClient.checkOpenIncoming(warehouseId, brandId);
-		if (Boolean.TRUE.equals(aBoolean)) {
-			openOrderAsyncService.incomingPackageBatch(advanceIds, AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getTenantId(), AuthUtil.getNickName(), IncomingTypeEnum.OPEN_TO_IN.getCode(), warehouseId, warehouseName, waybillEntity);
-			waybillEntity.setStockCount(waybillEntity.getTotalCount());
-			waybillEntity.setWaybillStatus("20");
-			warehouseWaybillClient.updateEntity(waybillEntity);
-		}
-
 		//异步存入日志
 		String nickName = AuthUtil.getNickName();
 		Long userId = AuthUtil.getUserId();

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

@@ -447,12 +447,13 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 		String orderCode = advanceEntity.getOrderCode();
 		Integer total = baseMapper.findAllNumByOrderCode(orderCode);
 
+		String waybillNo = advanceEntity.getWaybillNo();
+
 		Long orderId = null;
 		DistributionStockArticleEntity stockArticleEntity = stockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode, warehouseId);
 		if (Objects.isNull(stockArticleEntity)) {
 			log.info("#############saveOrderAndPackage: 订单信息为空，同步订单信息");
 			//订单信息为空
-			String waybillNo = advanceEntity.getWaybillNo();
 
 			stockArticleEntity = new DistributionStockArticleEntity();
 			stockArticleEntity.setCreateUser(userId);
@@ -579,7 +580,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 			stockArticleEntity.setOrderReceiveStatus("10");
 			stockArticleEntity.setFreezeStatus("10");
 			stockArticleEntity.setNotification(2);
-			stockArticleEntity.setIsHaveData(2);
+			stockArticleEntity.setIsHaveData(1);
 			stockArticleEntity.setTrainNumber(advanceEntity.getTrainNumber());
 			stockArticleEntity.setSortingQuantity(0);
 			stockArticleEntity.setDeliveryQuantity(0);
@@ -590,6 +591,10 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 			stockArticleEntity.setTotalNumber(total);
 			stockArticleClient.saveOrUpdate(stockArticleEntity);
 			orderId = stockArticleEntity.getId();
+
+			if(StringUtil.isNotBlank(waybillNo)){
+				waybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo);
+			}
 		}
 		if (Objects.isNull(orderId)) {
 			log.warn("##############saveOrderAndPackage: 订单信息有误 orderId={}", orderId);
@@ -598,6 +603,8 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 
 		stockArticleClient.updateAllOrderTotalNum(orderCode, total);
 
+		log.info("##############saveOrderAndPackage: 当前处理orderCode:{}  waybillNo{}",orderCode,waybillNo);
+
 		List<DistributionParcelListEntity> parcelListEntityList = new ArrayList<>();
 		List<String> orderPackageCodes = new ArrayList<>();
 		for (TrunklineAdvanceDetailEntity advanceDetailEntity : detailList) {
@@ -612,7 +619,12 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 			parcelList.setIsTransfer(1);
 			parcelList.setWarehouse(warehouseEntity.getName());
 			parcelList.setWarehouseId(warehouseId);
-			String waybillNo = advanceEntity.getWaybillNo();
+			if(Objects.isNull(waybillEntity)){
+				if(StringUtil.isNotBlank(waybillNo)){
+					waybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo);
+				}
+			}
+
 			if (!Objects.isNull(waybillEntity)) {
 				Long departureWarehouseId = waybillEntity.getDepartureWarehouseId();
 				Long destinationWarehouseId = waybillEntity.getDestinationWarehouseId();

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

@@ -10779,7 +10779,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				if(!Objects.isNull(orderCodeNumVO)){
 					unloadScanOrderVO.setTotalNumber(orderCodeNumVO.getTotalNum());
 				}else{
-					unloadScanOrderVO.setTotalNumber(orderCodeNumVO.getTotalNum());
+					unloadScanOrderVO.setTotalNumber(0);
 				}
 
 				List<UnloadPackageVO> unloadPackageList = new ArrayList<>();