From ce7d5a8630070d9f3cecd6ba30612cebeabc9be3 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Wed, 10 Apr 2024 21:49:12 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=B6=E6=8B=85=E6=89=B9=E9=87=8F=E7=AD=BE?= =?UTF-8?q?=E6=94=B6BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/DistributionReservationMapper.xml | 2 +- .../DistributionDeliveryListServiceImpl.java | 4 ++ .../impl/DistributionSignforServiceImpl.java | 68 ++++++++++++++----- 3 files changed, 56 insertions(+), 18 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml index 4050256f9..05b01efe7 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml @@ -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,'已装车','部分装车') diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 5a249cb7b..7864b53ff 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -5699,6 +5699,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImplquery().lambda().eq(DistributionLoadscanEntity::getReservationId, distributionSignforEntity.getReservationId()).eq(DistributionLoadscanEntity::getPackageId, parcelNumberEntity.getParcelListId()).ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())); + DistributionLoadscanEntity distributionLoadscanEntity = distributionLoadscanService.getOne(Wrappers.query().lambda() + .eq(DistributionLoadscanEntity::getReservationId, distributionSignforEntity.getReservationId()) + .eq(DistributionLoadscanEntity::getPackageId, parcelNumberEntity.getParcelListId()) + .ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())); DistributionParcelNumberEntity parcelNumberServiceById = distributionParcelNumberService.getOne(Wrappers.query().lambda() .eq(DistributionParcelNumberEntity::getParcelListId, parcelNumberEntity.getId()) ); @@ -4474,6 +4477,20 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl set = new UpdateWrapper().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 set = new UpdateWrapper().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