From 1f333ccc89fb631b979a4c0f4a771241c7361f43 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Wed, 19 Mar 2025 17:52:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(all):=20=E9=85=8D=E9=80=81=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 修改配送明细报表服务类型 --- .../receiver/report/QualityDeliverAddListener.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/QualityDeliverAddListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/QualityDeliverAddListener.java index c59462298..5c8e7edf2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/QualityDeliverAddListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/QualityDeliverAddListener.java @@ -363,6 +363,19 @@ public class QualityDeliverAddListener implements ReportService { qualityDeliverEntity.setStoreName(stockArticleEntity.getStoreName()); // 品牌 qualityDeliverEntity.setBrandName(stockArticleEntity.getBrand()); + // 服务类型 + String typeService = stockArticleEntity.getTypeService(); + if(StrUtil.isNotEmpty(typeService)){ + if("1".equals(typeService)){ + qualityDeliverEntity.setCustomType("商配"); + }else if("2".equals(typeService)){ + qualityDeliverEntity.setCustomType("市配"); + }else if("3".equals(typeService)){ + qualityDeliverEntity.setCustomType("自提"); + }else if("4".equals(typeService)){ + qualityDeliverEntity.setCustomType("三方中转"); + } + } } } From 0a5e765c4413c78189f8fe429c39254d3e0d3987 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 19 Mar 2025 18:13:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=202.=E6=8A=A5=E8=A1=A8bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trunkline/service/impl/TrunklineCarsLoadServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 17019dc54..98da38fac 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 @@ -13383,7 +13383,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl updateNowWarehouseList = new ArrayList<>();