From 062e9b0545c47d34c5582bd06a098967e21126f2 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 29 Jul 2024 09:59:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8E=A8=E9=80=81=E8=80=81=E7=B3=BB?= =?UTF-8?q?=E7=BB=9FBUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/common/constant/ModuleNameConstant.java | 2 +- .../logpm/distribution/mapper/DistributionSignforMapper.xml | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java index d60420fe5..f8d462699 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java @@ -9,7 +9,7 @@ public interface ModuleNameConstant { /** * 如果不需要 "" */ - public static final String DEVAUTH =""; + public static final String DEVAUTH ="-tjj"; /** * 工厂对接服务名称 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index c4237a77b..1beb630e9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -1259,7 +1259,7 @@ SELECT ldpl.id AS id, - ldpl.warehouse_id AS warehouse_id, + if(lww.old_id is null,lww.id,lww.old_id) AS warehouseId, lddl.id AS distributionId, lddl.train_number AS transNo, ldpl.waybill_number AS waybillNo, @@ -1312,6 +1313,7 @@ AND lddl.is_deleted = 0 INNER JOIN logpm_distribution_parcel_list AS ldpl ON ldl.package_id = ldpl.id AND ldpl.is_deleted = 0 + LEFT JOIN logpm_warehouse_warehouse AS lww ON ldpl.warehouse_id = lww.id WHERE ldl.reservation_id = #{reservationId} AND ldl.delivery_id = #{deliveryId} From 6ca74b6e921f9142731a525944324bb7b8919e49 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 29 Jul 2024 10:45:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DistributionSignforServiceImpl.java | 76 ++++++++++--------- 1 file changed, 41 insertions(+), 35 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 5fbb9f90e..a33b616d4 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -288,44 +288,50 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl distributionSignforVOS, List reservationIds) { - List distributionParcelListEntities = distributionReservationMapper.selectPackageListByReservationIds(reservationIds); -// List list = disStockListDetailService.list(Wrappers.query().lambda() -// .in(DisStockListDetailEntity::getReservationId, reservationIds) -// .ne(DisStockListDetailEntity::getStockPackageStatus, ReservationPackageStatusConstant.quxiao.getValue()) +// List distributionParcelListEntities = distributionReservationMapper.selectPackageListByReservationIds(reservationIds); +//// List list = disStockListDetailService.list(Wrappers.query().lambda() +//// .in(DisStockListDetailEntity::getReservationId, reservationIds) +//// .ne(DisStockListDetailEntity::getStockPackageStatus, ReservationPackageStatusConstant.quxiao.getValue()) +//// ); +// List reservationZeroPackageEntities = distributionReservationZeroPackageService.list(Wrappers.query().lambda() +// .in(DistributionReservationZeroPackageEntity::getReservationId, reservationIds) +// .ne(DistributionReservationZeroPackageEntity::getZeroPackageStatus, ReservationPackageStatusConstant.quxiao.getValue()) // ); - List reservationZeroPackageEntities = distributionReservationZeroPackageService.list(Wrappers.query().lambda() - .in(DistributionReservationZeroPackageEntity::getReservationId, reservationIds) - .ne(DistributionReservationZeroPackageEntity::getZeroPackageStatus, ReservationPackageStatusConstant.quxiao.getValue()) - ); +// +// List inventoryList = disStockListDetailService.list(Wrappers.query().lambda() +// .in(DisStockListDetailEntity::getReservationId,reservationIds) +// .ne(DisStockListDetailEntity::getStockPackageStatus,ReservationPackageStatusConstant.quxiao.getValue()) +// ); + - Map> packageMap = distributionParcelListEntities.stream().collect(Collectors.groupingBy(DistributionParcelListVO::getReservationId)); +// Map> packageMap = distributionParcelListEntities.stream().collect(Collectors.groupingBy(DistributionParcelListVO::getReservationId)); // Map> inventoryMap = list.stream().collect(Collectors.groupingBy(DisStockListDetailEntity::getReservationId)); - Map> zeroPackageMap = reservationZeroPackageEntities.stream().collect(Collectors.groupingBy(DistributionReservationZeroPackageEntity::getReservationId)); +// Map> zeroPackageMap = reservationZeroPackageEntities.stream().collect(Collectors.groupingBy(DistributionReservationZeroPackageEntity::getReservationId)); distributionSignforVOS.forEach(d -> { d.setDeliveryTypeName(getDeliveryTypeName(d.getDeliveryType())); - int weizhuangchejianshu = getWeizhuangchejianshu(packageMap, d); - int zhuangchejianshu = getZhuangchejianshu(packageMap, d); - int qianshoujianshu = getQianshoujianshu(packageMap, zeroPackageMap, d); - int weiqianshoujianshu = getWeiqianshoujianshu(packageMap, zeroPackageMap, d); + int weizhuangchejianshu = d.getReservationNum() - d.getLoadedNumber(); +// int zhuangchejianshu = getZhuangchejianshu(packageMap, d); +// int qianshoujianshu = getQianshoujianshu(packageMap, zeroPackageMap, d); + int weiqianshoujianshu = d.getReservationNum() - d.getReceivedQuantity(); d.setUnloadedNumber(weizhuangchejianshu); d.setAbnormalLoadedNumber(getAbnormalLoading(d)); - d.setLoadedNumber(zhuangchejianshu); + d.setLoadedNumber(d.getLoadedNumber()); d.setUnreceivedQuantity(weiqianshoujianshu); - d.setReceivedQuantity(qianshoujianshu); + d.setReceivedQuantity(d.getReceivedQuantity()); d.setAbnormalReceivedQuantity(getAbnormalSigning(d)); }); } - private int getWeiqianshoujianshu(Map> packageMap, Map> zeroPackageMap, DistributionSignforVO d) { - - int fromParcelList = packageMap.getOrDefault(d.getReservationId(), Collections.emptyList()).stream().filter(f -> !f.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())).mapToInt(DistributionParcelListVO::getQuantity).sum(); - int fromZeroPackage = calculateWeiqianshouFromZeroPackage(zeroPackageMap, d); - - return fromParcelList + fromZeroPackage; - } +// private int getWeiqianshoujianshu(Map> packageMap, Map> zeroPackageMap, DistributionSignforVO d) { +// +// int fromParcelList = packageMap.getOrDefault(d.getReservationId(), Collections.emptyList()).stream().filter(f -> !f.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())).mapToInt(DistributionParcelListVO::getQuantity).sum(); +// int fromZeroPackage = calculateWeiqianshouFromZeroPackage(zeroPackageMap, d); +// +// return fromParcelList + fromZeroPackage; +// } private int calculateWeiqianshouFromZeroPackage(Map> zeroPackageMap, DistributionSignforVO d) { if (!zeroPackageMap.containsKey(d.getReservationId())) return 0; @@ -345,21 +351,21 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl> packageMap, DistributionSignforVO d) { - return packageMap.getOrDefault(d.getReservationId(), Collections.emptyList()).stream().filter(f -> f.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.weizhuancghe.getValue())).mapToInt(DistributionParcelListVO::getQuantity).sum(); - } - - private int getZhuangchejianshu(Map> packageMap, DistributionSignforVO d) { - return packageMap.getOrDefault(d.getReservationId(), Collections.emptyList()).stream().filter(f -> f.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.yizhuangche.getValue())).mapToInt(DistributionParcelListVO::getQuantity).sum(); - } +// private int getWeizhuangchejianshu(Map> packageMap, DistributionSignforVO d) { +// return packageMap.getOrDefault(d.getReservationId(), Collections.emptyList()).stream().filter(f -> f.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.weizhuancghe.getValue())).mapToInt(DistributionParcelListVO::getQuantity).sum(); +// } +// private int getZhuangchejianshu(Map> packageMap, DistributionSignforVO d) { +// return packageMap.getOrDefault(d.getReservationId(), Collections.emptyList()).stream().filter(f -> f.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.yizhuangche.getValue())).mapToInt(DistributionParcelListVO::getQuantity).sum(); +// } - private int getQianshoujianshu(Map> packageMap, Map> zeroPackageMap, DistributionSignforVO d) { - int fromParcelList = packageMap.getOrDefault(d.getReservationId(), Collections.emptyList()).stream().filter(f -> f.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())).mapToInt(DistributionParcelListVO::getQuantity).sum(); - int fromZeroPackage = calculateQianshouFromZeroPackage(zeroPackageMap, d); - return fromParcelList + fromZeroPackage; - } +// private int getQianshoujianshu(Map> packageMap, Map> zeroPackageMap, DistributionSignforVO d) { +// int fromParcelList = packageMap.getOrDefault(d.getReservationId(), Collections.emptyList()).stream().filter(f -> f.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())).mapToInt(DistributionParcelListVO::getQuantity).sum(); +// int fromZeroPackage = calculateQianshouFromZeroPackage(zeroPackageMap, d); +// +// return fromParcelList + fromZeroPackage; +// } private int calculateQianshouFromZeroPackage(Map> zeroPackageMap, DistributionSignforVO d) { if (!zeroPackageMap.containsKey(d.getReservationId())) return 0;