辅材导入模板增加“是否入师傅库存”列

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

@@ -22,6 +22,7 @@ import com.gree.mall.manager.logic.common.SysDictCompanyLogic;
 import com.gree.mall.manager.logic.goods.GoodsCategoryLogic;
 import com.gree.mall.manager.plus.entity.*;
 import com.gree.mall.manager.plus.service.*;
+import com.gree.mall.manager.utils.CommonUtils;
 import com.gree.mall.manager.utils.excel.ExcelUtils;
 import com.gree.mall.manager.zfire.bean.WebsitGoodsParamBean;
 import com.gree.mall.manager.zfire.util.FieldUtils;
@@ -404,6 +405,7 @@ public class WebsitGoodsLogic {
 
         for (int i = 0; i < objects.size(); i++) {
             List<Object> row = (List<Object>) objects.get(i);
+            CommonUtils.initList2(row, 11);
             if (row.size() < 7) {
                 row.add(null);
                 row.add(null);
@@ -444,6 +446,7 @@ public class WebsitGoodsLogic {
             String goodsCodeStr = (String) row.get(6);
             String specificationStr = (String) row.get(7);
             String remark = (String) row.get(8);
+            String manageWorkerStock = (String) row.get(9);
 
             if (!treeMap.containsKey(parentCategoryStr)) {
                 throw new RemoteServiceException("第" + (i+1) + "行, 大类信息不存在");
@@ -491,7 +494,12 @@ public class WebsitGoodsLogic {
             // 库存单位与销售单位一致
             goods.setGoodsStockUnit(unitStr);
             goods.setGoodsSalesUnit(unitStr);
-            goods.setManageWorkerStock(JudgeEnum.YES.getKey());
+            if (StringUtils.isBlank(manageWorkerStock) || manageWorkerStock.equals(JudgeEnum.YES.getRemark())) {
+                goods.setManageWorkerStock(JudgeEnum.YES.getKey());
+            } else {
+                goods.setManageWorkerStock(JudgeEnum.NO.getKey());
+            }
+
             goods.setNormType(NormTypeEnum.M.getKey());
 
             goodsList.add(goods);