From 5959c6b7f6a0bbe0f086ce5d22fbf977f569954a Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 3 Jun 2024 16:58:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E9=85=8D=E8=BD=A6=E6=AC=A1=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E4=BF=AE=E6=94=B9=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=EF=BC=8C=E4=BF=AE=E5=A4=8D=E9=85=8D=E9=80=81?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DistributionDeliveryListServiceImpl.java  |  3 +-
 .../impl/DistributionSignforServiceImpl.java  | 30 ++-----------------
 2 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index d1d856624..467239e47 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -4012,7 +4012,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				.set(DistributionReservationEntity::getReservationStatus,ReservationStatusConstant.daipeisong.getValue())
 			);
 			String content = "包件在"+myCurrentWarehouse.getName()+"由"+ AuthUtil.getUser().getNickName()+"转车次任务,操作方式:车次添加预约计划,车次号:"+deliveryListEntity.getTrainNumber();
-			distributionAsyncService.recordsReservationDeliveryLog(newIds,myCurrentWarehouse,AuthUtil.getUser(),deliveryListEntity.getTrainNumber(),WorkNodeEnums.PLAN_DISTRIBUTION.getCode(),content);
+			String ids = oldIds.stream().map(String::valueOf).collect(Collectors.joining(","));
+			distributionAsyncService.recordsReservationDeliveryLog(ids,myCurrentWarehouse,AuthUtil.getUser(),deliveryListEntity.getTrainNumber(),WorkNodeEnums.PLAN_DISTRIBUTION.getCode(),content);
 		}
 
 		oldReservation.forEach((m, n) -> {
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
index 8e652f2c6..6dffbff28 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
@@ -2784,20 +2784,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					warehouseUpdownTypeClient.downPackageOrDelTray(loadscanEntity.getOrderPackageCode(), myCurrentWarehouse.getId(), "签收下架解托");
 					content = "包件在"+myCurrentWarehouse.getName()+"由"+AuthUtil.getNickName()+"后台签收,装车方式:扫描装车,配送车次号:"+deliveryListEntity.getTrainNumber()+"预约任务号:"+distributionReservationEntity.getReservationCode();
 					try {
-						trunklinePackageTrackLog.put("tenantId",loadscanEntity.getTenantId());
-						trunklinePackageTrackLog.put("createTime",loadscanEntity.getCreateTime());
-						trunklinePackageTrackLog.put("createUser",loadscanEntity.getCreateUser());
-						trunklinePackageTrackLog.put("updateUser",loadscanEntity.getUpdateUser());
-						trunklinePackageTrackLog.put("updateTime",loadscanEntity.getUpdateTime());
-						trunklinePackageTrackLog.put("isDeleted",loadscanEntity.getIsDeleted());
-						trunklinePackageTrackLog.put("status",loadscanEntity.getStatus());
-						trunklinePackageTrackLog.put("createDept",loadscanEntity.getCreateDept());
-						trunklinePackageTrackLog.put("orderPackageCode",loadscanEntity.getOrderPackageCode());
-						trunklinePackageTrackLog.put("warehouseId",myCurrentWarehouse.getId());
-						trunklinePackageTrackLog.put("warehouseName",myCurrentWarehouse.getName());
-						trunklinePackageTrackLog.put("workNode",WorkNodeEnums.DISTRIBUTION_LOADING.getCode());
-						trunklinePackageTrackLog.put("content",content);
-						trunklinePackageTrackLog.put("operator",AuthUtil.getNickName());
+						trunklinePackageTrackLog =handleLogJSONObject(myCurrentWarehouse,AuthUtil.getUser(),loadscanEntity.getOrderPackageCode(),content,WorkNodeEnums.DISTRIBUTION_SIGN_FOR.getCode());
 					}catch (Exception e){
 						log.error("装车日志数据错误",e);
 					}
@@ -2881,20 +2868,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 //					包件解托下架
 					 content = "包件在"+myCurrentWarehouse.getName()+"由"+AuthUtil.getNickName()+"后台签收,装车方式:补录装车,配送车次号:"+deliveryListEntity.getTrainNumber()+"预约任务号:"+distributionReservationEntity.getReservationCode();
 					try {
-						trunklinePackageTrackLog.put("tenantId",loadscanEntity.getTenantId());
-						trunklinePackageTrackLog.put("createTime",loadscanEntity.getCreateTime());
-						trunklinePackageTrackLog.put("createUser",loadscanEntity.getCreateUser());
-						trunklinePackageTrackLog.put("updateUser",loadscanEntity.getUpdateUser());
-						trunklinePackageTrackLog.put("updateTime",loadscanEntity.getUpdateTime());
-						trunklinePackageTrackLog.put("isDeleted",loadscanEntity.getIsDeleted());
-						trunklinePackageTrackLog.put("status",loadscanEntity.getStatus());
-						trunklinePackageTrackLog.put("createDept",loadscanEntity.getCreateDept());
-						trunklinePackageTrackLog.put("orderPackageCode",loadscanEntity.getOrderPackageCode());
-						trunklinePackageTrackLog.put("warehouseId",myCurrentWarehouse.getId());
-						trunklinePackageTrackLog.put("warehouseName",myCurrentWarehouse.getName());
-						trunklinePackageTrackLog.put("workNode",WorkNodeEnums.DISTRIBUTION_LOADING.getCode());
-						trunklinePackageTrackLog.put("content",content);
-						trunklinePackageTrackLog.put("operator",AuthUtil.getNickName());
+						trunklinePackageTrackLog =handleLogJSONObject(myCurrentWarehouse,AuthUtil.getUser(),loadscanEntity.getOrderPackageCode(),content,WorkNodeEnums.DISTRIBUTION_SIGN_FOR.getCode());
 					}catch (Exception e){
 						log.error("装车日志数据错误",e);
 					}