1.修改程序代码报错

2.增加异常签收报错的语音

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java

@@ -253,7 +253,6 @@ public interface IDistributionReservationService extends BaseService<Distributio
 	/**
 	 * 维护预约计划状态
 	 * @param reservationId
-	 * @param warehouseId
 	 */
     void maintenanceReservationInfo(Long reservationId);
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -963,7 +963,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 										trunklinePackageTrackLog.put("createDept",loadscanEntity.getCreateDept());
 										trunklinePackageTrackLog.put("orderPackageCode",loadscanEntity.getOrderPackageCode());
 										trunklinePackageTrackLog.put("warehouseId",loadscanEntity.getWarehouseId()==null?myCurrentWarehouse.getId():loadscanEntity.getWarehouseId());
-										trunklinePackageTrackLog.put("warehouseId",loadscanEntity.getWarehouseName()==null?myCurrentWarehouse.getName():loadscanEntity.getWarehouseName());
+										trunklinePackageTrackLog.put("warehouseName",loadscanEntity.getWarehouseName()==null?myCurrentWarehouse.getName():loadscanEntity.getWarehouseName());
 										trunklinePackageTrackLog.put("workNode",WorkNodeEnums.DISTRIBUTION_LOADING.getCode());
 										trunklinePackageTrackLog.put("content",content);
 										trunklinePackageTrackLog.put("operator",loadscanEntity.getScanUser());

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java

@@ -3715,13 +3715,13 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			boolean stockUpStatus = false;
 			if (Func.isNotEmpty(distributionParcelListEntities)){
 				loadStatus = distributionParcelListEntities.stream().allMatch(p -> p.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.yizhuangche.getValue()));
-				signStatus = distributionParcelListEntities.stream().allMatch(p->p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue()));
+//				signStatus = distributionParcelListEntities.stream().allMatch(p->p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue()));
 				stockUpStatus = distributionParcelListEntities.stream().allMatch(p->p.getOrderPackageStockupStatus().equals(OrderPackageStockupStatusConstant.yibeihu.getValue()));
 			}
 
 			if (Func.isNotEmpty(disStockListDetailEntities)){
 				loadStatus = disStockListDetailEntities.stream().allMatch(p -> p.getStockLockingStatus().equals(OrderPackageLoadingStatusConstant.yizhuangche.getValue()));
-				signStatus = disStockListDetailEntities.stream().anyMatch(p->p.getStockSignfoStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue()));
+//				signStatus = disStockListDetailEntities.stream().anyMatch(p->p.getStockSignfoStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue()));
 				stockUpStatus = disStockListDetailEntities.stream().allMatch(p->p.getStockStatus().equals(OrderPackageStockupStatusConstant.yibeihu.getValue()));
 			}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@@ -3194,20 +3194,20 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						loadscanEntity = loadscanEntityList.get(0);
 					}else {
 						log.error("##############异常签收包件在其他车次进行装车reservationId:{}", loadscanEntityList.stream().map(DistributionLoadscanEntity::getReservationId).map(String::valueOf).collect(Collectors.joining(",")));
-						return Resp.scanFail("操作失败", "包件已出库");
+						return Resp.scanFail("操作失败", "该包件已在其它车次进行装车");
 					}
 				}
 
 				if (loadscanEntityList.size() > 1){
 					log.error("##############异常签收包件在其他车次进行装车reservationId:{}", loadscanEntityList.stream().map(DistributionLoadscanEntity::getReservationId).map(String::valueOf).collect(Collectors.joining(",")));
-					return Resp.scanFail("操作失败", "包件已出库");
+					return Resp.scanFail("操作失败", "该包件已在其它车次进行装车");
 				}
 
 			}
 
 			if (Func.isNotEmpty(loadscanEntity)) {
-				if (loadscanEntity.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())) {
-					return Resp.scanFail("重复操作!!", "重复操作");
+				if (LoadScanSigningStatusConstant.yiqianshou.getValue().equals(loadscanEntity.getSignforState())) {
+					return Resp.scanFail("重复操作!!", "重复扫码");
 				}
 			}
 			String content = "包件在"+myCurrentWarehouse.getName()+"由"+AuthUtil.getNickName()+"扫描异常签收,装车方式:补录装车,配送车次号:"+distributionDeliveryListEntity.getTrainNumber()+"预约任务号:"+reservationEntity.getReservationCode();
@@ -3221,6 +3221,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						if (Func.isNotEmpty(loadscanEntity)) {
 							distributionLoadscanEntity = loadscanEntity;
 						}
+
 						if (StringUtils.isNotBlank(distributionDeliverySelfEntity.getDriverPhone())) {
 							distributionLoadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone());
 						}

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

@@ -505,6 +505,9 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 		//如果send_order_status = 1 则修改工单记录
 		for (AftersalesAbnormalRecordEntity abnormalRecordEntity : abnormalRecordEntities) {
 			Integer sendOrderStatus = abnormalRecordEntity.getSendOrderStatus();
+			if(Objects.isNull(sendOrderStatus)){
+				continue;
+			}
 
 			if(sendOrderStatus == 1){
 				//修改对应工单记录

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

@@ -1443,6 +1443,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 			//把lineCarsOrderList中的所有运单号合并成一个集合
 			List<String> waybillNos = addList.stream().map(TrunklineCarsOrderDTO::getWaybillNo).collect(Collectors.toList());
+
+			if(waybillNos.isEmpty()){
+				log.warn("##########saveNew: 运单有变动，请重新做计划");
+				throw new CustomerException(400, "运单有变动，请重新做计划");
+			}
+
+
 			List<WarehouseWaybillEntity> freezeOrAbolishWaybillList = warehouseWaybillClient.findFreezeOrAbolishByWaybillNos(waybillNos);
 			if (!CollUtil.isEmpty(freezeOrAbolishWaybillList)) {
 				log.warn("##########saveNew: 运单有变动，请重新做计划");

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

@@ -168,7 +168,12 @@ public class TrunklineWaybillPackageServiceImpl extends BaseServiceImpl<Trunklin
 				QueryWrapper<TrunklineWaybillPackageEntity> queryWrapper = new QueryWrapper<>();
 				queryWrapper.eq("order_package_code",orderPackageCode)
 					.eq("is_deleted",0);
-				TrunklineWaybillPackageEntity waybillPackageEntity = baseMapper.selectOne(queryWrapper);
+				List<TrunklineWaybillPackageEntity> trunklineWaybillPackageEntities = baseMapper.selectList(queryWrapper);
+				if(trunklineWaybillPackageEntities.isEmpty()){
+					continue;
+				}
+				TrunklineWaybillPackageEntity waybillPackageEntity = trunklineWaybillPackageEntities.get(0);
+
 				if(Objects.isNull(waybillPackageEntity)){
 					continue;
 				}