1.修复factory同步数据到新系统的bug

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 ="";
 
 	/**
 	 * 工厂对接服务名称

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;
+
 	/**
 	 * 物料名称
 	 */

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;
 	/**
 	 * 数量
 	 */

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());//冻结数量

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;
 	}

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);

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