From a4c9dbe23c0b252ca55c6590965aeb01721093fc Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Wed, 4 Dec 2024 17:52:13 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/StatisticsOrderInfoMapper.xml      |  5 +-
 .../impl/TrunklineCarsLoadServiceImpl.java    | 58 ++++++++++---------
 2 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml
index 1dcfe9d0d..a8cae7c4c 100644
--- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml
+++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml
@@ -529,9 +529,7 @@
         IFNULL(sum(lsdp.delivery_upfloor_fee),0) deliveryUpfloorFee,
         IFNULL(sum(lsdp.delivery_move_fee),0) deliveryMoveFee,
         IFNULL(sum(lsdp.delivery_other_fee),0) deliveryOtherFee,
-        IFNULL(sum(lsdp.delivery_crossing_fee),0) deliveryCrossingFee,
-        IFNULL(sum(lsdp.sign_num),0) signNum,
-        max(lsdp.sign_time) signTime
+        IFNULL(sum(lsdp.delivery_crossing_fee),0) deliveryCrossingFee
         from logpm_statistics_trunkline_package lstp
         left join logpm_statistics_warehouse_package lswp on lswp.order_info_id = lstp.order_info_id and
         IFNULL(lswp.order_package_code,'0') = IFNULL(lstp.order_package_code,'0') and IFNULL(lswp.product_id,1) =
@@ -650,6 +648,7 @@
         end
         as signStatus,
         lww.sign_time signDate,
+        lww.sign_num signNum,
         lww.create_time openTime,
         lww.departure departure,
         lww.destination destination,
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 048e89871..aae2a5f28 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
@@ -9902,7 +9902,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				DistributionStockArticleEntity stockArticleEntity = getDistributionStockArticle(orderCode,unloadNodeId,incomingWarehouseName,scanCode);
 				BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(unloadNodeId);
 				DistributionParcelListEntity newParcelList = new DistributionParcelListEntity();
-				BeanUtil.copy(parcelListEntity, newParcelList);
+				BeanUtil.copy(parcelListEntity1, newParcelList);
 				newParcelList.setId(null);
 				newParcelList.setWarehouseId(unloadNodeId);
 				newParcelList.setWarehouse(warehouseEntity.getName());
@@ -9943,32 +9943,36 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 				 stockArticleByOrderCodeAndWarehouseId = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode, entityByOrderPackageCode.getNowWarehouseId());
 
-
-				 if(Objects.isNull(stockArticleByOrderCodeAndWarehouseId)){
-
-					 stockArticleByOrderCodeAndWarehouseId.setId(null);
-
-					 stockArticleByOrderCodeAndWarehouseId.setWarehouseId(warehouseId);
-					 stockArticleByOrderCodeAndWarehouseId.setWarehouseId(warehouseId);
-					 stockArticleByOrderCodeAndWarehouseId.setWarehouse(warehouseName);
-					 stockArticleByOrderCodeAndWarehouseId.setGenre(1);
-					 stockArticleByOrderCodeAndWarehouseId.setHandQuantity(0);
-					 stockArticleByOrderCodeAndWarehouseId.setCompleteSet(1);
-					 stockArticleByOrderCodeAndWarehouseId.setStockupStatus("10");
-					 stockArticleByOrderCodeAndWarehouseId.setReservationStatus("10");
-					 stockArticleByOrderCodeAndWarehouseId.setOrderStatus("10");
-					 stockArticleByOrderCodeAndWarehouseId.setGroundingStatus("10");
-					 stockArticleByOrderCodeAndWarehouseId.setOrderReceiveStatus("10");
-					 stockArticleByOrderCodeAndWarehouseId.setFreezeStatus("10");
-					 stockArticleByOrderCodeAndWarehouseId.setSortingQuantity(0);
-					 stockArticleByOrderCodeAndWarehouseId.setDeliveryQuantity(0);
-					 stockArticleByOrderCodeAndWarehouseId.setTransferQuantity(0);
-					 stockArticleByOrderCodeAndWarehouseId.setSigninQuantity(0);
-					 stockArticleByOrderCodeAndWarehouseId.setIncomingNum(0);
-					 stockArticleByOrderCodeAndWarehouseId.setAllocation(null);
-					 stockArticleByOrderCodeAndWarehouseId.setTrays(null);
-					 Long orderId = distributionStockArticleClient.addData(stockArticleByOrderCodeAndWarehouseId);
-					 stockArticleByOrderCodeAndWarehouseId.setId(orderId);
+				 if(!Objects.isNull(stockArticleByOrderCodeAndWarehouseId)){
+
+					 DistributionStockArticleEntity newEntity = new DistributionStockArticleEntity();
+
+					 BeanUtil.copy(stockArticleByOrderCodeAndWarehouseId,newEntity);
+
+					 newEntity.setId(null);
+
+					 newEntity.setWarehouseId(warehouseId);
+					 newEntity.setWarehouseId(warehouseId);
+					 newEntity.setWarehouse(warehouseName);
+					 newEntity.setGenre(1);
+					 newEntity.setHandQuantity(0);
+					 newEntity.setCompleteSet(1);
+					 newEntity.setStockupStatus("10");
+					 newEntity.setReservationStatus("10");
+					 newEntity.setOrderStatus("10");
+					 newEntity.setGroundingStatus("10");
+					 newEntity.setOrderReceiveStatus("10");
+					 newEntity.setFreezeStatus("10");
+					 newEntity.setSortingQuantity(0);
+					 newEntity.setDeliveryQuantity(0);
+					 newEntity.setTransferQuantity(0);
+					 newEntity.setSigninQuantity(0);
+					 newEntity.setIncomingNum(0);
+					 newEntity.setAllocation(null);
+					 newEntity.setTrays(null);
+					 Long orderId = distributionStockArticleClient.addData(newEntity);
+					 newEntity.setId(orderId);
+					 return newEntity;
 				 }
 			}
 		}