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

Merge branch 'dev' into pre-production

master
汤建军 11 months ago
parent
778b9ac7dc ce7d5a8630
commit
63202dde3f
3 changed files with 56 additions and 18 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. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
  2. 4
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
  3. 68
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
Unescape View File

@ -1792,7 +1792,7 @@
ldpl.id AS id,
ldrzp.quantity AS reservationNum,
IF(ldl.loaded_nub is null,0,ldl.loaded_nub) AS loadingNum,
IF(ldl.received_quantity is null,0,ldl.loaded_nub) AS signingNum ,
IF(ldl.received_quantity is null,0,ldl.received_quantity) AS signingNum ,
CASE IF(ldl.loaded_nub is null,0,ldl.loaded_nub)
WHEN 0 THEN '待装车'
ELSE IF(ldl.loaded_nub = ldrzp.quantity,'已装车','部分装车')

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

@ -5699,6 +5699,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
loadscanEntity.setLoadedNub(parcelListDTO.getLoadingNum());
loadscanEntity.setPackageNub(parcelListDTO.getLoadingNum());
loadscanEntity.setWarehouseId(myCurrentWarehouse.getId());
loadscanEntity.setWarehouseName(myCurrentWarehouse.getName());
distributionLoadscanService.updateById(loadscanEntity);
//维护零担订单装车状态
distributionAsyncService.checkZeroStockArticleLoadingStatus(parcelNumberEntity, loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId());
@ -5734,6 +5736,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
loadscanEntity.setDeliveryId(distrilbutionloadingscanDTO.getDeliveryId());
loadscanEntity.setOrderId(parcelListDTO.getStockArticleId());
loadscanEntity.setScanTime(now);
loadscanEntity.setWarehouseId(myCurrentWarehouse.getId());
loadscanEntity.setWarehouseName(myCurrentWarehouse.getName());
BladeUser user = AuthUtil.getUser();
// loadscanEntity.setScanUser(user.getUserName());
loadscanEntity.setScanUser(user.getNickName());

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

