给商品导入excel解决多属性带库存的问题

jshERP-boot/src/main/java/com/jsh/erp/constants/ExceptionConstants.java

@@ -332,6 +332,9 @@ public class ExceptionConstants {
     //型号长度超出
     public static final int MATERIAL_MODEL_OVER_CODE = 8000024;
     public static final String MATERIAL_MODEL_OVER_MSG = "第%s行型号长度超出100个字符";
+    //多属性商品不能输入库存，建议进行盘点录入
+    public static final int MATERIAL_SKU_BEGIN_STOCK_FAILED_CODE = 8000025;
+    public static final String MATERIAL_SKU_BEGIN_STOCK_FAILED_MSG = "多属性商品%s不能输入库存，建议进行盘点录入";
 
     /**
      *  单据信息

jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java

@@ -7,7 +7,6 @@ import com.jsh.erp.constants.BusinessConstants;
 import com.jsh.erp.constants.ExceptionConstants;
 import com.jsh.erp.datasource.entities.*;
 import com.jsh.erp.datasource.mappers.*;
-import com.jsh.erp.datasource.vo.MaterialExtendVo4List;
 import com.jsh.erp.datasource.vo.MaterialVoSearch;
 import com.jsh.erp.exception.BusinessRunTimeException;
 import com.jsh.erp.exception.JshException;
@@ -25,7 +24,6 @@ import jxl.Sheet;
 import jxl.Workbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.context.request.RequestContextHolder;
@@ -759,6 +757,12 @@ public class MaterialService {
                     BigDecimal stock = stockMap.get(depot.getId());
                     //新增初始库存
                     if(stock!=null && stock.compareTo(BigDecimal.ZERO)!=0) {
+                        String basicStr = materialExObj.getString("basic");
+                        MaterialExtend materialExtend = JSONObject.parseObject(basicStr, MaterialExtend.class);
+                        if(StringUtil.isNotEmpty(materialExtend.getSku())) {
+                            throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_SKU_BEGIN_STOCK_FAILED_CODE,
+                                    String.format(ExceptionConstants.MATERIAL_SKU_BEGIN_STOCK_FAILED_MSG, materialExtend.getBarCode()));
+                        }
                         if(materialDepotInitialMap.get(materialDepotKey)==null) {
                             MaterialInitialStock materialInitialStock = new MaterialInitialStock();
                             materialInitialStock.setMaterialId(mId);

jshERP-boot/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java

@@ -2,18 +2,14 @@ package com.jsh.erp.service.systemConfig;
 
 import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.constants.BusinessConstants;
-import com.jsh.erp.constants.ExceptionConstants;
-import com.jsh.erp.datasource.entities.Supplier;
 import com.jsh.erp.datasource.entities.SystemConfig;
 import com.jsh.erp.datasource.entities.SystemConfigExample;
 import com.jsh.erp.datasource.entities.User;
 import com.jsh.erp.datasource.mappers.SystemConfigMapper;
 import com.jsh.erp.datasource.mappers.SystemConfigMapperEx;
-import com.jsh.erp.exception.BusinessRunTimeException;
 import com.jsh.erp.exception.JshException;
 import com.jsh.erp.service.log.LogService;
 import com.jsh.erp.service.user.UserService;
-import com.jsh.erp.utils.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -40,8 +36,6 @@ public class SystemConfigService {
     @Resource
     private LogService logService;
 
-    private static final String TEST_USER = "jsh";
-
     public SystemConfig getSystemConfig(long id)throws Exception {
         SystemConfig result=null;
         try{