|
|
|
@ -9319,8 +9319,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
for (DistributionParcelListEntity trayParcelListEntity : parcelListEntities) { |
|
|
|
|
log.info("#########!!!!!!!!!!!!!!!!!--------- 88888888888 parcelListEntities={}", parcelListEntities); |
|
|
|
|
if (trayParcelListEntity.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.weizhuancghe.getValue())) { |
|
|
|
|
trayParcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue()); |
|
|
|
|
trayParcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yichuku.getValue()); |
|
|
|
|
DistributionParcelListEntity updateEntity = new DistributionParcelListEntity(); |
|
|
|
|
updateEntity.setId(trayParcelListEntity.getId()); |
|
|
|
|
updateEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue()); |
|
|
|
|
updateEntity.setOrderPackageStatus(OrderPackageStatusConstant.yichuku.getValue()); |
|
|
|
|
DistributionLoadscanEntity distributionLoadscanEntity = createdDistributionLoadscanEntity(deliveryListEntity, distributionDeliverySelfEntity, distrilbutionloadingscanDTO.getReservationId(), trayParcelListEntity, myCurrentWarehouse, user); |
|
|
|
|
distributionLoadscanEntity.setMsg("司机整托装车"); |
|
|
|
|
distributionLoadscanEntity.setTrayNo(trayTypeDataVO.getTrayCode()); |
|
|
|
@ -9332,8 +9334,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
orderCodes.add(trayParcelListEntity.getOrderCode()); |
|
|
|
|
//修改包件为装车状态
|
|
|
|
|
orderPackageCodes.add(trayParcelListEntity.getOrderPackageCode()); |
|
|
|
|
trayParcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue()); |
|
|
|
|
distributionParcelListService.updateById(trayParcelListEntity); |
|
|
|
|
updateEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue()); |
|
|
|
|
distributionParcelListService.updateById(updateEntity); |
|
|
|
|
packageLockIds.add(trayParcelListEntity.getId()); |
|
|
|
|
|
|
|
|
|
content = "包件在" + myCurrentWarehouse.getName() + "由" + distributionLoadscanEntity.getScanUser() + "扫描托盘:" + distributionLoadscanEntity.getTrayNo() + "装车,配送车次号:" + deliveryListEntity.getTrainNumber() + "预约任务号:" + trayReservationEntity.getReservationCode(); |
|
|
|
|