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

签收BUG修复

visual
汤建军 4 months ago
parent
870353a42d
commit
7452683b79
1 changed files with 25 additions and 12 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. 37
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

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

@ -3359,8 +3359,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
if (isStrictLoading == Integer.parseInt(IsOrNoConstant.yes.getValue())) {
return R.fail("操作失败,存在未装车包件");
}
Boolean driver = distributionDeliveryListService.judgeIsDriver(AuthUtil.getUser());
DistributionDeliverySelfEntity distributionDeliverySelfEntity = this.getDriver(deliveryListEntity, AuthUtil.getUser(), driver);
DistributionDeliverySelfEntity distributionDeliverySelfEntity = this.getDriver(deliveryListEntity, AuthUtil.getUser(),distributionDeliveryListService.judgeIsDriver(AuthUtil.getUser()));
if (Objects.isNull(distributionDeliverySelfEntity)){
return Resp.scanFail("查询司机信息错误...", "查询司机信息错误");
}
DistributionDeliveryListEntity listEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId());
if (Func.isEmpty(listEntity)) {
log.error("##########配送计划异常：{}", listEntity);
@ -5424,8 +5426,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
isStrictLoading = warehouseConfig.getIsStrictLoading();
}
Boolean driver = distributionDeliveryListService.judgeIsDriver(user);
DistributionDeliverySelfEntity deliverySelfEntity = this.getDriver(distributionDeliveryListEntity, user, driver);
DistributionDeliverySelfEntity deliverySelfEntity = this.getDriver(distributionDeliveryListEntity, user,driver);
if (Objects.isNull(deliverySelfEntity)){
return Resp.scanFail("查询司机错误", "查询司机错误");
}
if (Objects.equals(distributionDeliveryListEntity.getKind(), "1")) {
if (!driver) {
return Resp.scanFail("操作失败", "当前操作由司机操作");
@ -5939,20 +5943,26 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
return Resp.scanSuccess(num + "件", num + "件");
}
private DistributionDeliverySelfEntity getDriver(DistributionDeliveryListEntity distributionDeliveryListEntity, BladeUser user, Boolean isDriverFlag) {
private DistributionDeliverySelfEntity getDriver(DistributionDeliveryListEntity distributionDeliveryListEntity, BladeUser user,boolean isDriverFlag) {
DistributionDeliverySelfEntity distributionDeliverySelfEntity = new DistributionDeliverySelfEntity();
if ("1".equals(distributionDeliveryListEntity.getKind())) {
if (isDriverFlag) {
if (isDriverFlag){
BasicdataDriverArteryEntity driverArtery = iBasicdataDriverArteryClient.getDriverArtery(user.getUserId());
if (null == driverArtery) {
log.error("没有司机的信息！！");
throw new CustomerException("没有司机的信息");
}
//查询当前扫描司机是否属于当前配送任务
distributionDeliverySelfEntity = distributionDeliverySelfMapper.selectDriverInfoByDeliveryIdAndDriverId(driverArtery.getId(), distributionDeliveryListEntity.getId());
} else {
return null;
}else {
//文员查询当前司机
distributionDeliverySelfEntity = distributionDeliverySelfMapper.selectOne(Wrappers.<DistributionDeliverySelfEntity>query().lambda()
.eq(DistributionDeliverySelfEntity::getDeliveryId,distributionDeliveryListEntity.getId())
.eq(DistributionDeliverySelfEntity::getIsMaster,2)
);
}
//查询当前扫描司机是否属于当前配送任务
} else {
DistributionDeliveryTripartiteEntity distributionDeliveryTripartiteEntity = distributionDeliveryTripartiteMapper.selectDriverInfoByDeliveryId(distributionDeliveryListEntity.getId());
if (Func.isEmpty(distributionDeliveryTripartiteEntity)) {
@ -7835,7 +7845,10 @@ 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));
DistributionDeliverySelfEntity distributionDeliverySelfEntity = this.getDriver(deliveryListEntity, user,distributionDeliveryListService.judgeIsDriver(user));
if (Objects.isNull(distributionDeliverySelfEntity)){
return Resp.scanFail("查询司机信息错误!!!", "查询司机信息错误!!!");
}
if (Objects.isNull(distributionDeliverySelfEntity)) {
return Resp.scanFail("当前操作人无此包件签收权限!!!", "当前操作人无此包件签收权限!!!");
}
@ -8888,7 +8901,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
if (!driver) {
return Resp.scanFail("当前操作需由司机完成", "当前操作需由司机完成");
}
DistributionDeliverySelfEntity deliverySelfEntity = this.getDriver(deliveryListEntity, user, driver);
DistributionDeliverySelfEntity deliverySelfEntity = this.getDriver(deliveryListEntity, user,driver);
if (deliverySelfEntity == null) {
return Resp.scanFail("当前人无操作权限", "当前人无操作权限");
}
@ -8944,7 +8957,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
if (!driver) {
return Resp.scanFail("当前操作需由司机完成", "当前操作需由司机完成");
}
DistributionDeliverySelfEntity deliverySelfEntity = this.getDriver(deliveryListEntity, user, driver);
DistributionDeliverySelfEntity deliverySelfEntity = this.getDriver(deliveryListEntity, user,driver);
log.info("driverName>>>>>>>>>>>>>:{}", deliverySelfEntity.getDriverName());
if (Objects.isNull(deliverySelfEntity)) {

Write Preview
Loading…
Cancel
Save