From 23bc4db2b04de474e019fbbe8e0d5820591dcc92 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <123456>
Date: Tue, 18 Jul 2023 17:03:37 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95=E4=B8=8A?=
 =?UTF-8?q?=E7=9A=84=E9=97=A8=E5=BA=97=E5=92=8C=E7=BB=8F=E9=94=80=E5=95=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DistributionStockArticleEntity.java       | 42 +++++++++++++----
 .../entity/DistributionStockListEntity.java   |  9 ++--
 .../DistributionStockArticleServiceImpl.java  |  5 +-
 .../impl/PanFactoryDataServiceImpl.java       | 46 +++++++++++++++----
 4 files changed, 76 insertions(+), 26 deletions(-)

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 2756c34cf..1b5811876 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
@@ -76,33 +76,38 @@ public class DistributionStockArticleEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "订单自编号")
 	private String orderSelfNumbering;
+
+	/**
+	 * 门店id
+	 */
+	@ApiModelProperty(value = "门店id")
+	private Long storeId;
+
+
 	/**
 	 * 商场id
 	 */
 	@ApiModelProperty(value = "商场id")
 	private Long mallId;
+
 	/**
-	 * 门店id
+	 * 商场名称
 	 */
-	@ApiModelProperty(value = "门店id")
-	private Long storeId;
-
+	@ApiModelProperty(value = "商场名称")
+	private String mallName;
 	/**
 	 * 商场编号
 	 */
 	@ApiModelProperty(value = "商场编码")
 	private String mallCode;
+
+
 	/**
 	 * 门店编号
 	 */
 	@ApiModelProperty(value = "门店编码")
-	private Long storeCode;
+	private String storeCode;
 
-	/**
-	 * 商场名称
-	 */
-	@ApiModelProperty(value = "商场名称")
-	private String mallName;
 
 	/**
 	 * 门店名称
@@ -247,6 +252,9 @@ public class DistributionStockArticleEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "仓储费")
 	private BigDecimal storageFee;
+
+
+
 	/**
 	 * 包件数量
 	 */
@@ -274,6 +282,20 @@ public class DistributionStockArticleEntity extends TenantEntity {
 	@ApiModelProperty(value = "收货人电话")
 	private String consigneeMobile;
 
+
+
+	// -----------2023-07-18 增加字段
+
+
+
+	@ApiModelProperty(value = "经销商名称")
+	private String dealerName;
+
+	@ApiModelProperty(value = "经销商编码")
+	private String dealerCode;
+
+
+
 	/**
 	 * 可用数量(在库数-已经预约的包件数)
 	 */
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java
index ef638437a..f220c2a0d 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java
@@ -108,11 +108,10 @@ public class DistributionStockListEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "货物id")
 	private Long materialId;
-	/**
-	 * 仓库
-	 */
-	@ApiModelProperty(value = "仓库")
-	private Long warehouse;
+
+
+	@ApiModelProperty(value = "仓库Id")
+	private Long warehouseId;
 	/**
 	 * 拆分包件
 	 */
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 cd6913bd2..0665d0954 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
@@ -249,7 +249,9 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		distributionStockListEntity.setDescriptionGoods(distributionStockArticleEntity.getDescriptionGoods()); //货物名称
 		distributionStockListEntity.setCargoNumber("货物编号"); //货物编号
 
-		distributionStockListEntity.setWarehouse(Long.parseLong( distributionStockArticleEntity.getWarehouse()) ); //仓库
+		distributionStockListEntity.setWarehouseName(distributionStockArticleEntity.getWarehouse() ); //仓库
+		distributionStockListEntity.setWarehouseId(distributionStockArticleEntity.getWarehouseId() ); //仓库ID
+
 		distributionStockListEntity.setMarketId(Long.parseLong("456456465")); //商场
 		distributionStockListEntity.setCargoUnit("货物单位"); //货物单位
 //		distributionStockListEntity.setShop("门店"); //门店
@@ -259,7 +261,6 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		distributionStockListEntity.setOutboundQuantity(distributionStockArticleEntity.getHandQuantity()); //出库数量
 		distributionStockListEntity.setDespatch("车次号");//车次号
 		distributionStockListEntity.setUnit("单位");//单位
-		distributionStockListEntity.setWarehouseName("仓库名称");//仓库名称
 		distributionStockListEntity.setStoreId(Long.parseLong("12312"));//门店ID
 //		distributionStockListEntity.setShoppingMall("所属商场");//所属商场
 //		distributionStockListEntity.setShoppingMall("所属商场");//所属商场
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 bba068bb5..0bab43b4d 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
@@ -361,10 +361,10 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 				Date date = CommonUtil.StringToDate(operationTime);
 
 				distributionStockArticleEntity = new DistributionStockArticleEntity();
