|
|
|
|
@ -2591,7 +2591,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); |
|
|
|
|
|
|
|
|
|
checkArgs(deliveryListDTO, myCurrentWarehouse); |
|
|
|
|
|
|
|
|
|
//是否发车限制
|
|
|
|
|
if (DeliveryStartStatusConstant.yifache.getValue().equals(deliveryListEntity.getIsStart())){ |
|
|
|
|
return R.fail("当前车次已发车"); |
|
|
|
|
} |
|
|
|
|
List<JSONObject> logs = new ArrayList<>(); |
|
|
|
|
List<JSONObject> pushDatas = new ArrayList<>(); |
|
|
|
|
//查询出原来配送信息的备货任务
|
|
|
|
|
@ -4635,16 +4638,20 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
if (!isDriverFlag) { |
|
|
|
|
return Resp.scanFail("当前操作人必须是司机！", "当前操作人必须是司机!"); |
|
|
|
|
} |
|
|
|
|
//统计该配送任务的库存品装车数
|
|
|
|
|
Integer abnormalPackageLoadingNum = distributionLoadscanMapper.statisticsAbnormalLoadingNum(distrilbutionloadingscanDTO.getDeliveryId()); |
|
|
|
|
if (abnormalPackageLoadingNum != 0) { |
|
|
|
|
return Resp.scanFail("存在异常请处理", "存在异常请处理"); |
|
|
|
|
} |
|
|
|
|
String format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(new Date()); |
|
|
|
|
String loadingId = distrilbutionloadingscanDTO.getLoadingId(); |
|
|
|
|
Boolean b = false; |
|
|
|
|
Boolean isEnd = false; |
|
|
|
|
//防止司机进行重复发车点击
|
|
|
|
|
Long isRepeat = bladeRedis.get(AuthUtil.getTenantId() + "warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "driverId:"); |
|
|
|
|
Long isRepeat = bladeRedis.get(AuthUtil.getTenantId() + ":warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "driverId:"); |
|
|
|
|
if (Func.isNotEmpty(isRepeat)) { |
|
|
|
|
return Resp.scanFail("请勿重复发车", "请勿重复发车"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if ("1".equals(distributionDeliveryListEntity.getKind())) { |
|
|
|
|
DistributionDeliverySelfEntity distributionDeliverySelfEntity = getDriver(distributionDeliveryListEntity, user, distrilbutionloadingscanDTO, isDriverFlag); |
|
|
|
|
distributionDeliverySelfEntity.setDepartureTime(format); |
|
|
|
|
@ -4654,7 +4661,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
b = distributionDeliveryTripartiteService.update(new UpdateWrapper<DistributionDeliveryTripartiteEntity>().lambda() |
|
|
|
|
.eq(DistributionDeliveryTripartiteEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId()) |
|
|
|
|
.set(DistributionDeliveryTripartiteEntity::getDepartureTime, format)); |
|
|
|
|
isEnd = true;//
|
|
|
|
|
isEnd = true; |
|
|
|
|
} |
|
|
|
|
//处理最后一个司机进行发车
|
|
|
|
|
//判断是否是最后一个司机点发车
|
|
|
|
|
@ -4665,7 +4672,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
contrastPlanAndLoading(distributionDeliveryListEntity, myCurrentWarehouse); |
|
|
|
|
//进行发车日志记录
|
|
|
|
|
} |
|
|
|
|
bladeRedis.setEx(AuthUtil.getTenantId() + "warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "driverId:", user.getUserId(), 60L * 30L); |
|
|
|
|
bladeRedis.setEx(AuthUtil.getTenantId() + ":warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "driverId:", user.getUserId(), 60L * 30L); |
|
|
|
|
//修改主表状态
|
|
|
|
|
distributionDeliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.peisongzhong.getValue()); |
|
|
|
|
baseMapper.updateById(distributionDeliveryListEntity); |
|
|
|
|
@ -4699,11 +4706,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
if (loadingCount != 0) { |
|
|
|
|
builder.append("装车" + loadingCount + "件"); |
|
|
|
|
} |
|
|
|
|
//统计该配送任务的库存品装车数
|
|
|
|
|
Integer abnormalPackageLoadingNum = distributionLoadscanMapper.statisticsAbnormalLoadingNum(distrilbutionloadingscanDTO.getDeliveryId()); |
|
|
|
|
if (abnormalPackageLoadingNum != 0) { |
|
|
|
|
return Resp.scanFail("存在异常请处理", "存在异常请处理"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
distributionAsyncService.sendTrunkineLog(distributionDeliveryListEntity.getId(), null, AuthUtil.getUser(), warehouseClient.getMyCurrentWarehouse(), 1); |
|
|
|
|
Map mapState = new HashMap(); |
|
|
|
|
mapState.put("messageId", CommonUtil.getUUID()); |
|
|
|
|
@ -4755,15 +4758,19 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
List<DistributionLoadscanAbnormalEntity> abnormalEntityList = new ArrayList<>(); |
|
|
|
|
if (!distributionParcelListEntities.isEmpty()) { |
|
|
|
|
for (DistributionParcelListEntity distributionParcelListEntity : distributionParcelListEntities) { |
|
|
|
|
DistributionLoadscanAbnormalEntity packageLoadscanAbnormalEntity = createdPakcageAbnormal(distributionDeliveryList, distributionParcelListEntity, warehouseEntity); |
|
|
|
|
abnormalEntityList.add(packageLoadscanAbnormalEntity); |
|
|
|
|
if (OrderPackageLoadingStatusConstant.weizhuancghe.getValue().equals(distributionParcelListEntity.getOrderPackageLoadingStatus())){ |
|
|
|
|
DistributionLoadscanAbnormalEntity packageLoadscanAbnormalEntity = createdPakcageAbnormal(distributionDeliveryList, distributionParcelListEntity, warehouseEntity); |
|
|
|
|
abnormalEntityList.add(packageLoadscanAbnormalEntity); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
List<DisStockListDetailEntity> disStockListDetailEntities = baseMapper.selectInventoryListByDeliveryListId(distributionDeliveryList.getId()); |
|
|
|
|
if (!disStockListDetailEntities.isEmpty()) { |
|
|
|
|
for (DisStockListDetailEntity disStockListDetailEntity : disStockListDetailEntities) { |
|
|
|
|
DistributionLoadscanAbnormalEntity inventoryLoadscanAbnormalEntity = createdInventoryPakcageAbnormal(distributionDeliveryList, disStockListDetailEntity, warehouseEntity); |
|
|
|
|
abnormalEntityList.add(inventoryLoadscanAbnormalEntity); |
|
|
|
|
if (InventoryLoadingStatusConstant.weizhuangche.getValue().equals(disStockListDetailEntity.getStockLockingStatus())){ |
|
|
|
|
DistributionLoadscanAbnormalEntity inventoryLoadscanAbnormalEntity = createdInventoryPakcageAbnormal(distributionDeliveryList, disStockListDetailEntity, warehouseEntity); |
|
|
|
|
abnormalEntityList.add(inventoryLoadscanAbnormalEntity); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
//零担
|
|
|
|
|
@ -4772,11 +4779,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
abnormalEntityList.addAll(zeroLoadscanAbnormalList); |
|
|
|
|
} |
|
|
|
|
if (!abnormalEntityList.isEmpty()) { |
|
|
|
|
//进行装车异常生成
|
|
|
|
|
distributionLoadscanAbnormalService.saveBatch(abnormalEntityList); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private DistributionLoadscanAbnormalEntity createdPakcageAbnormal(DistributionDeliveryListEntity distributionDeliveryList, DistributionParcelListEntity distributionParcelListEntity, BasicdataWarehouseEntity warehouseEntity) { |
|
|
|
|
@ -9264,153 +9268,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
return Resp.scanSuccess("操作成功", "异常" + abnormalTotal + "件"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public R newCancelLoadingscan(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) { |
|
|
|
|
String method = "######################DistributionDeliveryServiceImpl.newCancelLoadingscan"; |
|
|
|
|
if (Objects.isNull(distrilbutionloadingscanDTO.getBarcode())) { |
|
|
|
|
log.error(method + "参数缺失Barcode"); |
|
|
|
|
return Resp.fail("参数缺失,请联系管理员"); |
|
|
|
|
} |
|
|
|
|
if (Objects.isNull(distrilbutionloadingscanDTO.getDeliveryId())) { |
|
|
|
|
log.error(method + "参数缺失DeliveryId"); |
|
|
|
|
return Resp.fail("参数缺失,请联系管理员"); |
|
|
|
|
} |
|
|
|
|
if (Objects.isNull(distrilbutionloadingscanDTO.getReservationId())) { |
|
|
|
|
log.error(method + "参数缺失ReservationId"); |
|
|
|
|
return Resp.fail("参数缺失,请联系管理员"); |
|
|
|
|
} |
|
|
|
|
if (Objects.isNull(distrilbutionloadingscanDTO.getType())) { |
|
|
|
|
log.error(method + "参数缺失Type"); |
|
|
|
|
return Resp.fail("参数缺失,请联系管理员"); |
|
|
|
|
} |
|
|
|
|
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); |
|
|
|
|
if (Objects.isNull(myCurrentWarehouse)) { |
|
|
|
|
log.error(method + "参数缺失Type()"); |
|
|
|
|
return R.fail(403, "未授权!!!"); |
|
|
|
|
} |
|
|
|
|
Long deliveryId = distrilbutionloadingscanDTO.getDeliveryId(); |
|
|
|
|
Long reservationId = distrilbutionloadingscanDTO.getReservationId(); |
|
|
|
|
DistributionDeliveryListEntity deliveryListEntity = this.getById(distrilbutionloadingscanDTO.getDeliveryId()); |
|
|
|
|
if (Objects.isNull(deliveryListEntity)) { |
|
|
|
|
log.error(method + "查询配送失败,deliveryId:{}", deliveryId); |
|
|
|
|
return Resp.fail("配送信息错误,请联系管理员"); |
|
|
|
|
} |
|
|
|
|
if (!DeliveryStartStatusConstant.daifache.getValue().equals(deliveryListEntity.getIsStart())) { |
|
|
|
|
return Resp.scanFail("当前车次已发车", "当前车次已发车"); |
|
|
|
|
} |
|
|
|
|
DistributionReservationEntity reservationEntity = distributionReservationService.getById(reservationId); |
|
|
|
|
if (Objects.isNull(deliveryListEntity)) { |
|
|
|
|
log.error(method + "查询预约失败,reservationId:{}", reservationId); |
|
|
|
|
return Resp.fail("预约计划错误,请联系管理员"); |
|
|
|
|
} |
|
|
|
|
switch (distrilbutionloadingscanDTO.getType()) { |
|
|
|
|
case 1: |
|
|
|
|
//订制品
|
|
|
|
|
if (Objects.isNull(distrilbutionloadingscanDTO.getPackageIds())) { |
|
|
|
|
log.error(method + "参数缺失PackageIds()"); |
|
|
|
|
return Resp.fail("参数缺失,请联系管理员"); |
|
|
|
|
} |
|
|
|
|
List<Long> ids = Func.toLongList(distrilbutionloadingscanDTO.getPackageIds()); |
|
|
|
|
//校验包件是否存在签收包件
|
|
|
|
|
List<DistributionParcelListEntity> parcelListEntities = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda() |
|
|
|
|
.in(DistributionParcelListEntity::getId, ids) |
|
|
|
|
.eq(DistributionParcelListEntity::getWarehouseId, myCurrentWarehouse.getId()) |
|
|
|
|
); |
|
|
|
|
if (parcelListEntities.isEmpty()) { |
|
|
|
|
log.error(method + "查询包件失败:packageIds:{}", ids); |
|
|
|
|
return Resp.scanFail("包件数据错误,请联系管理员", "包件数据错误,请联系管理员"); |
|
|
|
|
} |
|
|
|
|
boolean isSignfor = parcelListEntities.stream().anyMatch(f -> OrderPackageStatusConstant.yiqianshou.getValue().equals(f.getOrderPackageStatus())); |
|
|
|
|
if (isSignfor) { |
|
|
|
|
//存在签收包件 无法继续进行取消操作
|
|
|
|
|
String errorOrderPackageCode = parcelListEntities.stream().filter(f -> OrderPackageStatusConstant.yiqianshou.getValue().equals(f.getOrderPackageStatus())).map(DistributionParcelListEntity::getOrderPackageCode).collect(Collectors.joining(",")); |
|
|
|
|
return Resp.fail("操作失败," + errorOrderPackageCode + "已签收"); |
|
|
|
|
} |
|
|
|
|
boolean isLoading = parcelListEntities.stream().anyMatch(f -> OrderPackageLoadingStatusConstant.weizhuancghe.getValue().equals(f.getOrderPackageLoadingStatus())); |
|
|
|
|
if (isLoading) { |
|
|
|
|
//存在签收包件 无法继续进行取消操作
|
|
|
|
|
String errorOrderPackageCode = parcelListEntities.stream().filter(f -> OrderPackageLoadingStatusConstant.weizhuancghe.getValue().equals(f.getOrderPackageLoadingStatus())).map(DistributionParcelListEntity::getOrderPackageCode).collect(Collectors.joining(",")); |
|
|
|
|
return Resp.fail("操作失败," + errorOrderPackageCode + "未装车"); |
|
|
|
|
} |
|
|
|
|
//进行装车取消
|
|
|
|
|
distributionLoadscanService.remove(Wrappers.<DistributionLoadscanEntity>update().lambda() |
|
|
|
|
.eq(DistributionLoadscanEntity::getDeliveryId, deliveryId) |
|
|
|
|
.eq(DistributionLoadscanEntity::getReservationId, reservationId) |
|
|
|
|
.in(DistributionLoadscanEntity::getPackageId, ids) |
|
|
|
|
); |
|
|
|
|
//包件状态维护
|
|
|
|
|
distributionParcelListService.update(Wrappers.<DistributionParcelListEntity>update().lambda() |
|
|
|
|
.in(DistributionParcelListEntity::getId, ids) |
|
|
|
|
.set(DistributionParcelListEntity::getOrderPackageLoadingStatus, OrderPackageLoadingStatusConstant.weizhuancghe.getValue()) |
|
|
|
|
); |
|
|
|
|
//维护订单
|
|
|
|
|
String orderCode = parcelListEntities.stream().map(DistributionParcelListEntity::getOrderCode).collect(Collectors.joining(",")); |
|
|
|
|
distributionStockArticleService.maintenanceOrderInfo(orderCode, myCurrentWarehouse.getId()); |
|
|
|
|
//增加日志
|
|
|
|
|
List<JSONObject> cancelPackageLogList = handleCancelPackagelog(parcelListEntities, myCurrentWarehouse, deliveryListEntity.getTrainNumber(), reservationEntity.getReservationCode()); |
|
|
|
|
if (!cancelPackageLogList.isEmpty()) { |
|
|
|
|
trunklinePackageTrackLogClient.addPackageTrackLog(cancelPackageLogList); |
|
|
|
|
} |
|
|
|
|
//扣减装车数量
|
|
|
|
|
distributionSignforMapper.deductionLoadingPacjageNum(reservationId,deliveryId,parcelListEntities.size()); |
|
|
|
|
break; |
|
|
|
|
case 2: |
|
|
|
|
//零担
|
|
|
|
|
break; |
|
|
|
|
case 3: |
|
|
|
|
if (Objects.isNull(distrilbutionloadingscanDTO.getPackageIds())) { |
|
|
|
|
log.error(method + "参数缺失PackageIds()"); |
|
|
|
|
return Resp.fail("参数缺失,请联系管理员"); |
|
|
|
|
} |
|
|
|
|
List<Long> inventoryPackageIds = Func.toLongList(distrilbutionloadingscanDTO.getPackageIds()); |
|
|
|
|
//查询库存品包件信息
|
|
|
|
|
List<DisStockListDetailEntity> disStockListDetailEntities = disStockListDetailService.listByIds(inventoryPackageIds); |
|
|
|
|
if (!disStockListDetailEntities.isEmpty()) { |
|
|
|
|
log.error(method + "查询库存品包件失败:inventoryPackageIds:{}", inventoryPackageIds); |
|
|
|
|
return Resp.scanFail("库存品包件数据错误,请联系管理员", "库存品包件数据错误,请联系管理员"); |
|
|
|
|
} |
|
|
|
|
//查询是否存在签收
|
|
|
|
|
boolean inventoryIsSignfor = disStockListDetailEntities.stream().anyMatch(f -> InventorySigningStatusConstant.yiqianshou.getValue().equals(f.getStockSignfoStatus())); |
|
|
|
|
if (inventoryIsSignfor) { |
|
|
|
|
String errorInventoryCode = disStockListDetailEntities.stream() |
|
|
|
|
.filter(f -> InventorySigningStatusConstant.yiqianshou.getValue() |
|
|
|
|
.equals(f.getStockSignfoStatus())).map(DisStockListDetailEntity::getStockPackageCode) |
|
|
|
|
.collect(Collectors.joining(",")); |
|
|
|
|
return Resp.fail("操作失败," + errorInventoryCode + "已签收"); |
|
|
|
|
} |
|
|
|
|
boolean inventoryIsLoading= disStockListDetailEntities.stream().anyMatch(f -> InventoryLoadingStatusConstant.weizhuangche.getValue().equals(f.getStockLockingStatus())); |
|
|
|
|
if (inventoryIsLoading) { |
|
|
|
|
String errorInventoryCode = disStockListDetailEntities.stream() |
|
|
|
|
.filter(f -> InventoryLoadingStatusConstant.weizhuangche.getValue().equals(f.getStockLockingStatus())).map(DisStockListDetailEntity::getStockPackageCode) |
|
|
|
|
.collect(Collectors.joining(",")); |
|
|
|
|
return Resp.fail("操作失败," + errorInventoryCode + "未装车"); |
|
|
|
|
} |
|
|
|
|
//进行装车取消
|
|
|
|
|
distributionLoadscaninvnService.remove(Wrappers.<DistributionLoadscaninvnEntity>update().lambda() |
|
|
|
|
.eq(DistributionLoadscaninvnEntity::getDeliveryId,deliveryId) |
|
|
|
|
.eq(DistributionLoadscaninvnEntity::getReservationId,reservationId) |
|
|
|
|
.in(DistributionLoadscaninvnEntity::getInventoryPackageId,inventoryPackageIds) |
|
|
|
|
.set(DistributionLoadscaninvnEntity::getScanStatus,LoadingStatusConstant.quxiao.getValue()) |
|
|
|
|
); |
|
|
|
|
//维护库存品包件状态
|
|
|
|
|
disStockListDetailService.update(Wrappers.<DisStockListDetailEntity>update().lambda() |
|
|
|
|
.in(DisStockListDetailEntity::getId,inventoryPackageIds) |
|
|
|
|
.set(DisStockListDetailEntity::getStockLockingStatus,InventoryLoadingStatusConstant.weizhuangche.getValue()) |
|
|
|
|
); |
|
|
|
|
//装车数量扣减
|
|
|
|
|
distributionSignforMapper.deductionLoadingPacjageNum(reservationId,deliveryId,inventoryPackageIds.size()); |
|
|
|
|
//库存品
|
|
|
|
|
break; |
|
|
|
|
default: |
|
|
|
|
log.error(method + "未知Type:{}", distrilbutionloadingscanDTO.getType()); |
|
|
|
|
return Resp.scanFail("操作失败", "操作失败"); |
|
|
|
|
} |
|
|
|
|
//维护预约计划
|
|
|
|
|
distributionReservationService.maintenanceReservationInfo(reservationId); |
|
|
|
|
//维护配送计划
|
|
|
|
|
this.maintenanceDeliveryInfo(deliveryId); |
|
|
|
|
return Resp.scanSuccess("操作成功","操作成功"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private List<JSONObject> handleCancelPackagelog(List<DistributionParcelListEntity> parcelListEntities, BasicdataWarehouseEntity warehouse, String trainNumber, String reservationCode) { |
|
|
|
|
List<JSONObject> packageLogList = new ArrayList<>(); |
|
|
|
|
|
