From a291d29b3434feaca7e131d5cee31017e2218226 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Tue, 9 Jan 2024 21:33:44 +0800 Subject: [PATCH 01/10] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionDeliveryListServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c7026df02..81611c5da 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 @@ -673,7 +673,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl Date: Tue, 9 Jan 2024 21:51:33 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E5=AE=A2=E6=88=B7=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionReservationServiceImpl.java | 38 ------------------- 1 file changed, 38 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java index e76bae8eb..204abf594 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java @@ -3604,44 +3604,6 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl disStockListDetailEntities = distributionReservationMapper.selectInventoryListByReservation(distributionCancelReservationPackageDTO.getReservationId()); - if (Func.isNotEmpty(disStockListDetailEntities)){ - for (String invenPackageId : invenPackageIds) { - List inventory = disStockListDetailEntities.stream().filter(inven -> inven.getId().equals(Long.parseLong(invenPackageId))).collect(Collectors.toList()); - if (Func.isNotEmpty(inventory) &&inventory.size() == 1){ - DisStockListDetailEntity disStockListDetailEntity = inventory.get(0); - if (disStockListDetailEntity.getStockSignfoStatus().equals(InventorySigningStatusConstant.yiqianshou.getValue()) - ||disStockListDetailEntity.getStockLockingStatus().equals(InventoryLoadingStatusConstant.yizhuangche.getValue())){ - log.info(method+"检测当前取消包件存在装车或者签收操作:inventoryPackageId{}",disStockListDetailEntity.getId()); - throw new RuntimeException("包件存在装车、签收,无法进行取消"); - } - //库存品配送包件的取消操作 - disStockListDetailEntity.setStockPackageStatus(InventoryPackageStatusConstant.quxiao.getValue()); - disStockListDetailService.updateById(disStockListDetailEntity); - //维护对应预约的配送库存品品类数据 - distributionReservationStocklistService.maintenanceReservationStockList(distributionCancelReservationPackageDTO.getReservationId()); - //进行冻结数量的扣减 - distributionStockListMapper.decreaseStockListQuantityOccupied(disStockListDetailEntity.getStockListId(),disStockListDetailEntity.getNum()); - }else { - log.error(method+"库存品包件信息异常");; - throw new RuntimeException("库存品包件信息异常"); - } - - } - }else { - log.error(method+"预约单没有库存品包件"); - return R.fail("此预约任务无库存品包件...."); - } - break; - default: //维护预约单状态 this.maintenanceReservationInfo(distributionCancelReservationPackageDTO.getReservationId()); //维护预约单数量 From c413b78067c1605e96eeedaf1405fc457731eb7f Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 9 Jan 2024 21:57:10 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E8=AF=AD=E9=9F=B3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionSignforServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 53777a969..af897e7b6 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 @@ -1616,7 +1616,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl parcelListEntities = distributionDeliveryListMapper.selectPackageListByDeliveryListId(distrilbutionloadingscanDTO.getDeliveryId()); From e5958b6411c6dc641a67c614c8aecfc5e1514795 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Tue, 9 Jan 2024 21:58:06 +0800 Subject: [PATCH 04/10] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/receiver/OrderPackageStatusDataHandler.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/OrderPackageStatusDataHandler.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/OrderPackageStatusDataHandler.java index fbdda8cc1..12aa4f6c1 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/OrderPackageStatusDataHandler.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/OrderPackageStatusDataHandler.java @@ -50,7 +50,7 @@ public class OrderPackageStatusDataHandler { try{ - log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>处理状态>>>>>>>>>>>>>>>>>>>>>>>>>>"); + log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>处理状态 start>>>>>>>>>>>>>>>>>>>>>>>>>>"); Long myCurrentWarehouseId = Long.parseLong(map.get("myCurrentWarehouseId").toString()); String distrilbutionloadingscanDTOJson = (String)map.get("distrilbutionloadingscanDTO"); DistrilbutionloadingscanDTO distrilbutionloadingscanDTO = JSONObject.parseObject(distrilbutionloadingscanDTOJson,DistrilbutionloadingscanDTO.class); @@ -69,6 +69,8 @@ public class OrderPackageStatusDataHandler { distributionReservationService.maintenanceReservationInfo(reservationEntity.getId()); //维护配送任务信息 distributionDeliveryListService.maintenanceDeliveryInfo(distrilbutionloadingscanDTO.getDeliveryId()); + log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>处理状态 end>>>>>>>>>>>>>>>>>>>>>>>>>>"); + }catch (Exception e){ log.error(">>>>>> 维护包件信息 报错",e); } From e5577e511ad1eb9b67c6669e80b5cf2ba50f6d5a Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 9 Jan 2024 22:04:42 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E5=B7=B2=E7=AD=BE=E6=94=B6=E5=8C=85?= =?UTF-8?q?=E4=BB=B6=E6=8B=A6=E6=88=AA=E5=BC=82=E5=B8=B8=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionSignforServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 af897e7b6..e9c5c712b 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 @@ -1213,7 +1213,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl Date: Tue, 9 Jan 2024 22:17:57 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E8=AF=AD=E9=9F=B3?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionSignforServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 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 e9c5c712b..508e0937d 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 @@ -1082,7 +1082,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl Date: Tue, 9 Jan 2024 22:39:53 +0800 Subject: [PATCH 07/10] =?UTF-8?q?1.=E4=BB=93=E5=BA=93=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionSignforServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 e9c5c712b..f75d583c0 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 @@ -2638,7 +2638,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl Date: Tue, 9 Jan 2024 22:44:37 +0800 Subject: [PATCH 08/10] =?UTF-8?q?1.=E4=BB=93=E5=BA=93=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionDeliveryListServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 81611c5da..7d364364e 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 @@ -1487,7 +1487,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl Date: Tue, 9 Jan 2024 22:50:15 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0=E6=8B=A6=E6=88=AACode?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionSignforServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4a2cb1e35..e48248dda 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 @@ -1575,7 +1575,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl Date: Tue, 9 Jan 2024 22:57:03 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=97=A5=E5=BF=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionSignforServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e48248dda..a65477298 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 @@ -2165,7 +2165,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl getAppDeliveryorderListPage( DistributionAppDeliveryListDTO distributionDeliveryList) { - if (Func.isNotEmpty(distributionDeliveryList.getReservationId())) { + if (Func.isEmpty(distributionDeliveryList.getReservationId())) { log.error("参数缺失reservationId:{}", distributionDeliveryList.getReservationId()); }