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

签收件数

dist.1.3.0
汤建军 6 months ago
parent
ddd606e4ac
commit
c4c65fbf55
2 changed files with 13 additions and 8 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. 11
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
  2. 10
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

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

@ -10094,7 +10094,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
&& r.getConsignee().equals(stockArticleEntity.getCustomerName()) && r.getConsignee().equals(stockArticleEntity.getCustomerName())
&& r.getDeliveryAddress().equals(stockArticleEntity.getCustomerAddress()) && r.getDeliveryAddress().equals(stockArticleEntity.getCustomerAddress())
&& r.getDeliveryPhone().equals(stockArticleEntity.getCustomerTelephone()) && r.getDeliveryPhone().equals(stockArticleEntity.getCustomerTelephone())
&& r.getMallName().equals(stockArticleEntity.getMallName()) && r.getMallName().equals(stockArticleEntity.getMallName()
&& r.getId().equals(distrilbutionloadingscanDTO.getReservationId()
)
); );
//存在多个，操作人指定具体客户即可 //存在多个，操作人指定具体客户即可
if (flag) { if (flag) {
@ -10107,9 +10109,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
if (shangpeiFlag) { if (shangpeiFlag) {
//查询是否满足商配异常装车 //查询是否满足商配异常装车
boolean flag = reservationEntityList.stream().anyMatch(r -> boolean flag = reservationEntityList.stream().anyMatch(r ->
r.getReceivingUnit().equals(stockArticleEntity.getConsigneeUnit()) && r.getReceivingUnit().equals(stockArticleEntity.getConsigneeUnit())
r.getMallName().equals(stockArticleEntity.getMallName()) && && r.getMallName().equals(stockArticleEntity.getMallName())
r.getId().equals(distrilbutionloadingscanDTO.getReservationId()) && r.getId().equals(distrilbutionloadingscanDTO.getReservationId())
); );
if (flag) { if (flag) {
List<DistributionReservationEntity> reservationEntities = reservationEntityList.stream().filter(r -> Func.isNotEmpty(r.getConsignee()) List<DistributionReservationEntity> reservationEntities = reservationEntityList.stream().filter(r -> Func.isNotEmpty(r.getConsignee())
@ -10117,7 +10119,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
&& r.getDeliveryAddress().equals(stockArticleEntity.getCustomerAddress()) && r.getDeliveryAddress().equals(stockArticleEntity.getCustomerAddress())
&& r.getDeliveryPhone().equals(stockArticleEntity.getCustomerTelephone()) && r.getDeliveryPhone().equals(stockArticleEntity.getCustomerTelephone())
&& r.getMallName().equals(stockArticleEntity.getMallName()) && r.getMallName().equals(stockArticleEntity.getMallName())
).collect(Collectors.toList()); ).collect(Collectors.toList());
return R.fail(5000, "异常装车"); return R.fail(5000, "异常装车");
} else { } else {

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

@ -3904,7 +3904,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
int reservationNum = reservationEntity.getReservationNum() + reservationEntity.getReservationStockListNum(); int reservationNum = reservationEntity.getReservationNum() + reservationEntity.getReservationStockListNum();
AtomicInteger signingTotal = new AtomicInteger(); AtomicInteger signingTotal = new AtomicInteger();
List<DistributionLoadscanEntity> loadscanEntityList = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda().eq(DistributionLoadscanEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId()).ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())); List<DistributionLoadscanEntity> loadscanEntityList = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda()
.eq(DistributionLoadscanEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId())
.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
);
List<DistributionLoadscaninvnEntity> loadscaninvnEntityList = distributionLoadscaninvnService.list(Wrappers.<DistributionLoadscaninvnEntity>query().lambda().eq(DistributionLoadscaninvnEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId()).ne(DistributionLoadscaninvnEntity::getScanState, LoadingStatusConstant.quxiao.getValue())); List<DistributionLoadscaninvnEntity> loadscaninvnEntityList = distributionLoadscaninvnService.list(Wrappers.<DistributionLoadscaninvnEntity>query().lambda().eq(DistributionLoadscaninvnEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId()).ne(DistributionLoadscaninvnEntity::getScanState, LoadingStatusConstant.quxiao.getValue()));
if (Func.isNotEmpty(loadscanEntityList)) { if (Func.isNotEmpty(loadscanEntityList)) {
int packSignTotal = loadscanEntityList.stream().filter(l -> Func.equals(l.getSignforState(), LoadScanSigningStatusConstant.yiqianshou.getValue())).mapToInt(DistributionLoadscanEntity::getReceivedQuantity).sum(); int packSignTotal = loadscanEntityList.stream().filter(l -> Func.equals(l.getSignforState(), LoadScanSigningStatusConstant.yiqianshou.getValue())).mapToInt(DistributionLoadscanEntity::getReceivedQuantity).sum();
@ -8216,8 +8219,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
distributionStockArticleService.maintenanceOrderInfo(collect, myCurrentWarehouse.getId()); distributionStockArticleService.maintenanceOrderInfo(collect, myCurrentWarehouse.getId());
} }
String str = checkSignNum(distrilbutionloadingscanDTO); // String str = checkSignNum(distrilbutionloadingscanDTO);
return Resp.scanSuccess("签收成功", str); Integer integer = distributionSignforMapper.signforNum(distrilbutionloadingscanDTO.getReservationId());
return Resp.scanSuccess(integer+"件", integer+"件");
} }
@Override @Override

Write Preview
Loading…
Cancel
Save