车次编码恢复、装车BUG修复

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

@@ -887,7 +887,7 @@
         INNER JOIN logpm_distribution_parcel_list AS ldpl ON ldrs.parce_list_id = ldpl.id
         LEFT JOIN logpm_distribution_stock_article As ldsa ON ldpl.stock_article_id = ldsa.id
         WHERE
-        ldrs.packet_bar_status IN ('1','3') and reservation_id = #{reservationId} AND ldpl.conditions = 1
+        ldrs.packet_bar_status IN ('1','3') and reservation_id = #{reservationId} AND ldpl.conditions = 1 AND ldpl.is_transfer = 0
     </select>
     <select id="getReservationNumStockSelf" resultType="Integer">
         select IFNULL(SUM(lddd.quantity),0)

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java

@@ -1021,7 +1021,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 	@Override
 	public String trainNumberMa() {
 		StringBuilder sb = new StringBuilder();
-		String tenantCode = "HK";
+		String tenantCode = "PSCC";
 		BasicTenantCodeEntity basicTenantCodeByCodeAndShowType = basicTenantCodeClient.findBasicTenantCodeByCodeAndShowType(BasicCodeTypeConstant.DELIVERY_PLAN_CODE.getValue(), BasicCodeShowConstant.QR_CODE.getValue());
 		if (ObjectUtils.isNull(basicTenantCodeByCodeAndShowType)) {
 			log.error("获取货区码失败");