Merge remote-tracking branch 'origin/dev' into pre-production

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

@@ -16,6 +16,7 @@
  */
 package com.logpm.distribution.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -40,7 +41,10 @@ import com.logpm.distribution.dto.app.queryOrderDTO;
 import com.logpm.distribution.entity.*;
 import com.logpm.distribution.excel.DistributionSignForStockArticleExcel;
 import com.logpm.distribution.excel.DistributionStockArticleExcel;
-import com.logpm.distribution.mapper.*;
+import com.logpm.distribution.mapper.DistributionParcelListMapper;
+import com.logpm.distribution.mapper.DistributionParcelNumberMapper;
+import com.logpm.distribution.mapper.DistributionSignforMapper;
+import com.logpm.distribution.mapper.DistributionStockArticleMapper;
 import com.logpm.distribution.service.*;
 import com.logpm.distribution.vo.*;
 import com.logpm.distribution.vo.app.queryOrderVO;
@@ -51,8 +55,6 @@ import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity;
 import com.logpm.trunkline.feign.ITrunklineAdvanceDetailClient;
 import com.logpm.warehouse.entity.WarehouseWayBillDetail;
 import com.logpm.warehouse.entity.WarehouseWaybillEntity;
-import com.logpm.warehouse.feign.IWarehouseTrayGoodsClient;
-import com.logpm.warehouse.feign.IWarehouseUpdownGoodsClient;
 import com.logpm.warehouse.feign.IWarehouseWaybillClient;
 import com.logpm.warehouse.feign.IWarehouseWaybillDetailClient;
 import lombok.AllArgsConstructor;
@@ -1524,6 +1526,14 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 			.eq("conditions", 1)
 			.eq("is_deleted", 0);
 		List<DistributionParcelListEntity> list = distributionParcelListService.list(queryWrapper);
+
+		if(CollUtil.isNotEmpty(list)){
+			log.info("##################updateOrderInfoByDistributionStockArticleEntity: 查询到的包件数据 {} 条",list.size());
+		}else{
+			log.info("##################updateOrderInfoByDistributionStockArticleEntity: 查询到的包件数据 不存在");
+		}
+
+
 		Integer incomingNum = 0;
 		Integer handleNum = 0;
 		Integer outNum = 0;

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

@@ -7767,7 +7767,14 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			});
 
 			//直接新增的包件
-			distributionParcelListClient.addBatch(newParcelListEntities);
+
+			//把newParcelListEntities每200个分一组
+			List<List<DistributionParcelListEntity>> newParcelListEntitiesList = CollUtil.split(newParcelListEntities, 200);
+			newParcelListEntitiesList.forEach(p -> {
+				distributionParcelListClient.addBatch(p);
+			});
+
+//			distributionParcelListClient.addBatch(newParcelListEntities);
 			if (CollUtil.isNotEmpty(newParcelListEntities)) {
 				for (DistributionParcelListEntity entity : newParcelListEntities) {
 					try {