From c5a900b6606e24021907e41e26156ea07c3d8c1a Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Wed, 22 Jan 2025 16:31:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1.bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/TrunklineCarsLoadServiceImpl.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
index eb1e41373..9e9e1844b 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
+++ b/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 {
From 894d79dc4e5571ec5e5457d8c711eeec92b278b2 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Wed, 22 Jan 2025 19:09:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1.=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=95=B0=E6=8D=AE=E6=97=A5=E5=BF=97=E6=89=93?=
=?UTF-8?q?=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../DistributionStockArticleServiceImpl.java | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
index cf0c84a38..e10c7cdf7 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
+++ b/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;