-				distributionStockArticleEntity.setServiceNumber(advanceEntity.getServiceNum());
 				distributionStockArticleEntity.setOrderSelfNumbering(orderSelfNum);
+				// 其实是客户
 				distributionStockArticleEntity.setMallName(takeCompany);
-				distributionStockArticleEntity.setDescriptionGoods(advanceEntity.getFirstPackName());
+
 
 				distributionStockArticleEntity.setWarehouse(destinationWarehouse);
 				distributionStockArticleEntity.setWarehouseId(distributionStockArticleEntity.getId());
@@ -374,8 +374,6 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 				distributionStockArticleEntity.setHandQuantity(0);
 				distributionStockArticleEntity.setTenantId(TenantNum.HUITONGCODE);// 对应租户ID
 //				distributionStockArticleEntity.setWaybillNumber();// 运单号
-				// 需要插入部门 ID
-				// 创建ID
 
 				//判断是否齐套 查询该订单自编号下面的包件是都全部都交由汇通了
 				Integer allNum = advanceDetailClient.getAllNumByOrderNo(orderSelfNum);
@@ -386,8 +384,6 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 					distributionStockArticleEntity.setCompleteSet(0);
 				}
 
-				distributionStockArticleEntity.setBrand(advanceEntity.getType());
-				distributionStockArticleEntity.setResource(advanceEntity.getType());
 				if(!Objects.isNull(basicdataWarehouseEntity)){
 					distributionStockArticleEntity.setCreateDept(Long.parseLong(basicdataWarehouseEntity.getDepartment()));
 				}
@@ -404,8 +400,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 					}
 				}
 				distributionStockArticleEntity.setCustomerName(customerName);
-				distributionStockArticleEntity.setCustomerTelephone(advanceEntity.getCustomerPhone());
-				distributionStockArticleEntity.setCustomerAddress(advanceEntity.getCustomerRoad());
+
 				distributionStockArticleEntity.setGenre(1);
 				distributionStockArticleEntity.setState(2);
 				distributionStockArticleEntity.setAdvanceId(advanceId);
@@ -420,8 +415,13 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 					distributionStockArticleEntity.setConsigneeUnit(wayBillEntity.getTakeCompany());//收货单位（经销商）
 					distributionStockArticleEntity.setConsigneePerson(wayBillEntity.getTakePerson());//收货人
 					distributionStockArticleEntity.setConsigneeAddress(wayBillEntity.getTakeAddress());//收货人地址
-					distributionStockArticleEntity.setConsigneeMobile(wayBillEntity.getTakeMobile());//收货人电话
+					distributionStockArticleEntity.setConsigneeMobile(wayBillEntity.getTakePhone());//收货人电话
 				}
+
+				// 增加订单 经销商信息 和门店信息
+				buildDealerAndStore(distributionStockArticleEntity, advanceEntity);
+
+
 				distributionStockArticleEntity.setCreateUser(1123598821738675201L);
 
 				id = distributionStockArticleClient.addData(distributionStockArticleEntity);
@@ -460,6 +460,34 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 		}
 	}
 
+	/**
+	 * 构建订单的经销商信息和门店信息
+	 * @param distributionStockArticleEntity
+	 * @param advanceEntity
+	 */
+	private void buildDealerAndStore(DistributionStockArticleEntity distributionStockArticleEntity, AdvanceEntity advanceEntity) {
+
+		// 进销商信息从来系统获取
+		distributionStockArticleEntity.setStoreName(advanceEntity.getStoreName());
+		distributionStockArticleEntity.setStoreCode(advanceEntity.getStoreNo());
+
+		distributionStockArticleEntity.setDealerCode(advanceEntity.getDealerCode());
+		distributionStockArticleEntity.setDealerName(advanceEntity.getDealerName());
+
+		distributionStockArticleEntity.setCustomerTelephone(advanceEntity.getCustomerPhone());
+		distributionStockArticleEntity.setCustomerAddress(advanceEntity.getCustomerRoad());
+
+		distributionStockArticleEntity.setServiceNumber(advanceEntity.getServiceNum());
+
+		distributionStockArticleEntity.setDescriptionGoods(advanceEntity.getFirstPackName());
+
+		distributionStockArticleEntity.setBrand(advanceEntity.getType());
+		distributionStockArticleEntity.setResource(advanceEntity.getType());
+
+
+
+	}
+
 //	private void dealwithWaybillData(MainlineWaybill mainlineWaybill,String waybillNo) {
 //		查询老系统运单数据
 //		WayBillEntity wayBillEntity = wayBillClient.getByWaybillNo(waybillNo);