|
|
@ -3353,6 +3353,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb |
|
|
|
//查询订单包件数量签收的信息
|
|
|
|
//查询订单包件数量签收的信息
|
|
|
|
DistributionStockArticleEntity one = distributionStockArticleEntityList.stream().filter(s -> s.getId().equals(so.getStockArticleId())).findFirst().orElse(null); |
|
|
|
DistributionStockArticleEntity one = distributionStockArticleEntityList.stream().filter(s -> s.getId().equals(so.getStockArticleId())).findFirst().orElse(null); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
DistributionStockArticleEntity upObj =new DistributionStockArticleEntity(); |
|
|
|
|
|
|
|
upObj.setId(so.getStockArticleId()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<DistributionBillLadingScanEntity> list2 = new ArrayList<>(); |
|
|
|
List<DistributionBillLadingScanEntity> list2 = new ArrayList<>(); |
|
|
|
for (DistributionBillLadingScanEntity distributionBillLadingScanEntity : distributionBillLadingScanEntities) { |
|
|
|
for (DistributionBillLadingScanEntity distributionBillLadingScanEntity : distributionBillLadingScanEntities) { |
|
|
@ -3361,7 +3364,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
one.setOrderStatus(OrderStatusConstant.bufenqianshou.getValue()); |
|
|
|
upObj.setOrderStatus(OrderStatusConstant.bufenqianshou.getValue()); |
|
|
|
|
|
|
|
|
|
|
|
//判断当前签收数 修改订单和备货订单状态
|
|
|
|
//判断当前签收数 修改订单和备货订单状态
|
|
|
|
if (one.getTotalNumber().equals(list2.size() + 1)) { |
|
|
|
if (one.getTotalNumber().equals(list2.size() + 1)) { |
|
|
@ -3378,19 +3381,19 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb |
|
|
|
if (one1 != null) { |
|
|
|
if (one1 != null) { |
|
|
|
distributionAsyncService.updateBillStock(one1.getId()); |
|
|
|
distributionAsyncService.updateBillStock(one1.getId()); |
|
|
|
} |
|
|
|
} |
|
|
|
one.setOrderStatus(OrderStatusConstant.qianshou.getValue()); |
|
|
|
upObj.setOrderStatus(OrderStatusConstant.qianshou.getValue()); |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
//修改在库数量
|
|
|
|
//修改在库数量
|
|
|
|
if (ObjectUtils.isNotNull(one.getHandQuantity()) && one.getHandQuantity() > 0) { |
|
|
|
if (ObjectUtils.isNotNull(one.getHandQuantity()) && one.getHandQuantity() > 0) { |
|
|
|
int i = one.getHandQuantity() - 1; |
|
|
|
int i = one.getHandQuantity() - 1; |
|
|
|
int i2 = ObjectUtils.isNull(one.getSigninQuantity()) ? 1 : one.getSigninQuantity() + 1; |
|
|
|
int i2 = ObjectUtils.isNull(one.getSigninQuantity()) ? 1 : one.getSigninQuantity() + 1; |
|
|
|
one.setHandQuantity(i); |
|
|
|
upObj.setHandQuantity(i); |
|
|
|
one.setSigninQuantity(i2); |
|
|
|
upObj.setSigninQuantity(i2); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// 修改订单状态
|
|
|
|
// 修改订单状态
|
|
|
|
distributionStockArticleService.updateById(one); |
|
|
|
distributionStockArticleService.updateById(upObj); |
|
|
|
|
|
|
|
|
|
|
|
//修改包件状态
|
|
|
|
//修改包件状态
|
|
|
|
distributionAsyncService.getSelfPickup(distributionParcelListEntity.getId()); |
|
|
|
distributionAsyncService.getSelfPickup(distributionParcelListEntity.getId()); |
|
|
|