From d29e60eb0a5bd4f5042a6a56ed34d51dbd1c00a4 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <123456>
Date: Tue, 18 Jul 2023 15:20:29 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E5=9C=A8=E5=BA=93=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=20=E4=BB=93=E5=BA=93ID=20=E5=92=8C=E5=8C=85=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8A=E7=9A=84=E4=BB=93=E5=BA=93ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/entity/DistributionParcelListEntity.java | 3 +++
 .../entity/DistributionStockArticleEntity.java            | 6 ++++++
 .../service/impl/DistributionStockArticleServiceImpl.java | 1 +
 .../pan/service/impl/PanFactoryDataServiceImpl.java       | 8 ++++++++
 4 files changed, 18 insertions(+)

diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java
index 2df397b71..a128cb61d 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java
@@ -70,6 +70,9 @@ public class DistributionParcelListEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "仓库")
 	private String warehouse;
+
+	@ApiModelProperty(value = "仓库ID")
+	private Long warehouseId;
 	/**
 	 * 状态
 	 */
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java
index 103e544c6..2756c34cf 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java
@@ -120,6 +120,12 @@ public class DistributionStockArticleEntity extends TenantEntity {
 	@ApiModelProperty(value = "仓库")
 	private String warehouse;
 
+	/**
+	 * 仓库ID
+	 */
+	@ApiModelProperty(value = "仓库ID")
+	private Long warehouseId;
+
 	@TableField(exist = false)
 	private String stateName;
 	@TableField(exist = false)
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
index 24a41db00..cd6913bd2 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
@@ -248,6 +248,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		distributionStockListEntity.setServiceNumber("服务号"); //服务号
 		distributionStockListEntity.setDescriptionGoods(distributionStockArticleEntity.getDescriptionGoods()); //货物名称
 		distributionStockListEntity.setCargoNumber("货物编号"); //货物编号
+
 		distributionStockListEntity.setWarehouse(Long.parseLong( distributionStockArticleEntity.getWarehouse()) ); //仓库
 		distributionStockListEntity.setMarketId(Long.parseLong("456456465")); //商场
 		distributionStockListEntity.setCargoUnit("货物单位"); //货物单位
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 a3a5b4c69..bba068bb5 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
@@ -348,7 +348,9 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 
 			Map<String, String> supplyData = advanceDetailClient.getSupplyData(unitNo);
 			String destinationWarehouse = supplyData.get("destinationWarehouse");//目的仓名称
+
 			String takeCompany = supplyData.get("takeCompany");
+			// 查询数据对应的仓库名称
 			BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.findByName(destinationWarehouse);
 
 			//判断新系统是否有这条订单数据
@@ -363,7 +365,10 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 				distributionStockArticleEntity.setOrderSelfNumbering(orderSelfNum);
 				distributionStockArticleEntity.setMallName(takeCompany);
 				distributionStockArticleEntity.setDescriptionGoods(advanceEntity.getFirstPackName());
+
 				distributionStockArticleEntity.setWarehouse(destinationWarehouse);
+				distributionStockArticleEntity.setWarehouseId(distributionStockArticleEntity.getId());
+
 				distributionStockArticleEntity.setWarehouseEntryTime(date);
 				distributionStockArticleEntity.setTotalNumber(total);
 				distributionStockArticleEntity.setHandQuantity(0);
@@ -433,10 +438,13 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 			DistributionParcelListEntity entity = new DistributionParcelListEntity();
 			BeanUtil.copyProperties(vo,entity);
 			entity.setConditions(1);
+			entity.setWarehouse(distributionStockArticleEntity.getWarehouse());
+			entity.setWarehouseId(distributionStockArticleEntity.getId());
 			entity.setStockArticleId(id);
 			// 绑定部门--仓库
 			entity.setCreateDept(Long.parseLong(basicdataWarehouseEntity.getDepartment()));
 			entity.setCreateUser(1123598821738675201L);
+			entity.setTenantId(TenantNum.HUITONGCODE);
 			boolean b = distributionParcelListClient.add(entity);
 			if(!b){
 				logger.warn("#################handleDataToPlatform: 保存包件信息失败  orderSelfNum={}",orderSelfNum);