From 976e61abfb8435057e492b6e0d83b4318fa88982 Mon Sep 17 00:00:00 2001 From: 10001392 <1055202292@qq.com> Date: Tue, 3 Sep 2024 18:01:43 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=89=A9=E6=96=99=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E3=80=91=E5=88=B6=E4=BD=9C=E5=A4=A7=E7=B1=BB201001=E7=94=B5?= =?UTF-8?q?=E6=8E=A7=E6=9F=9C=E5=8F=8A=E5=99=A8=E4=BB=B6=E5=8C=85=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E6=8F=8F=E8=BF=B0=E9=80=89=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nflg/product/material/service/MaterialExcelService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialExcelService.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialExcelService.java index 2c490305..73418531 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialExcelService.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialExcelService.java @@ -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("行名称为“");