From 09964ca74bcf33ba63a78fc35d26ab16cc7b3572 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Mon, 24 Mar 2025 17:11:49 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF=E5=90=8C=E6=AD=A5=E7=B3=BB?=
=?UTF-8?q?=E7=BB=9F=E6=97=A0=E7=BC=96=E7=A0=81=E6=95=B0=E6=8D=AEbug?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../trunkline/service/impl/TrunklineCarsLoadServiceImpl.java | 5 +++++
1 file changed, 5 insertions(+)
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 d3a88353d..ae10cae5a 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
@@ -13310,6 +13310,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
List<TrunklineCarsLoadScanEntity> updateScanList = new ArrayList<>();
List<TrunklineAdvanceDetailEntity> incomingAdvanceDetailList = new ArrayList<>();
List<TrunklineAdvanceDetailEntity> udateAdvanceDetailList = new ArrayList<>();
+ List<String> orderPackageCodeList = new ArrayList<>();
Set<String> orderPackageCodeSet = new HashSet<>();
carsLoadScanEntities.forEach(carsLoadScanEntity -> {
@@ -13378,6 +13379,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
String reserve5 = trunklineAdvanceDetailEntity.getReserve5();
Date unloadTime = CommonUtil.StringToDate(reserve5);
+ orderPackageCodeList.add(orderPackageCode);
+
//查询是否有在系统无编码后进行卸车的数据
int unloadNum = trunklineCarsLoadScanService.findEntityByOrderPackageCodeAndUnloadTime(orderPackageCode,unloadTime);
if(unloadNum > 0){
@@ -13470,6 +13473,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
List<String> orderPackageCodes = new ArrayList<>(orderPackageCodeSet);
+ orderPackageCodes.removeAll(orderPackageCodeList);
+
String content = "包件在 " + warehouseName + "卸车，车次号："+carsLoadEntity.getCarsNo()+" 卸车方式：" + IncomingTypeEnum.getValue(IncomingTypeEnum.SYNC_INCOMING.getCode());
packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, warehouseName, WorkNodeEnums.UNLOAD_INCOMING_WAREHOUSE.getCode(), content);