1.干线bug修复

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

@@ -11500,6 +11500,18 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 							DistributionStockArticleEntity nowDistributionStockArticle = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode,incomingWarehouseId);
 
+							if(Objects.isNull(nowDistributionStockArticle)){
+								Long advanceDetailId = advanceDetailEntity.getId();
+								trunklineAdvanceDetailService.updatePackageStatusById("0",advanceDetailId,null,null,null);
+								InComingDTO inComingDTO = new InComingDTO();
+								inComingDTO.setOrderPackageCode(orderPackageCode);
+								inComingDTO.setIncomingType(incomingType);
+								inComingDTO.setWarehouseId(incomingWarehouseId);
+								inComingService.incomingPackage(inComingDTO);
+								nowDistributionStockArticle = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode,incomingWarehouseId);
+							}
+
+
 							//查询包件前面仓的订单信息
 							currentStockArticleEntity = new DistributionStockArticleEntity();
 							BeanUtil.copy(nowDistributionStockArticle, currentStockArticleEntity);
@@ -11545,9 +11557,6 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 						DistributionParcelListEntity nowParcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, incomingWarehouseId);
 
-
-
-
 						if (Objects.isNull(distributionParcelListEntity)) {
 							distributionParcelListEntity = new DistributionParcelListEntity();
 							BeanUtil.copy(nowParcelListEntity, distributionParcelListEntity);