Przeglądaj źródła

化学品信息导入bug修改

xuxiaofei 2 lat temu
rodzic
commit
4eed91c7a6

+ 7 - 6
zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpChemicalServiceImpl.java

@@ -203,13 +203,13 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
 
         //计量单位
         if(StringUtils.isNotEmpty(chemical.getChemicalUnit())){
-            if(checkBox) {
-                if (chemical.getChemicalUnit().length() > 8) {
-                    chemical.getFailRemark().append("失败:");
-                    failChemicalList.add(chemical);
+            if (chemical.getChemicalUnit().length() > 8) {
+                chemical.getFailRemark().append("失败:");
+                failChemicalList.add(chemical);
+                if(checkBox) {
+                    chemical.getFailRemark().append("计量单位过长、");
                     checkBox = false;
                 }
-                chemical.getFailRemark().append("计量单位过长、");
             }
 
             //获取化学品单位集合
@@ -224,9 +224,10 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
             if(checkBox && !flgunit){
                 chemical.getFailRemark().append("失败:");
                 failChemicalList.add(chemical);
+                chemical.getFailRemark().append("字典表未配置单位、");
                 checkBox = false;
             }
-            chemical.getFailRemark().append("字典表未配置单位、");
+
             hxpChemical.setChemicalUnit(chemical.getChemicalUnit());
         }else{
             if(checkBox) {