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

商配计划查看包件BUG修复

dist.1.3.0
汤建军 8 months ago
parent
4f369386eb
commit
4d43d62b5d
2 changed files with 51 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. 28
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
  2. 35
      blade-service/logpm-report/src/main/java/com/logpm/report/controller/WarehouseIndexController.java

28
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
Unescape View File

@ -5451,6 +5451,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
@Override
public R getPackageListByDeliveryIdAndOrderId(IPage<Object> page, Long deliveryId, Long orderId) {
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
if (Func.isEmpty(myCurrentWarehouse)){
return R.fail(403,"未授权!!!");
}
List<DistributionParcelListVO> allPackageList = new ArrayList<>();
List<DistributionParcelListEntity> reservationPackageList = baseMapper.getPackageListByDeliveryId(deliveryId, orderId);
DistributionReservationOrderPackageVO reservationOrderPackageVO = new DistributionReservationOrderPackageVO();
@ -5458,6 +5462,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
LambdaQueryWrapper<DistributionParcelListEntity> parcelListEntityLambdaQueryWrapper = Wrappers.<DistributionParcelListEntity>query().lambda()
.notIn(DistributionParcelListEntity::getOrderPackageStatus, OrderPackageStatusConstant.yiqianshou.getValue(), OrderPackageStatusConstant.yichuku.getValue())
.ne(DistributionParcelListEntity::getOrderPackageLoadingStatus, OrderPackageLoadingStatusConstant.yizhuangche.getValue())
.eq(DistributionParcelListEntity::getWarehouseId, myCurrentWarehouse.getId())
.eq(DistributionParcelListEntity::getStockArticleId, orderId);
if (Func.isNotEmpty(reservationPackageList)) {
List<Long> packageIds = reservationPackageList.stream().map(DistributionParcelListEntity::getId).collect(Collectors.toList());
@ -7025,7 +7030,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
List<DistributionStockArticleEntity> distributionStockArticleEntities = distributionStockArticleService.listByIds(ids);
if (!distributionStockArticleEntities.isEmpty()) {
String orderCodes = distributionStockArticleEntities.stream().map(DistributionStockArticleEntity::getOrderCode).distinct().collect(Collectors.joining(",\n"));
return R.fail(orderCodes+"当前订单已装车,请滞留后进行移除");
return R.fail(orderCodes + "当前订单已装车,请滞留后进行移除");
}
}
return R.data(true);
@ -7287,7 +7292,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
BeanUtils.copyProperties(distributionDeliveryTripartiteEntity, distributionDeliverySelfEntity);
}
if (Func.isEmpty(distributionDeliverySelfEntity)){
if (Func.isEmpty(distributionDeliverySelfEntity)) {
//查询司机信息失败
log.error("查询司机信息失败");
}
@ -7336,7 +7341,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
BladeUser user = AuthUtil.getUser();
user.setNickName(loadscanEntity.getDriverName());
Integer m = distributionSignforMapper.updateSignUser(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), user);
content = "包件在" + entityWarehouseId.getName() + "由" + loadscanEntity.getSigningUser() + "扫描签收,签收方式:司机进行装车,由商家端进行签收,配送车次号:" + deliveryListEntity.getTrainNumber() + "预约任务号:" + reservationEntity.getReservationCode();
content = "包件在" + entityWarehouseId.getName() + "由" + loadscanEntity.getSigningUser() + "扫描签收,签收方式:司机进行装车,由商家端进行签收,配送车次号:" + deliveryListEntity.getTrainNumber() + "预约任务号:" + reservationEntity.getReservationCode();
} else {
//查询配送计划的计划司机
DistributionLoadscanEntity distributionLoadscanEntity = new DistributionLoadscanEntity();
@ -7417,12 +7422,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
if (!loadscanEntityList.isEmpty()) {
//存在装车
if (loadscanEntityList.size() == 1) {
//判定是否是本车次的装车
//判定是否是本车次的装车
isSatisfy = loadscanEntityList.stream().anyMatch(a -> deliveryListEntity.getId().equals(a.getDeliveryId()));
if (isSatisfy){
if (isSatisfy) {
//本车次的异常装车
DistributionLoadscanEntity distributionLoadscanEntity = loadscanEntityList.get(0);
if (distributionLoadscanEntity.equals("2")){
if (distributionLoadscanEntity.equals("2")) {
//进行异常签收的标识
//存在装车数据
distributionLoadscanEntity.setSigningTime(simpleDateFormat.format(new Date()));
@ -7449,10 +7454,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
} else {
log.error("商家端异常签收存在装车非本车次计划");
}
}else {
} else {
log.error("商家端签收非计划下存在多条装车记录");
}
}else {
} else {
DistributionLoadscanEntity distributionLoadscanEntity = new DistributionLoadscanEntity();
if (StringUtils.isNotBlank(distributionDeliverySelfEntity.getDriverPhone())) {
distributionLoadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone());
@ -7508,10 +7513,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
content = "包件在" + entityWarehouseId.getName() + "由" + distributionLoadscanEntity.getSigningUser() + "扫描签收,签收方式:司机未进行装车,由商家端进行异常签收,配送车次号:" + deliveryListEntity.getTrainNumber() + "预约任务号:" + reservationList.get(0).getReservationCode();
}
}else {
} else {
log.error("一个车次内存在两个同样客户");
}
}else {
} else {
log.error("商家签收车次内不存在该客户");
}
}
@ -7527,13 +7532,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
//下架解托
warehouseUpdownTypeClient.downPackageAndDelTrayAndIsUpdate(packageObj.getOrderPackageCode(), entityWarehouseId.getId(), "扫描装车进行下架、解托", false);
//维护订单
distributionStockArticleService.maintenanceOrderInfo(stockArticleEntity.getOrderCode(),warehouseId);
distributionStockArticleService.maintenanceOrderInfo(stockArticleEntity.getOrderCode(), warehouseId);
//维护车次任务状态
deliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.peisongzhong.getValue());
distributionDeliveryListService.updateById(deliveryListEntity);
}
}

35
blade-service/logpm-report/src/main/java/com/logpm/report/controller/WarehouseIndexController.java
Unescape View File

@ -269,4 +269,39 @@ public class WarehouseIndexController {
}
@ResponseBody
@PostMapping("/deliveryData")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "卸车异常数据", notes = "传入indexDTO")
public R deliveryData(@RequestBody IndexDTO indexDTO) {
String method = "###########unloadAbnormalData: ";
log.info(method+"indexDTO={}",indexDTO);
try{
List<Long> warehouseIds = new ArrayList<>();
//当前登录人选择的仓库
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
if(Objects.isNull(myCurrentWarehouse)){
List<BasicdataWarehouseEntity> myWatchWarehouse = warehouseClient.getMyWatchWarehouse();
myWatchWarehouse.forEach(warehouseEntity -> {
warehouseIds.add(warehouseEntity.getId());
});
}else{
warehouseIds.add(myCurrentWarehouse.getId());
}
indexDTO.setWarehouseIds(warehouseIds);
//查询订制品打托列表
IndexUnloadAbnormalDataVO indexUnloadAbnormalDataVO = warehouseIndexService.unloadAbnormalData(indexDTO);
return R.data(indexUnloadAbnormalDataVO);
}catch (CustomerException e){
log.warn(e.message);
return R.fail(e.code,e.message);
}catch (Exception e){
log.error(method+"系统异常，联系管理员",e);
return R.fail(500,"系统异常，联系管理员");
}
}
}

Write Preview
Loading…
Cancel
Save