From f30d10c3ff21a0cf6e7b81aec3c7adce79cce952 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Fri, 23 Aug 2024 11:28:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=EF=BC=8C=E8=BF=90?= =?UTF-8?q?=E5=8D=95bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/trunkline/service/impl/InComingServiceImpl.java | 2 +- .../logpm/trunkline/service/impl/OpenOrderServiceImpl.java | 6 ++++-- .../service/impl/TrunklineCarsLoadServiceImpl.java | 2 +- 3 files changed, 6 insertions(+), 4 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 271c5401b..902955aa7 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 @@ -226,7 +226,7 @@ public class InComingServiceImpl implements IInComingService { List advanceDetailEntityList = advanceDetailService.list(advanceDetailQueryWrapper); if (advanceDetailEntityList.isEmpty()) { log.warn("############incomingPackage: 包件不存在 packageCodes={} warehouseId={}", packageCodes, warehouseId); - return Resp.scanFail(405, "包件无数据", "包件无数据"); + return Resp.scanFail(405, "系统无编码", "系统无编码"); } if(incomingType == 1 || incomingType == 2){ diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index 7daa95ab6..72a2039c5 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -2206,13 +2206,15 @@ public class OpenOrderServiceImpl implements IOpenOrderService { warehouseWaybillClient.updateEntity(waybillEntity); - advanceDetailService.updateBatchById(updateAdvanceDetailList); + if(CollUtil.isNotEmpty(updateAdvanceDetailList)){ + advanceDetailService.updateBatchById(updateAdvanceDetailList); + } // String operationRemark = "修改运单"+waybillNo+",时间："+ CommonUtil.dateToString(waybillEntity.getCreateTime())+","+updateMsg; //异步存入日志 openOrderAsyncService.saveUpdateLog(waybillId, waybillNo, "888", editReson, "备注："+refer+" 修改内容："+updateMsg, AuthUtil.getNickName(), AuthUtil.getUserId(), warehouseId, warehouseName,waybillEntity); - List wayBillDetailList = warehouseWaybillDetailClient.findListByWaybillNo(waybillNo); +// List wayBillDetailList = warehouseWaybillDetailClient.findListByWaybillNo(waybillNo); Integer waybillType = waybillEntity.getWaybillType(); Long consigneeId = waybillEntity.getConsigneeId(); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index 44f3bda0f..2134603a2 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -5789,7 +5789,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl Date: Fri, 23 Aug 2024 11:30:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/mapper/DistributionStockArticleMapper.xml | 3 +-- .../service/impl/DistributionReservationServiceImpl.java | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml index 6e224947f..1b6ce78c4 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml @@ -740,7 +740,6 @@ ldsa.service_number, ldsa.order_code, ldsa.mall_id, ldsa.mall_code, ldsa.mall_name, ldsa.store_name, ldsa.store_code, ldsa.store_id, ldsa.description_goods, ldsa.warehouse_id, - ldsa.warehouse, ldsa.warehouse_entry_time, ldsa.store_time, ldsa.total_number, ldsa.complete_set, ldsa.brand, ldsa.type_service, ldsa.customer_name, ldsa.customer_telephone, ldsa.customer_address, ldsa.genre, @@ -768,7 +767,7 @@ FROM logpm_distribution_parcel_list ldpll WHERE ldsa.id = ldpll.stock_article_id - + AND ldpll.is_transfer = 0 AND ldpll.order_package_loading_status != '20' AND ldpll.order_package_reservation_status != '20' AND ldpll.order_package_status != '70' 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 cf8b7687c..1e8e2cbf5 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 @@ -1518,7 +1518,6 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl