From e78108b319491ef0a1839b6bc3c3dccc6a8f4a91 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Wed, 26 Jul 2023 20:00:36 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8Dfactory=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=B0=E6=96=B0=E7=B3=BB=E7=BB=9F=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/springblade/common/constant/ModuleNameConstant.java   | 2 +-
 .../distribution/entity/DistributionParcelListEntity.java     | 3 ++-
 .../logpm/oldproject/vo/DistributionParcelListEntityVO.java   | 2 +-
 .../service/impl/DistributionStockArticleServiceImpl.java     | 2 +-
 .../factory/pan/controller/PanFactoryDataController.java      | 2 +-
 .../factory/pan/service/impl/PanFactoryDataServiceImpl.java   | 4 +++-
 .../java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml  | 2 +-
 7 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java
index d4d3b3676..301dcc0d5 100644
--- a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java
+++ b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java
@@ -8,7 +8,7 @@ public interface ModuleNameConstant {
 	/**
 	 * 如果不需要 ""
 	 */
-	public static final String DEVAUTH ="-zhy";
+	public static final String DEVAUTH ="";
 
 	/**
 	 * 工厂对接服务名称
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 fac47d3c0..6197859e7 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
@@ -118,7 +118,8 @@ public class DistributionParcelListEntity extends TenantEntity {
 	 * 物料Id
 	 */
 	@ApiModelProperty(value = "物料ID")
-	private Long material;
+	private Long materialId;
+
 	/**
 	 * 物料名称
 	 */
diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/vo/DistributionParcelListEntityVO.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/vo/DistributionParcelListEntityVO.java
index e8d68664b..8561813f6 100644
--- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/vo/DistributionParcelListEntityVO.java
+++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/vo/DistributionParcelListEntityVO.java
@@ -54,7 +54,7 @@ public class DistributionParcelListEntityVO {
 	 * 物料
 	 */
 	@ApiModelProperty(value = "物料")
-	private String material;
+	private String materialName;
 	/**
 	 * 数量
 	 */
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 51be487e9..9f6b90cff 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
@@ -273,7 +273,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		distributionStockListEntity.setStoreName(Optional.ofNullable(distributionStockArticleEntity.getStoreName()).orElse(null));//门店名称
 		distributionStockListEntity.setFactory(Optional.ofNullable(distributionStockArticleEntity.getFactoryTrain()).orElse(null));//工厂车次
 		distributionStockListEntity.setCategory(Optional.ofNullable(distributionParcelList.getBrandId()).orElse(null));//品分类
-		distributionStockListEntity.setMaterialId(Optional.ofNullable(distributionParcelList.getMaterial()).orElse(null));//货物ID
+		distributionStockListEntity.setMaterialId(Optional.ofNullable(distributionParcelList.getMaterialId()).orElse(null));//货物ID
 		distributionStockListEntity.setParcelListId(distributionParcelList.getId());//包件id
 		distributionStockListEntity.setQuantityOccupied(0);//冻结数量
 		distributionStockListEntity.setServiceType(distributionStockArticleEntity.getTypeService());//冻结数量
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/controller/PanFactoryDataController.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/controller/PanFactoryDataController.java
index 6b4c40d3f..d275a6ac7 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/controller/PanFactoryDataController.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/controller/PanFactoryDataController.java
@@ -142,7 +142,7 @@ public class PanFactoryDataController extends BladeController {
 
 
 		//真正的处理需要的数据
-		panFactoryDataService.handleDataToPlatform("CS0011-06126-0",null);
+		panFactoryDataService.handleDataToPlatform("CS0011061260002",null);
 
 		return null;
 	}
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 47e66f2c6..5e6c8ac8d 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
@@ -441,7 +441,9 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 			entity.setWarehouseId(distributionStockArticleEntity.getId());
 			entity.setStockArticleId(id);
 			// 绑定部门--仓库
-			entity.setCreateDept(Long.parseLong(basicdataWarehouseEntity.getDepartment()));
+			if(!Objects.isNull(basicdataWarehouseEntity)){
+				entity.setCreateDept(Long.parseLong(basicdataWarehouseEntity.getDepartment()));
+			}
 			entity.setCreateUser(1123598821738675201L);
 			entity.setTenantId(TenantNum.HUITONGCODE);
 			boolean b = distributionParcelListClient.add(entity);
diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml
index 2a83de195..2fa940d89 100644
--- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml
+++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml
@@ -97,7 +97,7 @@
                ad.firstPackName firsts,
                ad.secondPackName `second`,
                ad.thirdPackName thirdProduct,
-               ad.productCode material,
+               ad.productCode materialName,
                ad.mscsNum quantity,
                ad.mctsTruck trainNumber
         from ht_order_detail od