From b004801c831170141f3529505b502158dc2795e0 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <123456>
Date: Thu, 31 Aug 2023 19:45:34 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E6=9C=80=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=97=B6=E9=97=B4=20=E5=92=8C=20=E5=AF=B9=20?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E7=8A=B6=E6=80=81=E5=92=8C=20=E6=94=B6?=
 =?UTF-8?q?=E8=B4=A7=E7=8A=B6=E6=80=81=E7=9A=84=E7=BB=B4=E6=8A=A4=20rep2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pan/service/impl/PanFactoryDataServiceImpl.java   | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java
index b1fe8a953..90f3aa1c3 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java
@@ -480,16 +480,15 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 				distributionStockArticleEntity.setOrderReceiveStatus(OrderReceiveStatusConstant.bufenshouhuo.getValue());
 
 				id = distributionStockArticleClient.addData(distributionStockArticleEntity);
+				distributionStockArticleEntity.setId(id);
 				if (id == 0) {
 					logger.warn("#################handleDataToPlatform: 保存订单信息失败  orderSelfNum={}", orderSelfNum);
 					throw new CustomerException(405, "保存订单信息失败");
 				}
 			}
-			id = distributionStockArticleEntity.getId();
-			//保存包件信息
-			saveOrderPackage(unitNo, distributionStockArticleEntity, id, basicdataWarehouseEntity, waybillNoNum);
-
 
+			//保存包件信息
+			saveOrderPackage(unitNo, distributionStockArticleEntity, basicdataWarehouseEntity, waybillNoNum);
 
 			String waybillNumber = distributionStockArticleEntity.getWaybillNumber();
 			if(!waybillNumber.contains(waybillNoNum)){
@@ -564,7 +563,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 	 * @param id
 	 * @param basicdataWarehouseEntity
 	 */
-	private void saveOrderPackage(String unitNo, DistributionStockArticleEntity distributionStockArticleEntity, Long id, BasicdataWarehouseEntity basicdataWarehouseEntity, String waybillNo) {
+	private void saveOrderPackage(String unitNo, DistributionStockArticleEntity distributionStockArticleEntity,  BasicdataWarehouseEntity basicdataWarehouseEntity, String waybillNo) {
 		DistributionParcelListEntityVO vo = advanceDetailClient.getByUnitNo(unitNo);
 		WarehouseWaybillEntity warehouseWaybill = warehouseWaybillClient.findByWaybillNo(waybillNo);
 
@@ -574,7 +573,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 		entity.setConditions(1);
 		entity.setWarehouse(distributionStockArticleEntity.getWarehouse());
 		entity.setWarehouseId(distributionStockArticleEntity.getWarehouseId());
-		entity.setStockArticleId(id);
+		entity.setStockArticleId(distributionStockArticleEntity.getId());
 		entity.setOrderPackageStatus(OrderPackageStatusConstant.yiruku.getValue());
 		entity.setOrderPackageFreezeStatus(OrderPackageFreezeStatusConstant.weidongjie.getValue());
 		entity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue());