fix:增加三方物流限制物料

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataFactoryCategoryImporter.java

@@ -94,7 +94,7 @@ public class BasicdataFactoryCategoryImporter implements ExcelImporter<Basicdata
 			String equalString = buildEqualString(allBasicdataFactoryCategoryEntity);
 			String equalString2 = buildEqualString2(datum);
 			if (equalString2.equals(equalString)) {
-				throw new ServiceException("品牌:" + datum.getBrand() + " 品类：" + datum.getCategory() + "已存在相同的配置内容");
+				throw new CustomerException("品牌:" + datum.getBrand() + " 品类：" + datum.getCategory() + "已存在相同的配置内容");
 			}
 		}
 
@@ -126,6 +126,12 @@ public class BasicdataFactoryCategoryImporter implements ExcelImporter<Basicdata
 		} else {
 			stringBuffer.append("-");
 		}
+
+		if (ObjectUtil.isNotEmpty(allBasicdataFactoryCategoryEntity.getMaterielName())) {
+			stringBuffer.append(allBasicdataFactoryCategoryEntity.getMaterielName());
+		} else {
+			stringBuffer.append("-");
+		}
 		return stringBuffer.toString();
 
 	}
@@ -155,6 +161,13 @@ public class BasicdataFactoryCategoryImporter implements ExcelImporter<Basicdata
 		} else {
 			stringBuffer.append("-");
 		}
+		if (ObjectUtil.isNotEmpty(datum.getMaterielName())) {
+			stringBuffer.append(datum.getMaterielName());
+		} else {
+			stringBuffer.append("-");
+		}
+
+
 		return stringBuffer.toString();
 
 	}