1.处理包件运单信息逻辑优化

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java

@@ -297,5 +297,8 @@ public interface IDistributionParcelListClient {
 
 	@PostMapping(API_PREFIX + "/findIdAndWarehouseIdListByAdvanceIds")
 	List<DistributionParcelListEntity> findIdAndWarehouseIdListByAdvanceIds(@RequestBody List<Long> advanceIds);
+
+	@PostMapping(API_PREFIX + "/findIdAndWarehouseIdListByOrderCodes")
+	List<DistributionParcelListEntity> findIdAndWarehouseIdListByOrderCodes(@RequestBody Set<String> orderCodeSet);
 }
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java

@@ -631,4 +631,9 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
 		return distributionParcelListService.findIdAndWarehouseIdListByAdvanceIds(advanceIds);
 	}
 
+	@Override
+	public List<DistributionParcelListEntity> findIdAndWarehouseIdListByOrderCodes(Set<String> orderCodeSet) {
+		return distributionParcelListService.findIdAndWarehouseIdListByOrderCodes(orderCodeSet);
+	}
+
 }

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

@@ -331,4 +331,7 @@ public interface DistributionParcelListMapper extends BaseMapper<DistributionPar
     List<DistributionOrderZeroPackafeVO> pageOweZeroListTransfer(@Param("orderCode") String orderCode, @Param("waybillNumber") String waybillNumber);
 
 	List<DistributionParcelListEntity> selectParcelListListByAdvanceIds(@Param("advanceIds") List<Long> advanceIds);
+
+	List<DistributionParcelListEntity> findIdAndWarehouseIdListByOrderCodes(@Param("orderCodeSet") Set<String> orderCodeSet);
+
 }

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

@@ -2228,4 +2228,19 @@
         ) t on t.advanceId = ldpl.advance_id
     </select>
 
+    <select id="findIdAndWarehouseIdListByOrderCodes" resultType="com.logpm.distribution.entity.DistributionParcelListEntity">
+        SELECT
+        ldpl.id,
+        ldpl.warehouse_id,
+        ldpl.stock_article_id
+        FROM
+        logpm_distribution_parcel_list ldpl
+        WHERE
+        ldpl.order_code in
+        <foreach collection="orderCodeSet" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+        and ldpl.is_deleted = 0
+    </select>
+
 </mapper>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java

@@ -304,4 +304,5 @@ public interface IDistributionParcelListService extends BaseService<Distribution
 
 	List<DistributionParcelListEntity> findIdAndWarehouseIdListByAdvanceIds(List<Long> advanceIds);
 
+	List<DistributionParcelListEntity> findIdAndWarehouseIdListByOrderCodes(Set<String> orderCodeSet);
 }

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

@@ -1562,4 +1562,9 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 	public List<DistributionParcelListEntity> findIdAndWarehouseIdListByAdvanceIds(List<Long> advanceIds) {
 		return baseMapper.selectParcelListListByAdvanceIds(advanceIds);
 	}
+
+	@Override
+	public List<DistributionParcelListEntity> findIdAndWarehouseIdListByOrderCodes(Set<String> orderCodeSet) {
+		return baseMapper.findIdAndWarehouseIdListByOrderCodes(orderCodeSet);
+	}
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml

@@ -219,8 +219,7 @@
     </select>
     <select id="findPackageCodeByCodes" resultType="java.util.Map">
         select t.order_package_code code,t.id id from logpm_trunkline_advance_detail t
-        where t.is_deleted= 0 and exists(
+        join (
-        select 1 from (
         <foreach collection="orderPackageCodes" index="ind" item="item">
             <if test="ind == 0">
                 select #{item} pid
@@ -230,7 +229,8 @@
                 select #{item} pid
             </if>
         </foreach>
-        ) packageCodes where packageCodes.pid = t.order_package_code)
+        ) m on m.pid = t.order_package_code
+        where t.is_deleted= 0
     </select>
 
 

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@@ -653,7 +653,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		//绑定订单和运单的关系
 		List<TrunklineAdvanceEntity> advanceEntityList = advanceService.findListByIds(advanceIds);
 		List<TrunklineWaybillOrderEntity> waybillOrderEntities = new ArrayList<>();
+		Set<String> orderCodeSet = new HashSet<>();
 		for (TrunklineAdvanceEntity advanceEntity : advanceEntityList) {
+			orderCodeSet.add(advanceEntity.getOrderCode());
 			Long advanceId = advanceEntity.getId();
 			String waybillStatus = advanceEntity.getWaybillStatus();
 			if ("1".equals(waybillStatus)) {
@@ -696,7 +698,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			Long consigneeId1 = waybillEntity.getConsigneeId();
 			BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(consigneeId1);
 
-			List<DistributionParcelListEntity> parcelListEntities = distributionParcelListClient.findIdAndWarehouseIdListByAdvanceIds(advanceIds);
+//			List<DistributionParcelListEntity> parcelListEntities = distributionParcelListClient.findIdAndWarehouseIdListByAdvanceIds(advanceIds);
+			List<DistributionParcelListEntity> parcelListEntities = distributionParcelListClient.findIdAndWarehouseIdListByOrderCodes(orderCodeSet);
 			Set<Long> stockArticleIds = new TreeSet<>();
 			String finalWaybillNo = waybillNo;
 			parcelListEntities.forEach(parcelListEntity -> {
@@ -739,8 +742,6 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			if(CollUtil.isNotEmpty(updateList)){
 				distributionStockArticleClient.updateByBatchId(updateList);
 			}
-
-
 		}
 		trunklineWaybillPackageService.updateWaybillStatus(waybillEntity);