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

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskPackagelistVO.java

@@ -123,6 +123,10 @@ public class TaskPackagelistVO {
 	@ApiModelProperty(value = "是否新增")
 	private String isNew;
 
+	private String firsts;
+	private String second;
+	private String thirdProduct;
+
 	/**
 	 * 盘点明细数据
 	 */

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.xml

@@ -55,6 +55,7 @@
         select *
         from logpm_basicdata_storage_services
         where send_warehouse_id is null
+        and is_deleted = 0
         and client_id = #{clientId}
     </select>
 

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

@@ -2797,7 +2797,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		String consigneeName = waybillEntity.getConsigneeName();
 		String consigneeAddress = waybillEntity.getConsigneeAddress();
 		String consigneeMobile = waybillEntity.getConsigneeMobile();
+		Long newDepartureWarehouseId = waybillEntity.getDepartureWarehouseId();
 		String departureWarehouseName = waybillEntity.getDepartureWarehouseName();
+		Long newDestinationWarehouseId = waybillEntity.getDestinationWarehouseId();
 		String destinationWarehouseName = waybillEntity.getDestinationWarehouseName();
 		Integer totalCount = waybillEntity.getTotalCount();
 
@@ -2834,12 +2836,12 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 					Long nowWarehouseId = parcelListEntity.getWarehouseId();
 					String orderPackageCode = parcelListEntity.getOrderPackageCode();
 					String orderPackageStatus = parcelListEntity.getOrderPackageStatus();
-					parcelListEntity.setSendWarehouseId(departureWarehouseId);
+					parcelListEntity.setSendWarehouseId(newDepartureWarehouseId);
 					parcelListEntity.setSendWarehouseName(departureWarehouseName);
-					parcelListEntity.setAcceptWarehouseId(destinationWarehouseId);
+					parcelListEntity.setAcceptWarehouseId(newDestinationWarehouseId);
 					parcelListEntity.setAcceptWarehouseName(destinationWarehouseName);
 
-					if (nowWarehouseId.equals(destinationWarehouseId)) {
+					if (nowWarehouseId.equals(newDestinationWarehouseId)) {
 						parcelListEntity.setIsTransfer(0);
 						if ("20".equals(orderPackageStatus)) {
 							arriveWarehousePackageCode.add(orderPackageCode);
@@ -2913,9 +2915,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 				stockArticleEntity.setConsigneePerson(consigneeName);
 				stockArticleEntity.setConsigneeAddress(consigneeAddress);
 				stockArticleEntity.setConsigneeMobile(consigneeMobile);
-				stockArticleEntity.setSendWarehouseId(departureWarehouseId);
+				stockArticleEntity.setSendWarehouseId(newDepartureWarehouseId);
 				stockArticleEntity.setSendWarehouseName(departureWarehouseName);
-				stockArticleEntity.setAcceptWarehouseId(destinationWarehouseId);
+				stockArticleEntity.setAcceptWarehouseId(newDestinationWarehouseId);
 				stockArticleEntity.setAcceptWarehouseName(destinationWarehouseName);
 				String orderCode = stockArticleEntity.getOrderCode();
 				if (orderCode.equals(waybillNo)) {
@@ -2961,12 +2963,12 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 						}
 						updateNumberIds.add(id);
 					}
-					parcelListEntity.setSendWarehouseId(departureWarehouseId);
+					parcelListEntity.setSendWarehouseId(newDepartureWarehouseId);
 					parcelListEntity.setSendWarehouseName(departureWarehouseName);
-					parcelListEntity.setAcceptWarehouseId(destinationWarehouseId);
+					parcelListEntity.setAcceptWarehouseId(newDestinationWarehouseId);
 					parcelListEntity.setAcceptWarehouseName(destinationWarehouseName);
 
-					if (nowWarehouseId.equals(destinationWarehouseId)) {
+					if (nowWarehouseId.equals(newDestinationWarehouseId)) {
 						parcelListEntity.setIsTransfer(0);
 					} else {
 						parcelListEntity.setIsTransfer(1);
@@ -3015,11 +3017,11 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 					entity.setIsZero("1");
 					entity.setAdvanceId(waybillDetailDTO.getId());
 					entity.setWarehouseEntryTimeEnd(new Date());
-					entity.setSendWarehouseId(departureWarehouseId);
+					entity.setSendWarehouseId(newDepartureWarehouseId);
 					entity.setSendWarehouseName(departureWarehouseName);
-					entity.setAcceptWarehouseId(destinationWarehouseId);
+					entity.setAcceptWarehouseId(newDestinationWarehouseId);
 					entity.setAcceptWarehouseName(destinationWarehouseName);
-					if (departureWarehouseId.equals(destinationWarehouseId)) {
+					if (warehouseId1.equals(newDestinationWarehouseId)) {
 						entity.setIsTransfer(0);
 					} else {
 						entity.setIsTransfer(1);
@@ -5168,18 +5170,18 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			waybillEntity.setDestinationWarehouseId(newDestinationWarehouseId);
 			waybillEntity.setDestinationWarehouseName(newDestinationWarehouseName);
 			//查询所有该运单的包件
-			List<DistributionParcelListEntity> parcelListEntityList = distributionParcelListClient.findListByWaybillId(waybillId);
-			parcelListEntityList.forEach(parcelListEntity -> {
-				Long warehouseId = parcelListEntity.getWarehouseId();
-				parcelListEntity.setAcceptWarehouseId(newDestinationWarehouseId);
-				parcelListEntity.setAcceptWarehouseName(newDestinationWarehouseName);
-				if (warehouseId.equals(newDestinationWarehouseId)) {
-					parcelListEntity.setIsTransfer(0);
-				} else {
-					parcelListEntity.setIsTransfer(1);
-				}
-			});
-			distributionParcelListClient.updateList(parcelListEntityList);
+//			List<DistributionParcelListEntity> parcelListEntityList = distributionParcelListClient.findListByWaybillId(waybillId);
+//			parcelListEntityList.forEach(parcelListEntity -> {
+//				Long warehouseId = parcelListEntity.getWarehouseId();
+//				parcelListEntity.setAcceptWarehouseId(newDestinationWarehouseId);
+//				parcelListEntity.setAcceptWarehouseName(newDestinationWarehouseName);
+//				if (warehouseId.equals(newDestinationWarehouseId)) {
+//					parcelListEntity.setIsTransfer(0);
+//				} else {
+//					parcelListEntity.setIsTransfer(1);
+//				}
+//			});
+//			distributionParcelListClient.updateList(parcelListEntityList);
 		}
 		Long newShipperId = openOrderDTO.getShipperId();
 		String newShipper = openOrderDTO.getShipper();

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

@@ -10850,6 +10850,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				//没有包件数据
 				TrunklineAdvanceDetailEntity advanceDetailEntity = trunklineAdvanceDetailService.findEntityByOrderPackageCode(orderPackageCode);
 				if(!Objects.isNull(advanceDetailEntity)){
+					Long advanceId = advanceDetailEntity.getAdvanceId();
+					TrunklineAdvanceEntity advanceEntity = advanceService.getById(advanceId);
 					String packageStatus = advanceDetailEntity.getPackageStatus();
 					if("0".equals(packageStatus)){
 						InComingDTO inComingDTO = new InComingDTO();
@@ -10881,6 +10883,14 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 						trunklineCarsLoadScanEntity.setUnloadTime(new Date());
 						trunklineCarsLoadScanEntity.setUnloadTrayCode(unloadTrayCode);
 						trunklineCarsLoadScanEntity.setUnloadTrayName(unloadTrayName);
+						trunklineCarsLoadScanEntity.setCustomerName(advanceEntity.getCustomerName());
+						trunklineCarsLoadScanEntity.setCustomerTelephone(advanceEntity.getCustomerPhone());
+						trunklineCarsLoadScanEntity.setCustomerAddress(advanceEntity.getCustomerAddress());
+						trunklineCarsLoadScanEntity.setFirsts(advanceDetailEntity.getFirstPackName());
+						trunklineCarsLoadScanEntity.setSenconds(advanceDetailEntity.getSecondPackName());
+						trunklineCarsLoadScanEntity.setThirds(advanceDetailEntity.getThirdPackName());
+						trunklineCarsLoadScanEntity.setMaterialCode(advanceDetailEntity.getMaterialCode());
+						trunklineCarsLoadScanEntity.setMaterialName(advanceDetailEntity.getMaterialName());
 						trunklineCarsLoadScanService.save(trunklineCarsLoadScanEntity);
 						loadScanId = trunklineCarsLoadScanEntity.getId();
 
@@ -10924,6 +10934,14 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 						trunklineCarsLoadScanEntity.setRemark("无装车记录卸车");
 						trunklineCarsLoadScanEntity.setUnloadTrayCode(unloadTrayCode);
 						trunklineCarsLoadScanEntity.setUnloadTrayName(unloadTrayName);
+						trunklineCarsLoadScanEntity.setCustomerName(advanceEntity.getCustomerName());
+						trunklineCarsLoadScanEntity.setCustomerTelephone(advanceEntity.getCustomerPhone());
+						trunklineCarsLoadScanEntity.setCustomerAddress(advanceEntity.getCustomerAddress());
+						trunklineCarsLoadScanEntity.setFirsts(advanceDetailEntity.getFirstPackName());
+						trunklineCarsLoadScanEntity.setSenconds(advanceDetailEntity.getSecondPackName());
+						trunklineCarsLoadScanEntity.setThirds(advanceDetailEntity.getThirdPackName());
+						trunklineCarsLoadScanEntity.setMaterialCode(advanceDetailEntity.getMaterialCode());
+						trunklineCarsLoadScanEntity.setMaterialName(advanceDetailEntity.getMaterialName());
 						trunklineCarsLoadScanService.save(trunklineCarsLoadScanEntity);
 						loadScanId = trunklineCarsLoadScanEntity.getId();
 
@@ -11361,7 +11379,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 						stockArticleEntity.setCompleteSet(1);
 						stockArticleEntity.setStockupStatus("10");
 						stockArticleEntity.setReservationStatus("10");
-						stockArticleEntity.setOrderStatus("10");
+						stockArticleEntity.setOrderStatus("20");
 						stockArticleEntity.setGroundingStatus("10");
 						stockArticleEntity.setOrderReceiveStatus("10");
 						stockArticleEntity.setFreezeStatus("10");