From 0269b98ccbaf16ed8b3c27620879ab2867ef241c Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Wed, 23 Oct 2024 01:22:24 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E5=B7=A5?=
 =?UTF-8?q?=E5=8E=82=E6=95=B0=E6=8D=AE=E6=8E=A8=E9=80=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1 修改各个工厂暂存单的物料品类调整
---
 .../jinpai/service/impl/DeliveryNoteServiceImpl.java   |  2 +-
 .../mwh/service/impl/DeliveryNoteServiceImpl.java      |  4 +---
 .../olo/service/impl/DeliveryNoteServiceImpl.java      |  2 +-
 .../suofeiya/service/impl/DeliveryNoteServiceImpl.java |  2 +-
 .../zbom/service/impl/ReceiptServiceImpl.java          | 10 ++++++----
 .../comfac/service/impl/AsyncDataServiceImpl.java      |  6 +++---
 .../com/logpm/factory/jobhandler/FactoryXxlJob.java    |  2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/service/impl/DeliveryNoteServiceImpl.java b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/service/impl/DeliveryNoteServiceImpl.java
index 18fbed004..2ea4f88f7 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/service/impl/DeliveryNoteServiceImpl.java
+++ b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/service/impl/DeliveryNoteServiceImpl.java
@@ -259,7 +259,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 					// 一级品类名称
 					if (StrUtil.isNotEmpty(categoryVO.getTypea())) {
 						advanceDetailEntity.setFirstPackName(categoryVO.getTypea());
-						advanceDetailEntity.setMaterialName(categoryVO.getTypea());
+						// advanceDetailEntity.setMaterialName(categoryVO.getTypea());
 					}
 					// 二级品类名称
 					if (StrUtil.isNotEmpty(categoryVO.getTypeb())) {
diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/java/com/logpm/factorydata/mwh/service/impl/DeliveryNoteServiceImpl.java b/blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/java/com/logpm/factorydata/mwh/service/impl/DeliveryNoteServiceImpl.java
index 5137a8dea..bd01202de 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/java/com/logpm/factorydata/mwh/service/impl/DeliveryNoteServiceImpl.java
+++ b/blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/java/com/logpm/factorydata/mwh/service/impl/DeliveryNoteServiceImpl.java
@@ -1,6 +1,5 @@
 package com.logpm.factorydata.mwh.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
@@ -14,7 +13,6 @@ import com.logpm.factorydata.base.vo.FactoryWarehouseBindVO;
 import com.logpm.factorydata.enums.BrandEnums;
 import com.logpm.factorydata.feign.IFactoryDataClient;
 import com.logpm.factorydata.mwh.entity.DeliveryNoteEntity;
-import com.logpm.factorydata.mwh.entity.PackageInfoEntity;
 import com.logpm.factorydata.mwh.mapper.DeliveryNoteMapper;
 import com.logpm.factorydata.mwh.service.DeliveryNoteService;
 import com.logpm.factorydata.mwh.vo.DeliveryNoteVO;
@@ -134,7 +132,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 					advanceDetailEntity.setSecondPackName(name);
 					//三级品类名称
 					advanceDetailEntity.setThirdPackName(name);
-					advanceDetailEntity.setMaterialName("");
+					// advanceDetailEntity.setMaterialName("");
 					advanceDetailEntity.setSiteName("");
 					advanceDetailEntity.setSiteCode("");
 					advanceDetailEntity.setQuantity(1);
diff --git a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/service/impl/DeliveryNoteServiceImpl.java b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/service/impl/DeliveryNoteServiceImpl.java
index d65acccff..40bcec87d 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/service/impl/DeliveryNoteServiceImpl.java
+++ b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/service/impl/DeliveryNoteServiceImpl.java
@@ -192,7 +192,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 				advanceDetailEntity.setSecondPackName(orderPackageDTO.getMaterialCategory());
 				// 三级品类名称
 				advanceDetailEntity.setThirdPackName(orderPackageDTO.getMaterialCategory());
-				advanceDetailEntity.setMaterialName(orderPackageDTO.getMaterialCategory());
+				// advanceDetailEntity.setMaterialName(orderPackageDTO.getMaterialCategory());
 
 				advanceDetailEntity.setSiteName("");
 				advanceDetailEntity.setSiteCode("");
diff --git a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/service/impl/DeliveryNoteServiceImpl.java b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/service/impl/DeliveryNoteServiceImpl.java
index 35a557918..eecc53b68 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/service/impl/DeliveryNoteServiceImpl.java
+++ b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/service/impl/DeliveryNoteServiceImpl.java
@@ -196,7 +196,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 				advanceDetailEntity.setSecondPackName(orderPackageDTO.getPlDepart());
 				// 三级品类名称
 				advanceDetailEntity.setThirdPackName(orderPackageDTO.getPlDepart());
-				advanceDetailEntity.setMaterialName(orderPackageDTO.getPlDepart());
+				// advanceDetailEntity.setMaterialName(orderPackageDTO.getPlDepart());
 				advanceDetailEntity.setSiteName("");
 				advanceDetailEntity.setSiteCode("");
 				advanceDetailEntity.setQuantity(1);
diff --git a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/service/impl/ReceiptServiceImpl.java b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/service/impl/ReceiptServiceImpl.java
index e2303cf9c..645d02847 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/service/impl/ReceiptServiceImpl.java
+++ b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/service/impl/ReceiptServiceImpl.java
@@ -177,6 +177,8 @@ public class ReceiptServiceImpl extends BaseServiceImpl<ReceiptMapper, ZbReceipt
 				advanceDetailEntity.setSystemType("线上");
 				advanceDetailEntity.setFirstPackName(orderPackageDTO.getPackageTypeName());
 				advanceDetailEntity.setFirstPackCode(orderPackageDTO.getPackageType());
+				advanceDetailEntity.setSecondPackName(orderPackageDTO.getPackageTypeName());//二级品类名称
+				advanceDetailEntity.setThirdPackName(orderPackageDTO.getPackageTypeName());//三级品类名称
 				// 获取映射志邦映射品类信息
 				ZbCategoryContrastEntity zbCategoryContrastEntity = buildZbCategoryContrastEntityCache(orderPackageDTO.getPackageClass());
 				if (zbCategoryContrastEntity != null) {
@@ -185,10 +187,10 @@ public class ReceiptServiceImpl extends BaseServiceImpl<ReceiptMapper, ZbReceipt
 					advanceDetailEntity.setThirdPackName(zbCategoryContrastEntity.getThirdName());//三级品类名称
 					advanceDetailEntity.setThirdPackCode(zbCategoryContrastEntity.getThirdCode());//三级品类
 				} else {
-					advanceDetailEntity.setSecondPackName(StringUtil.isBlank(orderPackageDTO.getPackageClass()) ? "" : orderPackageDTO.getPackageClass());//二级品类名称
-					advanceDetailEntity.setSecondPackCode("");//二级品类
-					advanceDetailEntity.setThirdPackName(StringUtil.isBlank(orderPackageDTO.getPackageClass()) ? "" : orderPackageDTO.getPackageClass());//三级品类名称
-					advanceDetailEntity.setThirdPackCode("");//三级品类
+					// advanceDetailEntity.setSecondPackName(StringUtil.isBlank(orderPackageDTO.getPackageClass()) ? "" : orderPackageDTO.getPackageClass());//二级品类名称
+					// advanceDetailEntity.setSecondPackCode("");//二级品类
+					// advanceDetailEntity.setThirdPackName(StringUtil.isBlank(orderPackageDTO.getPackageClass()) ? "" : orderPackageDTO.getPackageClass());//三级品类名称
+					// advanceDetailEntity.setThirdPackCode("");//三级品类
 				}
 				advanceDetailEntity.setSiteName("");
 				advanceDetailEntity.setSiteCode("");
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java
index 911653321..8ddb08ed9 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java
@@ -437,7 +437,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 				// 三级品类名称
 				advanceDetailEntity.setThirdPackName(StringUtil.isBlank(panPackageInfo.getThirdPackName()) ? "" : panPackageInfo.getThirdPackName());
 				advanceDetailEntity.setThirdPackCode(StringUtil.isBlank(panPackageInfo.getThirdPackCode()) ? "" : panPackageInfo.getThirdPackCode());
-				advanceDetailEntity.setMaterialName(StringUtil.isBlank(panPackageInfo.getFirstPackName()) ? "" : panPackageInfo.getFirstPackName());
+				// advanceDetailEntity.setMaterialName(StringUtil.isBlank(panPackageInfo.getFirstPackName()) ? "" : panPackageInfo.getFirstPackName());
 				advanceDetailEntity.setSiteName(PanFactoryEnum.getMes(panPackageInfo.getPlantId()));
 				advanceDetailEntity.setSiteCode("");
 				// advanceDetailEntity.setQuantity(Objects.isNull(panPackageInfo.getProductNum()) ? 1 : panPackageInfo.getProductNum());
@@ -709,9 +709,9 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 				advanceDetailEntity.setFirstPackCode("");
 				advanceDetailEntity.setSecondPackName(mtPackageInfo.getColor());//二级品类名称
 				advanceDetailEntity.setSecondPackCode("");//二级品类
-				advanceDetailEntity.setThirdPackName(mtPackageInfo.getBigType());//三级品类名称
+				advanceDetailEntity.setThirdPackName(mtPackageInfo.getColor());//三级品类名称
 				advanceDetailEntity.setThirdPackCode("");//三级品类
-				advanceDetailEntity.setMaterialName(mtPackageInfo.getBigType());
+				// advanceDetailEntity.setMaterialName(mtPackageInfo.getBigType());
 				advanceDetailEntity.setSiteName("");
 				advanceDetailEntity.setSiteCode("");
 				String planQty = "1";
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java
index 86c39a138..b889867ff 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java
@@ -521,7 +521,7 @@ public class FactoryXxlJob {
 						// 三级品类名称
 						advanceDetailEntity.setThirdPackName(PackagesTypeEnum.getMes(gpd.getLx()));
 						advanceDetailEntity.setThirdPackCode(gpd.getLx());
-						advanceDetailEntity.setMaterialName(PackagesTypeEnum.getMes(gpd.getLx()));
+						// advanceDetailEntity.setMaterialName(PackagesTypeEnum.getMes(gpd.getLx()));
 						advanceDetailEntity.setSiteName(siteName);
 						advanceDetailEntity.setSiteCode("");
 						advanceDetailEntity.setQuantity(1);