From 9f399ccd52db26eebb600f7793a84cf13027ddb0 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 9 Apr 2024 20:17:09 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0PC=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E5=92=8CPC=E5=90=8C=E6=97=B6=E6=93=8D=E4=BD=9C=E6=8B=A6?= =?UTF-8?q?=E6=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionDeliveryListServiceImpl.java | 24 ++++++------- .../impl/DistributionSignforServiceImpl.java | 34 +++++++++---------- 2 files changed, 29 insertions(+), 29 deletions(-) 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 623f06dee..5a249cb7b 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 @@ -871,7 +871,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds); + List a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:"); if (Func.isNotEmpty(a)){ boolean flag = a.stream().anyMatch(any -> packageLockIds.contains(any)); if (flag){ @@ -879,10 +879,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds); + List a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:"); if (Func.isNotEmpty(a)){ boolean flag = a.stream().anyMatch(any -> packageLockIds.contains(any)); if (flag){ @@ -2051,10 +2051,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds); + List a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:" ); if (Func.isNotEmpty(a)){ boolean flag = a.stream().anyMatch(any -> packageLockIds.contains(any)); if (flag){ @@ -5534,10 +5534,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds); + List a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:"); if (Func.isNotEmpty(a)){ boolean aaa = a.stream().anyMatch(any -> packageLockIds.contains(any)); if (aaa){ @@ -5854,10 +5854,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds); + List a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:"); if (Func.isNotEmpty(a)){ boolean flag = a.stream().anyMatch(any -> packageLockIds.contains(any)); if (flag){ @@ -2481,10 +2481,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds); + List a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:" ); if (Func.isNotEmpty(a)){ boolean flag = a.stream().anyMatch(any -> packageLockIds.contains(any)); if (flag){ @@ -2940,10 +2940,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds); + List a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:" ); if (Func.isNotEmpty(a)){ boolean flag = a.stream().anyMatch(any -> packageLockIds.contains(any)); if (flag){ @@ -3301,10 +3301,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>>>>>>>>>>>>>:{}",signingPackageNum); log.info(method+"签收库存品数>>>>>>>>>>>>>>:{}",signingPackageNum); if (!packageLockIds.isEmpty()){ - List a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds); + List a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:" ); if (Func.isNotEmpty(a)){ boolean flag = a.stream().anyMatch(any -> packageLockIds.contains(any)); if (flag){ @@ -4709,10 +4709,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl set = new UpdateWrapper().lambda() @@ -5468,7 +5468,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds); + List a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:" ); if (Func.isNotEmpty(a)){ boolean flag = a.stream().anyMatch(any -> packageLockIds.contains(any)); if (flag){ @@ -5476,10 +5476,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl Date: Tue, 9 Apr 2024 20:19:31 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=8F=96=E6=B6=88=E5=BA=93=E5=AD=98=E5=93=81?= =?UTF-8?q?=E5=8C=85=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionStockArticleServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java index b54c510cd..76b174978 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java @@ -1370,6 +1370,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("order_code", orderCode) .eq("warehouse_id", warehouseId) + .eq("conditions", 1) .eq("is_deleted", 0); List list = distributionParcelListService.list(queryWrapper); Integer incomingNum = 0; @@ -1549,6 +1550,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl parcelListEntities = distributionParcelListService.list(Wrappers.query().lambda() .eq(DistributionParcelListEntity::getOrderCode, s) + .eq(DistributionParcelListEntity::getConditions, 1) .eq(DistributionParcelListEntity::getStockArticleId, stockArticleEntity.getId()) .eq(DistributionParcelListEntity::getWarehouseId, warehouseId) ); From af3c42e8d777ed6af5f73f2bea4ad05e2bf23936 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 9 Apr 2024 20:30:33 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=93=81=E5=9C=A8=E5=BA=93=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E3=80=81=E7=BB=B4=E6=8A=A4=E5=87=BA=E5=BA=93=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionStockListServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java index 48af8336e..a33d41b3f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java @@ -372,7 +372,8 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl Date: Tue, 9 Apr 2024 20:31:58 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=20=E4=BF=AE=E5=A4=8DString=20map=20?= =?UTF-8?q?=E8=BD=ACStirng=20=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/OldSystemDataPushConfig.java | 6 ++++++ .../controller/DistributionSignforController.java | 5 ++++- .../impl/DistributionClientMessageServiceImpl.java | 12 ------------ .../service/impl/DistributionSignforServiceImpl.java | 3 ++- .../service/impl/WarehouseWaybillServiceImpl.java | 2 +- 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java index c44e9ee4f..a66a4d9af 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java @@ -60,6 +60,12 @@ public class OldSystemDataPushConfig { // 阳春仓 warehourseIds.add("150"); + //宜昌 + warehourseIds.add("45"); + + // 大竹 + warehourseIds.add("37"); + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java index ae24ab647..cd961fcbf 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java @@ -464,7 +464,10 @@ public class DistributionSignforController extends BladeController { @ApiOperationSupport(order = 7) @ApiOperation(value = "PC下载签收图片", notes = "传入ids") public void handlePicture(@RequestParam String ids,HttpServletResponse res) { - distributionSignforService.handlePicture(ids,res); + if(StringUtils.isNotBlank(ids)){ + distributionSignforService.handlePicture(ids,res); + } + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionClientMessageServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionClientMessageServiceImpl.java index b6d683dda..f9255258b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionClientMessageServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionClientMessageServiceImpl.java @@ -78,18 +78,6 @@ public class DistributionClientMessageServiceImpl extends BaseServiceImpl list = distributionStockArticleService.list(Wrappers.query().lambda() -// .eq(DistributionStockArticleEntity::getId, s) -// ); -// DistributionStockArticleEntity distributionStockArticleEntity = list.get(0); -// distributionStockArticleEntity.setCustomerName(distributionClientMessage.getName()); -// distributionStockArticleEntity.setCustomerTelephone(distributionClientMessage.getPhone()); -// distributionStockArticleEntity.setCustomerAddress(distributionClientMessage.getAddress()); -// distributionStockArticleService.updateById(distributionStockArticleEntity); -// DistributionClientMessageEntity distributionClientMessageEntity = new DistributionClientMessageEntity(); -// BeanUtils.copyProperties(distributionClientMessage,distributionClientMessageEntity); -// distributionClientMessageEntity.setStockArticleId(s); -// this.save(distributionClientMessageEntity); DistributionStockArticleEntity oldStockArticle = distributionStockArticleService.getById(Long.parseLong(s)); DistributionStockArticleEntity newStockArticle = new DistributionStockArticleEntity(); BeanUtil.copy(oldStockArticle,newStockArticle); 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 567574d32..5b90d2152 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 @@ -2654,6 +2654,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl distributionSignPrintList = new ArrayList<>(); distributionSignfor.getMap().forEach((k, v) -> { - v.stream().forEach(i -> { + v.forEach(i -> { DistributionSignPrintEntity distributionSignPrint = new DistributionSignPrintEntity(); BeanUtils.copyProperties(i, distributionSignPrint); distributionSignPrint.setId(null); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java index cb6323934..dd09dbbd6 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java @@ -398,7 +398,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("waybill_no", waybillNo); - return warehouseWaybillMapper.selectOne(queryWrapper); + return warehouseWaybillMapper.selectOne(queryWrapper); } @Override