java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

异常签收BUG修复

dist.1.3.0
汤建军 6 months ago
parent
66c1c02aa9
commit
ddd606e4ac
1 changed files with 34 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 76
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

76
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
Unescape View File

@ -3806,40 +3806,32 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
//构建异常签收
break;
}
//查询一次是否进行了异常装车,如果没有进行异常装车数据进行审核
List<DistributionLoadscanAbnormalEntity> list = distributionLoadscanAbnormalService.list(Wrappers.<DistributionLoadscanAbnormalEntity>query().lambda()
.eq(DistributionLoadscanAbnormalEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId())
.eq(DistributionLoadscanAbnormalEntity::getDeliveryListId, distrilbutionloadingscanDTO.getDeliveryId())
.eq(DistributionLoadscanAbnormalEntity::getPackageCode, distrilbutionloadingscanDTO.getBarcode())
);
if (Func.isEmpty(list)) {
DistributionLoadscanAbnormalEntity distributionLoadscanAbnormalEntity = new DistributionLoadscanAbnormalEntity();
distributionLoadscanAbnormalEntity.setAuditingStatus(LoadingAbnormalAuditingStatusConstant.daishenhe.getValue());
distributionLoadscanAbnormalEntity.setStockArticleId(parcelListEntity.getStockArticleId());
distributionLoadscanAbnormalEntity.setTrainNumber(distributionDeliveryListEntity.getTrainNumber());
distributionLoadscanAbnormalEntity.setDriverName(deliverySelfEntity.getDriverName());
distributionLoadscanAbnormalEntity.setDriverId(Long.parseLong(deliverySelfEntity.getDriverId()));
distributionLoadscanAbnormalEntity.setDriverPhone(deliverySelfEntity.getDriverPhone());
distributionLoadscanAbnormalEntity.setDeliveryListId(distributionDeliveryListEntity.getId());
distributionLoadscanAbnormalEntity.setReservationId(reservationEntity.getId());
distributionLoadscanAbnormalEntity.setDeliveryType(distributionDeliveryListEntity.getType());
distributionLoadscanAbnormalEntity.setScanUser(user.getNickName());
distributionLoadscanAbnormalEntity.setScanTime(new Date());
distributionLoadscanAbnormalEntity.setLoadingQuantity(parcelListEntity.getQuantity());
distributionLoadscanAbnormalEntity.setPackageCode(parcelListEntity.getOrderPackageCode());
distributionLoadscanAbnormalEntity.setPackageId(parcelListEntity.getId());
distributionLoadscanAbnormalEntity.setLoadingId(loadingId);
distributionLoadscanAbnormalEntity.setAbnormalType(LoadingAbnormalTypeConstant.qianshouyichang.getValue());
distributionLoadscanAbnormalEntity.setGoodsType(1);
distributionLoadscanAbnormalEntity.setWarehouseId(myCurrentWarehouse.getId());
distributionLoadscanAbnormalEntity.setWarehouseName(myCurrentWarehouse.getName());
distributionLoadscanAbnormalEntity.setGoodsType(1);
distributionLoadscanAbnormalEntity.setLoadingId(loadingId);
distributionLoadscanAbnormalEntity.setVehicleId(Long.parseLong(deliverySelfEntity.getVehicleId()));
distributionLoadscanAbnormalEntity.setVehicleName(deliverySelfEntity.getVehicleNub());
distributionLoadscanAbnormalEntity.setLoadingId(loadingId);
distributionLoadscanAbnormalService.save(distributionLoadscanAbnormalEntity);
}
DistributionLoadscanAbnormalEntity distributionLoadscanAbnormalEntity = new DistributionLoadscanAbnormalEntity();
distributionLoadscanAbnormalEntity.setAuditingStatus(LoadingAbnormalAuditingStatusConstant.daishenhe.getValue());
distributionLoadscanAbnormalEntity.setStockArticleId(parcelListEntity.getStockArticleId());
distributionLoadscanAbnormalEntity.setTrainNumber(distributionDeliveryListEntity.getTrainNumber());
distributionLoadscanAbnormalEntity.setDriverName(deliverySelfEntity.getDriverName());
distributionLoadscanAbnormalEntity.setDriverId(Long.parseLong(deliverySelfEntity.getDriverId()));
distributionLoadscanAbnormalEntity.setDriverPhone(deliverySelfEntity.getDriverPhone());
distributionLoadscanAbnormalEntity.setDeliveryListId(distributionDeliveryListEntity.getId());
distributionLoadscanAbnormalEntity.setReservationId(reservationEntity.getId());
distributionLoadscanAbnormalEntity.setDeliveryType(distributionDeliveryListEntity.getType());
distributionLoadscanAbnormalEntity.setScanUser(user.getNickName());
distributionLoadscanAbnormalEntity.setScanTime(new Date());
distributionLoadscanAbnormalEntity.setLoadingQuantity(parcelListEntity.getQuantity());
distributionLoadscanAbnormalEntity.setPackageCode(parcelListEntity.getOrderPackageCode());
distributionLoadscanAbnormalEntity.setPackageId(parcelListEntity.getId());
distributionLoadscanAbnormalEntity.setLoadingId(loadingId);
distributionLoadscanAbnormalEntity.setAbnormalType(LoadingAbnormalTypeConstant.qianshouyichang.getValue());
distributionLoadscanAbnormalEntity.setGoodsType(1);
distributionLoadscanAbnormalEntity.setWarehouseId(myCurrentWarehouse.getId());
distributionLoadscanAbnormalEntity.setWarehouseName(myCurrentWarehouse.getName());
distributionLoadscanAbnormalEntity.setGoodsType(1);
distributionLoadscanAbnormalEntity.setLoadingId(loadingId);
distributionLoadscanAbnormalEntity.setVehicleId(Long.parseLong(deliverySelfEntity.getVehicleId()));
distributionLoadscanAbnormalEntity.setVehicleName(deliverySelfEntity.getVehicleNub());
distributionLoadscanAbnormalEntity.setLoadingId(loadingId);
distributionLoadscanAbnormalService.save(distributionLoadscanAbnormalEntity);
//修改对应的签收为可审核
DistributionSignforEntity signforEntity = distributionSignforMapper.getByReservationId(reservationEntity.getId());
signforEntity.setIsHaveAbnormalPackage(2);
@ -7718,9 +7710,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
List<DistributionLoadscanEntity> pushList = new ArrayList<>();
List<DistributionLoadscaninvnEntity> pushInventoryList = new ArrayList<>();
//配置项
DistributionDeliverySelfEntity distributionDeliverySelfEntity = this.getDriver(deliveryListEntity,user,distributionDeliveryListService.judgeIsDriver(user));
if (Objects.isNull(distributionDeliverySelfEntity)){
return Resp.scanFail("当前操作人无此包件签收权限!!!","当前操作人无此包件签收权限!!!");
DistributionDeliverySelfEntity distributionDeliverySelfEntity = this.getDriver(deliveryListEntity, user, distributionDeliveryListService.judgeIsDriver(user));
if (Objects.isNull(distributionDeliverySelfEntity)) {
return Resp.scanFail("当前操作人无此包件签收权限!!!", "当前操作人无此包件签收权限!!!");
}
switch (type) {
case 1:
@ -7779,7 +7771,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
!loadscanEntity.getDriverId().equals(distributionDeliverySelfEntity.getDriverId()) ||
!loadscanEntity.getVehicleName().equals(distributionDeliverySelfEntity.getVehicleNub())
) {
return Resp.scanFail("当前操作人无此包件签收权限!!!","当前操作人无此包件签收权限");
return Resp.scanFail("当前操作人无此包件签收权限!!!", "当前操作人无此包件签收权限");
}
}
distributionLoadscanEntity = updateSignDistributionLoadscanEntity(loadscanEntity, user, parcelListEntity);
@ -8831,8 +8823,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
//查询当前操作司机
BladeUser user = AuthUtil.getUser();
Boolean driver = distributionDeliveryListService.judgeIsDriver(user);
log.info("username>>>>>>>>>>>>>user:{}",user.getNickName());
log.info("driver>>>>>>>>>>>>>user:{}",driver);
log.info("username>>>>>>>>>>>>>user:{}", user.getNickName());
log.info("driver>>>>>>>>>>>>>user:{}", driver);
if (deliveryListEntity.getKind().equals("1")) {
@ -8840,7 +8832,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
return Resp.scanFail("当前操作需由司机完成", "当前操作需由司机完成");
}
DistributionDeliverySelfEntity deliverySelfEntity = this.getDriver(deliveryListEntity, user, driver);
log.info("driverName>>>>>>>>>>>>>:{}",deliverySelfEntity.getDriverName());
log.info("driverName>>>>>>>>>>>>>:{}", deliverySelfEntity.getDriverName());
if (Objects.isNull(deliverySelfEntity)) {
@ -8910,7 +8902,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
signforEntity.setSjsigningTime(sdf.format(new Date()));
signforEntity.setDriverSigning(SignforDriverSigningStatusConstant.yiqianshou.getValue());
signforEntity.setSigneeName(user.getNickName());
log.info("driverName>>>>>>>>>>>>>:{}",user.getNickName());
log.info("driverName>>>>>>>>>>>>>:{}", user.getNickName());
signforEntity.setSigneeId(user.getUserId());
return R.data(this.updateById(signforEntity));
}

Write Preview
Loading…
Cancel
Save