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

仓库Id字段增加

training
kilo 1 year ago
parent
572e65b5a7
commit
a643725f67
1 changed files with 23 additions and 2 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. 25
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java

25
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
Unescape View File

@ -254,6 +254,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
reservationEntity.setReservationStatus(ReservationStatusConstant.daiqueren.getValue());
//新建预约单订单处于未备货状态
reservationEntity.setStockupStatus(ReservationStockupStatusConstant.weibeihuo.getValue());
reservationEntity.setWarehouseId(myCurrentWarehouse.getId());
this.save(reservationEntity);
//获取新增预约信息的编号
Long reservationId = reservationEntity.getId();
@ -275,6 +276,12 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
AtomicReference<BigDecimal> initTotal = new AtomicReference<>(BigDecimal.ZERO);
//存在订单构建预约订单关联信息
if (!Func.isEmpty(stockArticleList)) {
boolean flag = stockArticleList.stream().anyMatch(s -> s.getReservationStatus().equals(OrderReservationStatusConstant.yiyueyue.getValue()));
if (flag){
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
log.error("预约选择订单被多次预约");
return R.fail("订单已预约!!!");
}
//存在订单的情况下才会对预约和包件的关系进行维护
//选择了订单但是未进行包件的选择，默认选择了订单下的所有在库包件
stockArticleList.forEach(s -> {
@ -542,6 +549,11 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
log.error("参数异常:+{" + stockUpInfo + "}");
return R.fail("服务器正忙!!!");
}
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
if (Func.isEmpty(myCurrentWarehouse)){
log.error("myCurrentWarehouse参数异常:+{"+myCurrentWarehouse+"}");
return R.fail("请先选择作业仓库!!!");
}
boolean result = false;
try {
//获取前端携带批量转备货的id
@ -567,6 +579,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
stockupEntity.setTypeService(DistributionTypeConstant.shipie.getValue());
//设置备货任务备货时间
stockupEntity.setStockupDate(date);
//设置仓库
stockupEntity.setWarehouseId(myCurrentWarehouse.getId());
//保存备货任务数据获取备货数据ID
result = distributionStockupService.save(stockupEntity);
Long id = stockupEntity.getId();
@ -712,6 +726,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
distributionStockupEntity.setTypeService(DistributionTypeConstant.shipie.getValue());
//编码生成规则 BH+仓库编码+年月日+序号00001
distributionStockupEntity.setStockupCode(bianMa());
distributionStockupEntity.setWarehouseId(myCurrentWarehouse.getId());
distributionStockupService.save(distributionStockupEntity);
}
HashSet<String> warehouseNames = new HashSet<>();
@ -1234,6 +1249,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
BladeUser user = AuthUtil.getUser();
stockupEntity.setStockupUser(user.getUserName());
stockupEntity.setStockupUserId(user.getUserId());
stockupEntity.setWarehouseId(myCurrentWarehouse.getId());
stockupEntity.setLoaderId(stockup.getLoaderId());
stockupEntity.setStockupArea(stockup.getGoodsAreaName());
stockupEntity.setOutboundDate(stockup.getOutboundDate());
@ -1256,8 +1272,6 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
distributionDeliveryListService.save(distributionDeliveryListEntity);
//获取所有订单
List<DistributionStockArticleDTO> stockArticle = allocationDTO.getStockArticle();
//根据运单号进行分组
//TODO 这里先根据运单号进行运单信息查询，后期根据运单进行
Map<String, List<DistributionStockArticleDTO>> mallClient = stockArticle.stream().collect(Collectors.groupingBy(DistributionStockArticleDTO::getWaybillNumber));
@ -1810,6 +1824,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
if (Func.isEmpty(myCurrentWarehouse)){
return R.fail("无仓库信息!!!");
}
//构建预约单
DistributionReservationEntity reservationEntity = new DistributionReservationEntity();
Func.copy(distributionReservationDTO, reservationEntity);
@ -1849,6 +1864,12 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
if (!Func.isEmpty(stockArticleList)) {
//存在订单的情况下才会对预约和包件的关系进行维护
//选择了订单但是未进行包件的选择，默认选择了订单下的所有在库包件
boolean flag = stockArticleList.stream().anyMatch(s -> s.getReservationStatus().equals(OrderReservationStatusConstant.yiyueyue.getValue()));
if (flag){
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
log.error("预约选择订单被多次预约");
return R.fail("订单已预约!!!");
}
stockArticleList.forEach(s -> {
// storeName.add(s.getStoreName());
// mallName.add(s.getMallName());

Write Preview
Loading…
Cancel
Save