From 7be751f246da4c3df60d2390be45266a47b8350a Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Sun, 27 Oct 2024 18:57:08 +0800
Subject: [PATCH 1/2] =?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

---
 .../service/impl/OpenOrderServiceImpl.java     |  9 ---------
 .../impl/TrunklineAdvanceServiceImpl.java      | 18 +++++++++++++++---
 .../impl/TrunklineCarsLoadServiceImpl.java     |  2 +-
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
index 2004f333c..054184a35 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
@@ -803,15 +803,6 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		//计算扫码入库的包件是否需要把运单和提货单挂上
 		openOrderAsyncService.dealwithBillladingInfo(advanceIds,warehouseId,warehouseName,waybillId,waybillNo);
 
-		//判断是否是开单及入库的配置
-		Boolean aBoolean = basicdataOpenIncomingClient.checkOpenIncoming(warehouseId, brandId);
-		if (Boolean.TRUE.equals(aBoolean)) {
-			openOrderAsyncService.incomingPackageBatch(advanceIds, AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getTenantId(), AuthUtil.getNickName(), IncomingTypeEnum.OPEN_TO_IN.getCode(), warehouseId, warehouseName, waybillEntity);
-			waybillEntity.setStockCount(waybillEntity.getTotalCount());
-			waybillEntity.setWaybillStatus("20");
-			warehouseWaybillClient.updateEntity(waybillEntity);
-		}
-
 		//异步存入日志
 		String nickName = AuthUtil.getNickName();
 		Long userId = AuthUtil.getUserId();
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java
index b94d994e8..7db37f96d 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java
@@ -447,12 +447,13 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 		String orderCode = advanceEntity.getOrderCode();
 		Integer total = baseMapper.findAllNumByOrderCode(orderCode);
 
+		String waybillNo = advanceEntity.getWaybillNo();
+
 		Long orderId = null;
 		DistributionStockArticleEntity stockArticleEntity = stockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode, warehouseId);
 		if (Objects.isNull(stockArticleEntity)) {
 			log.info("#############saveOrderAndPackage: 订单信息为空，同步订单信息");
 			//订单信息为空
-			String waybillNo = advanceEntity.getWaybillNo();
 
 			stockArticleEntity = new DistributionStockArticleEntity();
 			stockArticleEntity.setCreateUser(userId);
@@ -579,7 +580,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 			stockArticleEntity.setOrderReceiveStatus("10");
 			stockArticleEntity.setFreezeStatus("10");
 			stockArticleEntity.setNotification(2);
-			stockArticleEntity.setIsHaveData(2);
+			stockArticleEntity.setIsHaveData(1);
 			stockArticleEntity.setTrainNumber(advanceEntity.getTrainNumber());
 			stockArticleEntity.setSortingQuantity(0);
 			stockArticleEntity.setDeliveryQuantity(0);
@@ -590,6 +591,10 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 			stockArticleEntity.setTotalNumber(total);
 			stockArticleClient.saveOrUpdate(stockArticleEntity);
 			orderId = stockArticleEntity.getId();
+
+			if(StringUtil.isNotBlank(waybillNo)){
+				waybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo);
+			}
 		}
 		if (Objects.isNull(orderId)) {
 			log.warn("##############saveOrderAndPackage: 订单信息有误 orderId={}", orderId);
@@ -598,6 +603,8 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 
 		stockArticleClient.updateAllOrderTotalNum(orderCode, total);
 
+		log.info("##############saveOrderAndPackage: 当前处理orderCode:{}  waybillNo{}",orderCode,waybillNo);
+
 		List<DistributionParcelListEntity> parcelListEntityList = new ArrayList<>();
 		List<String> orderPackageCodes = new ArrayList<>();
 		for (TrunklineAdvanceDetailEntity advanceDetailEntity : detailList) {
@@ -612,7 +619,12 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 			parcelList.setIsTransfer(1);
 			parcelList.setWarehouse(warehouseEntity.getName());
 			parcelList.setWarehouseId(warehouseId);
-			String waybillNo = advanceEntity.getWaybillNo();
+			if(Objects.isNull(waybillEntity)){
+				if(StringUtil.isNotBlank(waybillNo)){
+					waybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo);
+				}
+			}
+
 			if (!Objects.isNull(waybillEntity)) {
 				Long departureWarehouseId = waybillEntity.getDepartureWarehouseId();
 				Long destinationWarehouseId = waybillEntity.getDestinationWarehouseId();
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 b118e7413..4edb6dc9c 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
@@ -10777,7 +10777,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				if(!Objects.isNull(orderCodeNumVO)){
 					unloadScanOrderVO.setTotalNumber(orderCodeNumVO.getTotalNum());
 				}else{
-					unloadScanOrderVO.setTotalNumber(orderCodeNumVO.getTotalNum());
+					unloadScanOrderVO.setTotalNumber(0);
 				}
 
 				List<UnloadPackageVO> unloadPackageList = new ArrayList<>();

From f3bcbd19d385401a0df7663067ee0aabf81eca9f Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Sun, 27 Oct 2024 20:23:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E5=B9=B2?=
 =?UTF-8?q?=E7=BA=BF=E5=8D=B8=E8=BD=A6=E8=8A=82=E7=82=B9=E5=9B=9E=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1 增加卸车节点的宝典对应的目的仓
---
 .../src/main/java/com/logpm/factorydata/vo/PushData.java      | 4 ++++
 .../trunkline/service/impl/TrunklineCarsLoadServiceImpl.java  | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/vo/PushData.java b/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/vo/PushData.java
index 3f4908190..4bde51712 100644
--- a/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/vo/PushData.java
+++ b/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/vo/PushData.java
@@ -39,5 +39,9 @@ public class PushData implements Serializable {
 	 * 目的仓
 	 */
 	private String destinationWarehouse;
+	/**
+	 * 目的仓
+	 */
+	private String waybillStartWarehouse;
 
 }
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 b118e7413..b9d85c6e5 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
@@ -9523,6 +9523,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
                                 .packageCode(orderPackageCode)
                                 .warehouseName(warehouseName)
 								.destinationWarehouse(ObjectUtil.isNotEmpty(parcelListEntity)  ? parcelListEntity.getAcceptWarehouseName():"")
+								.waybillStartWarehouse(ObjectUtil.isNotEmpty(parcelListEntity)  ? parcelListEntity.getSendWarehouseName():"")
                                 .orderCode(orderCode)
                                 .build()))
 						.build();
@@ -10209,6 +10210,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 							.packageCode(orderPackageCode)
 							.warehouseName(warehouseName)
 							.destinationWarehouse(ObjectUtil.isNotEmpty(parcelListEntity)  ? parcelListEntity.getAcceptWarehouseName():"")
+							.waybillStartWarehouse(ObjectUtil.isNotEmpty(parcelListEntity)  ? parcelListEntity.getSendWarehouseName():"")
 							.orderCode(orderCode)
 							.build()))
 						.build();