材料计量单导入

blade-service/blade-meter/src/main/java/org/springblade/meter/service/impl/MaterialMeterFormServiceImpl.java

@@ -206,15 +206,15 @@ public class MaterialMeterFormServiceImpl extends BaseServiceImpl<MaterialMeterF
                 throw new ServiceException("未检测到excel中材料计量单数据，请检查格式后后重新导入");
             }
             excels.forEach(l->{
-                if (StringUtils.isBlank(l.getMaterialConformName()) || l.getMaterialConformName().equals("否")){
-                    l.setMaterialConform(0);
-                }else {
+                if (StringUtils.isBlank(l.getMaterialConformName()) || l.getMaterialConformName().equals("是")){
                     l.setMaterialConform(1);
-                }
-                if (StringUtils.isBlank(l.getStorageConformName()) || l.getStorageConformName().equals("否")){
-                    l.setStorageConform(0);
                 }else {
+                    l.setMaterialConform(0);
+                }
+                if (StringUtils.isBlank(l.getStorageConformName()) || l.getStorageConformName().equals("是")){
                     l.setStorageConform(1);
+                }else {
+                    l.setStorageConform(0);
                 }
             });
             //复制数据