From 062e9b0545c47d34c5582bd06a098967e21126f2 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 29 Jul 2024 09:59:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E8=80=81=E7=B3=BB=E7=BB=9FBU?= =?UTF-8?q?G=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/common/constant/ModuleNameConstant.java | 2 +- .../logpm/distribution/mapper/DistributionSignforMapper.xml | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java index d60420fe5..f8d462699 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java @@ -9,7 +9,7 @@ public interface ModuleNameConstant { /** * 如果不需要 "" */ - public static final String DEVAUTH =""; + public static final String DEVAUTH ="-tjj"; /** * 工厂对接服务名称 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index c4237a77b..1beb630e9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -1259,7 +1259,7 @@ SELECT ldpl.id AS id, - ldpl.warehouse_id AS warehouse_id, + if(lww.old_id is null,lww.id,lww.old_id) AS warehouseId, lddl.id AS distributionId, lddl.train_number AS transNo, ldpl.waybill_number AS waybillNo, @@ -1312,6 +1313,7 @@ AND lddl.is_deleted = 0 INNER JOIN logpm_distribution_parcel_list AS ldpl ON ldl.package_id = ldpl.id AND ldpl.is_deleted = 0 + LEFT JOIN logpm_warehouse_warehouse AS lww ON ldpl.warehouse_id = lww.id WHERE ldl.reservation_id = #{reservationId} AND ldl.delivery_id = #{deliveryId}