Merge branch 'dev' into pre-production

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

@@ -456,8 +456,12 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 
 			stockArticleEntity.setTypeService("1");//默认商配
 
+			if(Objects.isNull(waybillEntity)){
 				if(!StringUtil.isBlank(waybillNo)){
-				if(!Objects.isNull(waybillEntity)){
+					waybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo);
+					if(Objects.isNull(waybillEntity)){
+						throw new CustomerException(405,"运单信息不存在");
+					}
 					Long consigneeId = waybillEntity.getConsigneeId();
 
 					BasicdataClientEntity clientEntity = basicdataClientClient.findEntityById(consigneeId);
@@ -479,7 +483,6 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 					if(!Objects.isNull(basicdataStoreBusinessEntity)){
 						stockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold());
 					}
-				}
 				}else{
 					Long clientId = basicdataTripartiteMallClient.getClientIdByNameAndBrand(dealerName, advanceEntity.getBrand());
 					BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(clientId);
@@ -519,6 +522,29 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 						}
 					}
 				}
+			}else{
+				Long consigneeId = waybillEntity.getConsigneeId();
+
+				BasicdataClientEntity clientEntity = basicdataClientClient.findEntityById(consigneeId);
+				if(!Objects.isNull(clientEntity)){
+					stockArticleEntity.setMallId(clientEntity.getId());
+					stockArticleEntity.setMallName(clientEntity.getClientName());
+					stockArticleEntity.setMallCode(clientEntity.getClientCode());
+				}
+				String consignee = waybillEntity.getConsignee();
+				String consigneeName = waybillEntity.getConsigneeName();
+				String consigneeMobile = waybillEntity.getConsigneeMobile();
+				String consigneeAddress = waybillEntity.getConsigneeAddress();
+				stockArticleEntity.setConsigneeUnit(consignee);
+				stockArticleEntity.setConsigneePerson(consigneeName);
+				stockArticleEntity.setConsigneeMobile(consigneeMobile);
+				stockArticleEntity.setConsigneeAddress(consigneeAddress);
+
+				BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(consigneeId, 3);
+				if(!Objects.isNull(basicdataStoreBusinessEntity)){
+					stockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold());
+				}
+			}
 
 			stockArticleEntity.setCustomerName(advanceEntity.getCustomerName());
 			stockArticleEntity.setCustomerTelephone(advanceEntity.getCustomerPhone());
@@ -564,7 +590,6 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 			parcelList.setWarehouse(warehouseEntity.getName());
 			parcelList.setWarehouseId(warehouseId);
 			String waybillNo = advanceEntity.getWaybillNo();
-			if(StringUtil.isNotBlank(waybillNo)){
 			if(!Objects.isNull(waybillEntity)){
 				Long departureWarehouseId = waybillEntity.getDepartureWarehouseId();
 				Long destinationWarehouseId = waybillEntity.getDestinationWarehouseId();
@@ -578,7 +603,6 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 					parcelList.setIsTransfer(0);
 				}
 			}
-			}
 			parcelList.setConditions(1);
 			parcelList.setOrderPackageCode(orderPackageCode);
 			parcelList.setFirsts(advanceDetailEntity.getFirstPackName());

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

@@ -2194,7 +2194,6 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 //					log.warn("################loadingScan: 下架及解托包件失败");
 //				}
 
-
 				carsLoadScanEntity.setIsData(1);
 				isData = 1;
 				Long otherPackageId = otherParcelListEntity.getId();
@@ -2243,16 +2242,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			Long packageId = parcelListEntity.getId();
 			waybillNo = parcelListEntity.getWaybillNumber();
 			orderCode = parcelListEntity.getOrderCode();
+			waybillId = parcelListEntity.getWaybillId();
 			fromWarehouseId = parcelListEntity.getWarehouseId();
 			BasicdataWarehouseEntity fromWarehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(fromWarehouseId);
 			if (!Objects.isNull(fromWarehouseEntity)) {
 				fromWarehouseName = fromWarehouseEntity.getName();
 			}
-			WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo);
-			if (!Objects.isNull(waybillEntity)) {
-				waybillId = waybillEntity.getId();
-			}
-
 
 			carsLoadScanEntity.setWaybillId(waybillId);
 			carsLoadScanEntity.setWaybillNo(waybillNo);
@@ -5347,7 +5342,11 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 						}
 						Long wid = parcelListEntity.getWarehouseId();
 						String waybillNumber = parcelListEntity.getWaybillNumber();
-						WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNumber);
+						Long waybillId = parcelListEntity.getWaybillId();
+						if(!Objects.isNull(waybillId)){
+							WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillId(waybillId);
+							parcelListEntity.setIsTransfer(0);
+							if(!Objects.isNull(waybillEntity)){
 								Long destinationWarehouseId = waybillEntity.getDestinationWarehouseId();
 								parcelListEntity.setOrderPackageStatus("20");
 								if (destinationWarehouseId.equals(wid)) {
@@ -5355,7 +5354,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 								} else {
 									parcelListEntity.setIsTransfer(1);
 								}
-
+							}
+						}
 						distributionParcelListClient.update(parcelListEntity);
 						if (StringUtil.isNotBlank(trayCode)) {
 							updownTypeClient.downPackageOrDelTray(scanCode, warehouseId, "包件下架解托");