From 29f601355c8e164fab52347bfc79bf0646d81a6f Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Fri, 31 May 2024 10:25:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=89=98=E7=9B=98=E7=9A=84=E8=80=81=E7=B3=BB=E7=BB=9F=E6=9A=82?= =?UTF-8?q?=E5=AD=98=E5=8D=95=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.xml b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.xml index 8abe5459d..5d45bcf57 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.xml +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.xml @@ -21,7 +21,7 @@ delete_administrators_id = 0 and orderSelfNum = #{orderSelfNum} - order by id desc + order by waybill_no desc limit 1 From fdb225c01a6601040679ceb27d5bc050a8ac7e44 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 31 May 2024 10:57:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=BA=BF=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/mapper/DistributionStockupMapper.xml | 2 +- .../service/impl/DistributionAsyncServiceImpl.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml index 52dee271c..a9329689c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml @@ -644,7 +644,7 @@ and ldrs.stock_list_status in (1, 3) ) inventoryNub from logpm_distribution_reservation ldr - LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.reservation_id = ldr.id AND AND ldsi.stock_status != 4 + LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.reservation_id = ldr.id AND ldsi.stock_status != 4 LEFT JOIN logpm_distribution_stockup lds on lds.id = ldsi.stockup_id LEFT JOIN logpm_distribution_reservation_stockarticle ldrs on ldrs.reservation_id = ldr.id and ldrs.stock_article_status in (1, 3) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java index 2280ed7dd..91dc0b9f2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java @@ -1765,8 +1765,11 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { builder.append(orderCodes); log.info(">>>>>> updatePackageDeliveryStatus,{}, {}", reservationId, packageIds); - //完成对该客户下此包件任务的取消 - int row = distributionReservationMapper.updatePackageDeliveryStatus(reservationId, packageIds); + if(!packageIds.isEmpty() && reservationId!=null){ + //完成对该客户下此包件任务的取消 + int row = distributionReservationMapper.updatePackageDeliveryStatus(reservationId, packageIds); + } + //维护预约订单状态 } List distributionParcelNumberDTOS = distributionReservationMapper.selectZeroPackageListByReservationId(reservationId); From ce42943676c476dd974adab9a304219eaf70acc4 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Fri, 31 May 2024 11:39:07 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1.=E5=85=A5=E5=BA=93=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/trunkline/service/impl/InComingServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java index 5753ebde6..8b594d4aa 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java @@ -322,7 +322,7 @@ public class InComingServiceImpl implements IInComingService { }); } catch (Exception customerException) { log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 消息推送失败~ 请联系管理员！ ", customerException); - throw new CustomerException(customerException.getMessage()); +// throw new CustomerException(customerException.getMessage()); } @@ -335,7 +335,7 @@ public class InComingServiceImpl implements IInComingService { }); } catch (Exception e) { log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 预入库消息推送失败~ 请联系管理员！ ", e); - throw new CustomerException("服务器异常"); +// throw new CustomerException("服务器异常"); }