rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master-hlq-20240903' into test

This commit is contained in:
10001392 2024-09-03 18:04:25 +08:00
parent e56c44bd7c 976e61abfb
commit e3a8343f1a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialExcelService.java
View File

@ -301,7 +301,7 @@ public class MaterialExcelService {
excelEnt.setMaterialDescEn("Assembly before Shipment");
}
}
if (!"201301".equals(excelEnt.getMaterialCategoryCode()) && ObjectUtil.isEmpty(excelEnt.getMaterialDescEn())) {
if (!"201301".equals(excelEnt.getMaterialCategoryCode()) && !"201001".equals(excelEnt.getMaterialCategoryCode()) && ObjectUtil.isEmpty(excelEnt.getMaterialDescEn())) {
materialDescEnMsgBuilder.append("第");
materialDescEnMsgBuilder.append(counter);
materialDescEnMsgBuilder.append("行名称为“");