no message

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/base/NormChargeLogic.java

@@ -21,6 +21,7 @@ import com.gree.mall.manager.plus.entity.WebsitNormRela;
 import com.gree.mall.manager.plus.service.SysDictCompanyService;
 import com.gree.mall.manager.plus.service.WebsitNormChargeService;
 import com.gree.mall.manager.plus.service.WebsitNormRelaService;
+import com.gree.mall.manager.utils.CommonUtils;
 import com.gree.mall.manager.utils.excel.ExcelUtils;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
 import com.gree.mall.manager.zfire.util.FieldUtils;
@@ -248,6 +249,7 @@ public class NormChargeLogic {
 
         for (int i = 0; i < objects.size(); i++) {
             List<Object> row = (List<Object>) objects.get(i);
+            CommonUtils.initList2(row, 7);
             if (row.size() < 6) {
                 row.add(null);
                 row.add(null);
@@ -267,7 +269,7 @@ public class NormChargeLogic {
                 throw new RemoteServiceException("第" + (i+1) + "行, 小类不能为空");
             }
             if (Objects.isNull(row.get(2))) {
-                throw new RemoteServiceException("第" + (i+1) + "行, 辅材名称不能为空");
+                throw new RemoteServiceException("第" + (i+1) + "行, 收费名称不能为空");
             }
             if (Objects.isNull(row.get(3))) {
                 throw new RemoteServiceException("第" + (i+1) + "行, 单位不能为空");
@@ -275,15 +277,15 @@ public class NormChargeLogic {
             if (Objects.isNull(row.get(4))) {
                 throw new RemoteServiceException("第" + (i+1) + "行, 收费标准不能为空");
             }
-            if (Objects.isNull(row.get(5))) {
-                throw new RemoteServiceException("第" + (i+1) + "行, 自有库存师傅分账金额不能为空");
-            }
+//            if (Objects.isNull(row.get(5))) {
+//                throw new RemoteServiceException("第" + (i+1) + "行, 自有库存师傅分账金额不能为空");
+//            }
 //            if (Objects.isNull(row.get(6))) {
 //                throw new RemoteServiceException("第" + (i+1) + "行, 外购辅材师傅分账金额不能为空");
 //            }
-            if (Objects.isNull(row.get(6))) {
-                throw new RemoteServiceException("第" + (i+1) + "行, 师傅手工费用不能为空");
-            }
+//            if (Objects.isNull(row.get(6))) {
+//                throw new RemoteServiceException("第" + (i+1) + "行, 师傅手工费用不能为空");
+//            }
 
             String parentCategoryStr = (String) row.get(0);
             String categoryStr = (String) row.get(1);