Merge remote-tracking branch 'origin/pre-production'

blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java

@@ -17,6 +17,7 @@ public enum WorkNodeEnums implements Serializable {
 	INITIAL_DATA_ENTRY(101010, "数据入库"),
 	INITIAL_WAREHOUSE_ENTRY(101020, "始发仓入库"),
 	UNLOAD_WAREHOUSE_ENTRY(101021, "卸车并入库"),
+	ERROR_WAREHOUSE_ENTRY(101022, "异常入库"),
 
 	OPEN_ORDER(102010, "开单"),
 	CHANGE_ORDER(102020, "改单"),
@@ -46,6 +47,7 @@ public enum WorkNodeEnums implements Serializable {
 	SIGN_DIRECT_SHIPPER(105030,"直发商家签收"),
 	END_WAREHOUSE_UNLOADING(105040, "末端仓卸车确认"),
 	NO_STOCK_CAR(105050, "本车次少货"),
+	NO_DATA(105051, "无效包条码"),
 	COST_SHARE(105060, "车次成本分摊"),
 
 	SORTING_TRAYS(201010, "分拣打托"),

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java

@@ -148,7 +148,7 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl<Aftersa
 						warehousePackageTrackLogEntity.setOrderPackageCode(orderPackageCode);
 						warehousePackageTrackLogEntity.setWarehouseId(abnormalRecordDTO.getWarehouseId());
 						warehousePackageTrackLogEntity.setWarehouseName(abnormalRecordDTO.getWarehouseName());
-						warehousePackageTrackLogEntity.setWorkNode(WorkNodeEnums.UNLOAD_INCOMING_WAREHOUSE.getCode());
+						warehousePackageTrackLogEntity.setWorkNode(WorkNodeEnums.NO_DATA.getCode());
 						warehousePackageTrackLogEntity.setContent("异常处理已确认为无效包条码");
 						warehousePackageTrackLogEntity.setOperator(AuthUtil.getNickName());
 						List<JSONObject> ls = new ArrayList<>();

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/QualityDispatchNumberMapper.xml

@@ -143,7 +143,7 @@
                t.driver_name,
                t.vehicle_name,
                t.delivery_create_user_name,
-               case when t.sign_status = 1 then '已签收' else '未签收' end signStatus,
+               t.sign_status signStatus,
                t.sign_time,
                t.sign_user_name,
                t.reviewStatus,

blade-service/logpm-report/src/main/java/com/logpm/report/vo/qulity/dispatch/QualityDispatchTaskVO.java

@@ -1,5 +1,6 @@
 package com.logpm.report.vo.qulity.dispatch;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -94,7 +95,7 @@ public class QualityDispatchTaskVO implements Serializable {
 	private Integer signStockNum;
 
 	@ApiModelProperty(value = "状态")
-	@ExcelProperty("状态")
+	@ExcelIgnore
 	private String signStatus;
 
 	@ApiModelProperty(value = "签收时间")

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

@@ -339,6 +339,8 @@ public class InComingServiceImpl implements IInComingService {
 
 						if(incomingType.equals(IncomingTypeEnum.PACKAGE_INCOMING.getCode())){
 							c = WorkNodeEnums.UNLOAD_WAREHOUSE_ENTRY.getCode();
+						}else if(incomingType.equals(IncomingTypeEnum.SYNC_INCOMING.getCode())){
+							c = WorkNodeEnums.ERROR_WAREHOUSE_ENTRY.getCode();
 						}
 
 						//存入日志

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

@@ -1207,10 +1207,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		Long nowWarehouseId = carsLoadEntity.getNowWarehouseId();//当前节点id
 		String carsNo = carsLoadEntity.getCarsNo();
 
-		if (!warehouseId.equals(nowWarehouseId)) {
-			log.warn("#############cancelArriveCarByLoadId: 配载未到达当前仓 loadId={} nowWarehouseId={}", loadId, nowWarehouseId);
-			throw new CustomerException(400, "配载未到达当前仓");
-		}
+//		if (!warehouseId.equals(nowWarehouseId)) {
+//			log.warn("#############cancelArriveCarByLoadId: 配载未到达当前仓 loadId={} nowWarehouseId={}", loadId, nowWarehouseId);
+//			throw new CustomerException(400, "配载未到达当前仓");
+//		}
 
 		String loadStatus = carsLoadEntity.getLoadStatus();
 
@@ -1220,10 +1220,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		if (unloadType == 1) {
 			node = WorkNodeEnums.TRANSFER_WAREHOUSE_UNLOADING;
 			//网点卸车确认
-			if ("40".equals(loadStatus)) {
-				log.warn("#############unloadByLoadId: 当前节点为终点 loadId={} loadStatus={}", loadId, loadStatus);
-				throw new CustomerException(400, "当前节点为终点");
-			}
+//			if ("40".equals(loadStatus)) {
+//				log.warn("#############unloadByLoadId: 当前节点为终点 loadId={} loadStatus={}", loadId, loadStatus);
+//				throw new CustomerException(400, "当前节点为终点");
+//			}
 			updateUnloadStatus.setId(currentCarsLoadLineEntity.getId());
 			updateUnloadStatus.setUnloadStatus("1");
 			currentCarsLoadLineEntity.setUnloadStatus("1");
@@ -9934,6 +9934,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		String packageStatus = advanceDetailEntity.getPackageStatus();
 		String orderCode = advanceDetailEntity.getOrderCode();
 		String waybillNo = advanceDetailEntity.getWaybillNo();
+		Long advanceId = advanceDetailEntity.getAdvanceId();
+		TrunklineAdvanceEntity advanceEntity = advanceService.getById(advanceId);
+
+
 		if ("0".equals(packageStatus)) {
 			InComingDTO inComingDTO = new InComingDTO();
 			inComingDTO.setOrderPackageCode(scanCode);
@@ -9949,6 +9953,16 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				carsLoadScanEntity.setOrderCode(orderCode);
 				carsLoadScanEntity.setIsData(1);
 				carsLoadScanEntity.setIsSupple(1);
+				if(!Objects.isNull(advanceEntity)){
+					carsLoadScanEntity.setCustomerName(advanceEntity.getCustomerName());
+					carsLoadScanEntity.setCustomerTelephone(advanceEntity.getCustomerPhone());
+					carsLoadScanEntity.setCustomerAddress(advanceEntity.getCustomerAddress());
+				}
+				carsLoadScanEntity.setFirsts(advanceDetailEntity.getFirstPackName());
+				carsLoadScanEntity.setSenconds(advanceDetailEntity.getSecondPackName());
+				carsLoadScanEntity.setThirds(advanceDetailEntity.getThirdPackName());
+				carsLoadScanEntity.setMaterialName(advanceDetailEntity.getMaterialName());
+				carsLoadScanEntity.setMaterialCode(advanceDetailEntity.getMaterialCode());
 				trunklineCarsLoadScanService.updateById(carsLoadScanEntity);
 				return R.success("同步成功");
 			}
@@ -9991,6 +10005,16 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				carsLoadScanEntity.setOrderCode(orderCode);
 				carsLoadScanEntity.setIsData(1);
 				carsLoadScanEntity.setIsSupple(1);
+				if(!Objects.isNull(advanceEntity)){
+					carsLoadScanEntity.setCustomerName(advanceEntity.getCustomerName());
+					carsLoadScanEntity.setCustomerTelephone(advanceEntity.getCustomerPhone());
+					carsLoadScanEntity.setCustomerAddress(advanceEntity.getCustomerAddress());
+				}
+				carsLoadScanEntity.setFirsts(advanceDetailEntity.getFirstPackName());
+				carsLoadScanEntity.setSenconds(advanceDetailEntity.getSecondPackName());
+				carsLoadScanEntity.setThirds(advanceDetailEntity.getThirdPackName());
+				carsLoadScanEntity.setMaterialName(advanceDetailEntity.getMaterialName());
+				carsLoadScanEntity.setMaterialCode(advanceDetailEntity.getMaterialCode());
 				trunklineCarsLoadScanService.updateById(carsLoadScanEntity);
 
 				return R.success("同步成功");
@@ -10022,6 +10046,16 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				carsLoadScanEntity.setOrderCode(orderCode);
 				carsLoadScanEntity.setIsData(1);
 				carsLoadScanEntity.setIsSupple(1);
+				if(!Objects.isNull(advanceEntity)){
+					carsLoadScanEntity.setCustomerName(advanceEntity.getCustomerName());
+					carsLoadScanEntity.setCustomerTelephone(advanceEntity.getCustomerPhone());
+					carsLoadScanEntity.setCustomerAddress(advanceEntity.getCustomerAddress());
+				}
+				carsLoadScanEntity.setFirsts(advanceDetailEntity.getFirstPackName());
+				carsLoadScanEntity.setSenconds(advanceDetailEntity.getSecondPackName());
+				carsLoadScanEntity.setThirds(advanceDetailEntity.getThirdPackName());
+				carsLoadScanEntity.setMaterialName(advanceDetailEntity.getMaterialName());
+				carsLoadScanEntity.setMaterialCode(advanceDetailEntity.getMaterialCode());
 				trunklineCarsLoadScanService.updateById(carsLoadScanEntity);
 
 				return R.success("同步成功");
@@ -13297,12 +13331,20 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			allAdvanceDetailList.addAll(advanceDetailEntityList);
 		});
 
+		//把allAdvanceDetailList中所有advanceId放入一个Set集合
+		Set<Long> advanceIdSet = allAdvanceDetailList.stream().map(TrunklineAdvanceDetailEntity::getAdvanceId).collect(Collectors.toSet());
+		List<TrunklineAdvanceEntity> advanceEntities = advanceService.findListByIds(new ArrayList<>(advanceIdSet));
+		//把advanceEntities转化成id为key的Map
+		Map<Long, TrunklineAdvanceEntity> advanceMap = advanceEntities.stream().collect(Collectors.toMap(TrunklineAdvanceEntity::getId, Function.identity()));
+
+
 		//把allAdvanceDetailList转化成orderPackageCode为key的Map
 		Map<String, TrunklineAdvanceDetailEntity> advanceDetailMap = allAdvanceDetailList.stream().collect(Collectors.toMap(TrunklineAdvanceDetailEntity::getOrderPackageCode, Function.identity()));
 
 		List<TrunklineCarsLoadScanEntity> updateScanList = new ArrayList<>();
 		List<TrunklineAdvanceDetailEntity> incomingAdvanceDetailList = new ArrayList<>();
 		List<TrunklineAdvanceDetailEntity> udateAdvanceDetailList = new ArrayList<>();
+		List<String> orderPackageCodeList = new ArrayList<>();
 		Set<String> orderPackageCodeSet = new HashSet<>();
 
 		carsLoadScanEntities.forEach(carsLoadScanEntity -> {
@@ -13310,6 +13352,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			Date unloadTime = carsLoadScanEntity.getUnloadTime();
 			TrunklineAdvanceDetailEntity trunklineAdvanceDetailEntity = advanceDetailMap.get(orderPackageCode);
 			if(!Objects.isNull(trunklineAdvanceDetailEntity)){
+				Long advanceId = trunklineAdvanceDetailEntity.getAdvanceId();
+
 				orderPackageCodeSet.add(orderPackageCode);
 				TrunklineCarsLoadScanEntity updateScanEntity = new TrunklineCarsLoadScanEntity();
 				updateScanEntity.setId(carsLoadScanEntity.getId());
@@ -13327,6 +13371,17 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				updateScanEntity.setOrderCode(trunklineAdvanceDetailEntity.getOrderCode());
 				updateScanEntity.setWaybillId(trunklineAdvanceDetailEntity.getWaybillId());
 				updateScanEntity.setWaybillNo(trunklineAdvanceDetailEntity.getWaybillNo());
+				TrunklineAdvanceEntity advanceEntity = advanceMap.get(advanceId);
+				if(!Objects.isNull(advanceEntity)){
+					updateScanEntity.setCustomerName(advanceEntity.getCustomerName());
+					updateScanEntity.setCustomerTelephone(advanceEntity.getCustomerPhone());
+					updateScanEntity.setCustomerAddress(advanceEntity.getCustomerAddress());
+				}
+				updateScanEntity.setFirsts(trunklineAdvanceDetailEntity.getFirstPackName());
+				updateScanEntity.setSenconds(trunklineAdvanceDetailEntity.getSecondPackName());
+				updateScanEntity.setThirds(trunklineAdvanceDetailEntity.getThirdPackName());
+				updateScanEntity.setMaterialCode(trunklineAdvanceDetailEntity.getMaterialCode());
+				updateScanEntity.setMaterialName(trunklineAdvanceDetailEntity.getMaterialName());
 				updateScanEntity.setIsData(1);
 				updateScanList.add(updateScanEntity);
 			}
@@ -13358,6 +13413,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				String reserve5 = trunklineAdvanceDetailEntity.getReserve5();
 				Date unloadTime = CommonUtil.StringToDate(reserve5);
 
+				orderPackageCodeList.add(orderPackageCode);
+
 				//查询是否有在系统无编码后进行卸车的数据
 				int unloadNum = trunklineCarsLoadScanService.findEntityByOrderPackageCodeAndUnloadTime(orderPackageCode,unloadTime);
 				if(unloadNum > 0){
@@ -13398,6 +13455,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				trunklineAdvanceDetailService.updateBatchById(updateNowWarehouseList);
 			}
 
+			if(CollUtil.isNotEmpty(updateScanList)){
+				trunklineCarsLoadScanService.updateBatchById(updateScanList);
+			}
 
 
 
@@ -13423,9 +13483,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 
 
-			udateAdvanceDetailList.forEach(trunklineAdvanceDetailEntity -> {
-
-			});
+//			udateAdvanceDetailList.forEach(trunklineAdvanceDetailEntity -> {
+//
+//			});
 
 
 		}
@@ -13444,6 +13504,14 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			dealWithAbnormalVO.setNickName(AuthUtil.getNickName());
 			dealWithAbnormalVO.setRemark("数据同步系统自动处理（"+warehouseName+" "+carsLoadEntity.getCarsNo()+" "+AuthUtil.getNickName()+"）");
 			abnormalRecordClient.dealwithOrderPackageCodes(dealWithAbnormalVO);
+
+			List<String> orderPackageCodes = new ArrayList<>(orderPackageCodeSet);
+
+			orderPackageCodes.removeAll(orderPackageCodeList);
+
+			String content = "包件在 " + warehouseName + "卸车，车次号："+carsLoadEntity.getCarsNo()+" 卸车方式：" + IncomingTypeEnum.getValue(IncomingTypeEnum.SYNC_INCOMING.getCode());
+			packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, warehouseName, WorkNodeEnums.UNLOAD_INCOMING_WAREHOUSE.getCode(), content);
+
 		}
 
 		bladeRedis.del(key);