@ -4448,7 +4448,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
// signingPackageNum += parcelNumberEntityList.stream().mapToInt(DistributionParcelNumberDTO::getReservationNum).sum();
for (DistributionParcelNumberDTO parcelNumberEntity : parcelNumberEntityList) {
DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(parcelNumberEntity.getParcelListId());
DistributionLoadscanEntity distributionLoadscanEntity = distributionLoadscanService.getOne(Wrappers.<DistributionLoadscanEntity>query().lambda().eq(DistributionLoadscanEntity::getReservationId, distributionSignforEntity.getReservationId()).eq(DistributionLoadscanEntity::getPackageId, parcelNumberEntity.getParcelListId()).ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()));
DistributionLoadscanEntity distributionLoadscanEntity = distributionLoadscanService.getOne(Wrappers.<DistributionLoadscanEntity>query().lambda()
.eq(DistributionLoadscanEntity::getReservationId, distributionSignforEntity.getReservationId())
.eq(DistributionLoadscanEntity::getPackageId, parcelNumberEntity.getParcelListId())
.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()));
DistributionParcelNumberEntity parcelNumberServiceById = distributionParcelNumberService.getOne(Wrappers.<DistributionParcelNumberEntity>query().lambda()
.eq(DistributionParcelNumberEntity::getParcelListId, parcelNumberEntity.getId())
);
@ -4474,6 +4477,20 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
parcelNumberServiceById.setSigninQuantity(parcelNumberServiceById.getSigninQuantity() - distributionLoadscanEntity.getLoadedNub() + parcelNumberEntity.getReservationNum());
loadingPackageNum += (parcelNumberEntity.getReservationNum()- distributionLoadscanEntity.getLoadedNub());
signingPackageNum += (parcelNumberEntity.getReservationNum()- distributionLoadscanEntity.getLoadedNub());
Integer loadedNub = distributionLoadscanEntity.getLoadedNub();
Integer receivedQuantity = distributionLoadscanEntity.getReceivedQuantity();
distributionLoadscanEntity.setOneClick(1);
distributionLoadscanEntity.setOneQclick(2);
distributionLoadscanEntity.setLoadedNub(parcelNumberEntity.getReservationNum());
distributionLoadscanEntity.setReceivedQuantity(parcelNumberEntity.getReservationNum());
distributionLoadscanEntity.setPackageNub(parcelNumberEntity.getReservationNum());
distributionLoadscanEntity.setSigningUser(user.getNickName());
distributionLoadscanEntity.setSigningUserId(user.getUserId());
distributionLoadscanEntity.setSigningTime(simpleDateFormat.format(new Date()));
distributionLoadscanEntity.setIsZero(1);
distributionLoadscanEntity.setWarehouseId(myCurrentWarehouse.getId());
distributionLoadscanEntity.setWarehouseName(myCurrentWarehouse.getName());
distributionLoadscanService.updateById(distributionLoadscanEntity);
} else {
//不存在装车数据
DistributionLoadscanEntity loadscanEntity = new DistributionLoadscanEntity();
@ -4513,12 +4530,15 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
loadscanEntity.setReceivedQuantity(parcelNumberEntity.getReservationNum());
loadscanEntity.setOneClick(2);
loadscanEntity.setOneQclick(2);
loadscanEntity.setWarehouseId(myCurrentWarehouse.getId());
loadscanEntity.setWarehouseName(myCurrentWarehouse.getName());
loadscanEntity.setSigningTime(simpleDateFormat.format(new Date()));
if (distributionSignfor.getIsClerk()) {
loadscanEntity.setMsg("文员一键签收数据补录");
} else {
loadscanEntity.setMsg("司机一键签收数据补录");
}
loadscanEntity.setIsZero(1);
distributionLoadscanService.save(loadscanEntity);
packageLockIds.add(loadscanEntity.getPackageId());
//扣除在库数量
@ -4685,18 +4705,29 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:", packageLockIds, 60L);
}
}
LambdaUpdateWrapper<DistributionSignforEntity> set = new UpdateWrapper<DistributionSignforEntity>().lambda()
.eq(DistributionSignforEntity::getId, distributionSignforEntity.getId())
.set(StringUtils.isNotBlank(distributionSignfor.getDeliverySignPictures()), DistributionSignforEntity::getDeliverySignPictures, distributionSignfor.getDeliverySignPictures())
.set(StringUtils.isNotBlank(distributionSignfor.getSigningType()), DistributionSignforEntity::getSigningType, distributionSignfor.getSigningType())
.set(DistributionSignforEntity::getLoadedinNumber, loadingInventoryNum)
.set(DistributionSignforEntity::getLoadedNumber, loadingPackageNum)
.set(DistributionSignforEntity::getReceivedinQuantity, signingInventoryNum)
.set(DistributionSignforEntity::getReceivedQuantity, signingPackageNum)
.set(DistributionSignforEntity::getDriverSigning, 2)
.set(!distributionSignfor.getIsClerk() && StringUtils.isNotBlank(distributionSignfor.getDriverRemarks()), DistributionSignforEntity::getDriverRemarks, distributionSignfor.getDriverRemarks())
.set(DistributionSignforEntity::getDriverSigning, 2);
boolean update = this.update(set);
DistributionSignforEntity signforEntity = this.getById(distributionSignforEntity.getId());
signforEntity.setLoadedNumber(signforEntity.getLoadedNumber() + loadingPackageNum );
signforEntity.setReceivedQuantity(signforEntity.getReceivedQuantity() + signingPackageNum );
signforEntity.setLoadedinNumber(signforEntity.getLoadedinNumber() + loadingInventoryNum );
signforEntity.setReceivedinQuantity(signforEntity.getReceivedinQuantity() + signingInventoryNum );
signforEntity.setReceivedinQuantity(signforEntity.getReceivedinQuantity() + signingInventoryNum );
if (Func.isNotEmpty(distributionSignfor.getDriverRemarks())){
signforEntity.setDriverRemarks(distributionSignfor.getDriverRemarks());
}
this.updateById(signforEntity);
// LambdaUpdateWrapper<DistributionSignforEntity> set = new UpdateWrapper<DistributionSignforEntity>().lambda()
//// .eq(DistributionSignforEntity::getId, distributionSignforEntity.getId())
//// .set(StringUtils.isNotBlank(distributionSignfor.getDeliverySignPictures()), DistributionSignforEntity::getDeliverySignPictures, distributionSignfor.getDeliverySignPictures())
//// .set(StringUtils.isNotBlank(distributionSignfor.getSigningType()), DistributionSignforEntity::getSigningType, distributionSignfor.getSigningType())
//// .set(DistributionSignforEntity::getLoadedinNumber, loadingInventoryNum)
//// .set(DistributionSignforEntity::getLoadedNumber, loadingPackageNum)
//// .set(DistributionSignforEntity::getReceivedinQuantity, signingInventoryNum)
//// .set(DistributionSignforEntity::getReceivedQuantity, signingPackageNum)
//// .set(DistributionSignforEntity::getDriverSigning, 2)
//// .set(!distributionSignfor.getIsClerk() && StringUtils.isNotBlank(distributionSignfor.getDriverRemarks()), DistributionSignforEntity::getDriverRemarks, distributionSignfor.getDriverRemarks())
//// .set(DistributionSignforEntity::getDriverSigning, 2);
//// boolean update = this.update(set);
//维护配送信息
return R.status(true);
}
@ -5335,7 +5366,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
handQuantity = distributionParcelNumberEntity.getHandQuantity() + distributionLoadscanEntity.getReceivedQuantity() - parcelNumberDTO.getSigningNum();
outboundQuantity = distributionParcelNumberEntity.getOutboundQuantity() - distributionLoadscanEntity.getReceivedQuantity() + parcelNumberDTO.getSigningNum();
signinQuantity = distributionParcelNumberEntity.getSigninQuantity() - distributionLoadscanEntity.getReceivedQuantity() + parcelNumberDTO.getSigningNum();
distributionLoadscanEntity.setWarehouseId(myCurrentWarehouse.getId());
distributionLoadscanEntity.setWarehouseName(myCurrentWarehouse.getName());
distributionLoadscanEntity.setReceivedQuantity(parcelNumberDTO.getSigningNum());
distributionLoadscanEntity.setSignforState(LoadScanSigningStatusConstant.yiqianshou.getValue());
distributionLoadscanEntity.setScanTime(simpleDateFormat.format(new Date()));
@ -5354,10 +5386,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
loadscanEntity.setDeliveryId(signforEntity.getDeliveryId());
loadscanEntity.setReservationId(signforEntity.getReservationId());
loadscanEntity.setScanUser(user.getNickName());
loadscanEntity.setWarehouseId(myCurrentWarehouse.getId());
loadscanEntity.setWarehouseName(myCurrentWarehouse.getName());
loadscanEntity.setScanTime(simpleDateFormat.format(new Date()));
loadscanEntity.setSigningUser(user.getNickName());
loadscanEntity.setPackageNub(distributionReservationZeroPackageEntity.getQuantity());
loadscanEntity.setLoadedNub(distributionReservationZeroPackageEntity.getQuantity());
loadscanEntity.setPackageNub(parcelNumberDTO.getSigningNum());
loadscanEntity.setLoadedNub(parcelNumberDTO.getSigningNum());
loadscanEntity.setSigningUserId(user.getUserId());
assert distributionDeliverySelfEntity != null;
if (Func.isNotEmpty(distributionDeliverySelfEntity.getDriverId())) {
@ -5382,7 +5416,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
loadscanEntity.setType(2);
loadscanEntity.setSignforState(LoadScanSigningStatusConstant.yiqianshou.getValue());
loadscanEntity.setIsSignfor(1);
loadscanEntity.setReceivedQuantity(distributionReservationZeroPackageEntity.getQuantity());
loadscanEntity.setReceivedQuantity(parcelNumberDTO.getSigningNum());
loadscanEntity.setOneClick(2);
loadscanEntity.setOneQclick(2);
loadscanEntity.setSigningTime(simpleDateFormat.format(new Date()));

Write Preview
Loading…
Cancel
Save