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

增加装车数据补录

single_db
汤建军 1 year ago
parent
5c20790cad
commit
46cffa79ba
3 changed files with 12 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      blade-biz-common/src/main/java/org/springblade/common/constant/loading/LoadingStatusConstant.java
  2. 3
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
  3. 15
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

3
blade-biz-common/src/main/java/org/springblade/common/constant/loading/LoadingStatusConstant.java
Unescape View File

@ -10,7 +10,8 @@ public enum LoadingStatusConstant {
quxiao("取消","1"), quxiao("取消","1"),
saomiao("扫描","2"), saomiao("扫描","2"),
queren("确认","3"), queren("确认","3"),
yijianzhuangche("一键装车","4"); yijianzhuangche("一键装车","4"),
bulu("补录","5");
/** /**

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

@ -4147,6 +4147,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
case "4": case "4":
parcelListVO.setScanStatus(LoadingStatusConstant.yijianzhuangche.getName()); parcelListVO.setScanStatus(LoadingStatusConstant.yijianzhuangche.getName());
break; break;
case "5":
parcelListVO.setScanStatus(LoadingStatusConstant.bulu.getName());
break;
} }
parcelListVO.setLoadingNub(loadscanEntity.getLoadedNub()); parcelListVO.setLoadingNub(loadscanEntity.getLoadedNub());
} }

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

@ -905,6 +905,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId()); distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());
} }
distributionLoadscanEntity.setScanTime(signingTime); distributionLoadscanEntity.setScanTime(signingTime);
distributionLoadscanEntity.setScanStatus(LoadingStatusConstant.bulu.getValue());
distributionLoadscanEntity.setPackageId(collect.get(0).getId()); distributionLoadscanEntity.setPackageId(collect.get(0).getId());
distributionLoadscanEntity.setOrderPackageCode(distrilbutionloadingscanDTO.getBarcode()); distributionLoadscanEntity.setOrderPackageCode(distrilbutionloadingscanDTO.getBarcode());
distributionLoadscanEntity.setSigningTime(signingTime); distributionLoadscanEntity.setSigningTime(signingTime);
@ -1270,6 +1271,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
//修改签收数量 //修改签收数量
// Integer j = distributionSignforMapper.updateSignforNum(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub()); // Integer j = distributionSignforMapper.updateSignforNum(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
if (Func.isEmpty(loadscanEntity)) { if (Func.isEmpty(loadscanEntity)) {
distributionLoadscanEntity.setScanStatus(LoadingStatusConstant.bulu.getValue());
//更新装车包件数和签收包件数 //更新装车包件数和签收包件数
distributionLoadscanService.save(distributionLoadscanEntity); distributionLoadscanService.save(distributionLoadscanEntity);
//更新装车和签收数 //更新装车和签收数
@ -1337,6 +1339,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
distributionLoadscanEntity.setScanUser(AuthUtil.getUser().getUserName()); distributionLoadscanEntity.setScanUser(AuthUtil.getUser().getUserName());
distributionLoadscanEntity.setSigningUserId(AuthUtil.getUser().getUserId()); distributionLoadscanEntity.setSigningUserId(AuthUtil.getUser().getUserId());
if (Func.isEmpty(loadscanEntity)){ if (Func.isEmpty(loadscanEntity)){
distributionLoadscanEntity.setScanStatus(LoadingStatusConstant.bulu.getValue());
distributionLoadscanService.save(distributionLoadscanEntity); distributionLoadscanService.save(distributionLoadscanEntity);
Integer j = distributionSignforMapper.updateSignforByReservationId(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub()); Integer j = distributionSignforMapper.updateSignforByReservationId(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
}else { }else {
@ -1389,8 +1392,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
this.updateById(signforEntity); this.updateById(signforEntity);
//修改包件的签收数量 //修改包件的签收数量
distributionParcelListMapper.updateOrderPackageCodeById(parcelListEntity.getId(),OrderPackageStatusConstant.yiqianshou.getValue()); distributionParcelListMapper.updateOrderPackageCodeById(parcelListEntity.getId(),OrderPackageStatusConstant.yiqianshou.getValue());
//还需要维护包件状态
distributionAsyncService.maintenanceOrderStatus(parcelListEntity.getOrderCode(),parcelListEntity.getWarehouseId());
} else { } else {
log.error("############出现相同的包件码:{}", distrilbutionloadingscanDTO.getBarcode()); log.error("############出现相同的包件码:{}", distrilbutionloadingscanDTO.getBarcode());
return Resp.scanFail("操作失败", "包件信息有误"); return Resp.scanFail("操作失败", "包件信息有误");
@ -1662,7 +1663,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
distributionLoadscaninvnEntity.setScanUser(user.getUserName()); distributionLoadscaninvnEntity.setScanUser(user.getUserName());
distributionLoadscaninvnEntity.setScanTime(simpleDateFormat.format(new Date())); distributionLoadscaninvnEntity.setScanTime(simpleDateFormat.format(new Date()));
distributionLoadscaninvnEntity.setPackageNub(inventory.get(0).getNum()); distributionLoadscaninvnEntity.setPackageNub(inventory.get(0).getNum());
distributionLoadscaninvnEntity.setScanStatus(LoadingStatusConstant.yijianzhuangche.getValue()); distributionLoadscaninvnEntity.setScanStatus(LoadingStatusConstant.bulu.getValue());
distributionLoadscaninvnEntity.setIsInsert(LoadingIsInsertConstant.bulu.getValue()); distributionLoadscaninvnEntity.setIsInsert(LoadingIsInsertConstant.bulu.getValue());
distributionLoadscaninvnEntity.setScanType("1"); distributionLoadscaninvnEntity.setScanType("1");
distributionLoadscaninvnEntity.setType(2); distributionLoadscaninvnEntity.setType(2);
@ -2315,7 +2316,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
newLoadscaninvnEntity.setScanUser(user.getNickName()); newLoadscaninvnEntity.setScanUser(user.getNickName());
newLoadscaninvnEntity.setScanTime(simpleDateFormat.format(new Date())); newLoadscaninvnEntity.setScanTime(simpleDateFormat.format(new Date()));
newLoadscaninvnEntity.setPackageNub(detailEntity.getNum()); newLoadscaninvnEntity.setPackageNub(detailEntity.getNum());
newLoadscaninvnEntity.setScanStatus(LoadingStatusConstant.yijianzhuangche.getValue()); newLoadscaninvnEntity.setScanStatus(LoadingStatusConstant.bulu.getValue());
newLoadscaninvnEntity.setIsInsert(LoadingIsInsertConstant.bulu.getValue()); newLoadscaninvnEntity.setIsInsert(LoadingIsInsertConstant.bulu.getValue());
newLoadscaninvnEntity.setScanType("1"); newLoadscaninvnEntity.setScanType("1");
newLoadscaninvnEntity.setType(2); newLoadscaninvnEntity.setType(2);
@ -2459,7 +2460,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
loadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone()); loadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone());
} }
loadscanEntity.setLoadingId(distributionDeliverySelfEntity.getId().toString()); loadscanEntity.setLoadingId(distributionDeliverySelfEntity.getId().toString());
loadscanEntity.setScanStatus(LoadingStatusConstant.yijianzhuangche.getValue()); loadscanEntity.setScanStatus(LoadingStatusConstant.bulu.getValue());
loadscanEntity.setIsInsert(LoadingIsInsertConstant.bulu.getValue()); loadscanEntity.setIsInsert(LoadingIsInsertConstant.bulu.getValue());
loadscanEntity.setScanType("1"); loadscanEntity.setScanType("1");
loadscanEntity.setType(2); loadscanEntity.setType(2);
@ -2541,7 +2542,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
loadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone()); loadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone());
} }
loadscanEntity.setLoadingId(distributionDeliverySelfEntity.getId().toString()); loadscanEntity.setLoadingId(distributionDeliverySelfEntity.getId().toString());
loadscanEntity.setScanStatus(LoadingStatusConstant.yijianzhuangche.getValue()); loadscanEntity.setScanStatus(LoadingStatusConstant.bulu.getValue());
loadscanEntity.setIsInsert(LoadingIsInsertConstant.bulu.getValue()); loadscanEntity.setIsInsert(LoadingIsInsertConstant.bulu.getValue());
loadscanEntity.setScanType("1"); loadscanEntity.setScanType("1");
loadscanEntity.setType(2); loadscanEntity.setType(2);
@ -2601,8 +2602,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
String orderCode = orderCodes.stream().distinct().collect(Collectors.joining(",")); String orderCode = orderCodes.stream().distinct().collect(Collectors.joining(","));
distributionStockArticleService.maintenanceOrderInfo(orderCode,myCurrentWarehouse.getId()); distributionStockArticleService.maintenanceOrderInfo(orderCode,myCurrentWarehouse.getId());
} }
if (Func.isNotEmpty(packageIds)) { if (Func.isNotEmpty(packageIds)) {
distributionAsyncService.handlPakcage(packageIds, myCurrentWarehouse.getId()); distributionAsyncService.handlPakcage(packageIds, myCurrentWarehouse.getId());
//批量推送 //批量推送

Write Preview
Loading…
Cancel
Save