推送老系统BUG修复

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";
 
 	/**
 	 * 工厂对接服务名称

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml

@@ -1259,7 +1259,7 @@
     <select id="selectPushOldPackageLoading" resultType="com.logpm.oldproject.dto.SignPushDataUnitDTO">
         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,
@@ -1281,6 +1281,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}
@@ -1290,7 +1291,7 @@
     <select id="selectPushOldPackageSigning" resultType="com.logpm.oldproject.dto.SignPushDataUnitDTO">
         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}