diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseEfficiencyLevelController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseEfficiencyLevelController.java
index bb6ee2c..02772cb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseEfficiencyLevelController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseEfficiencyLevelController.java
@@ -3,6 +3,8 @@ package com.ruoyi.web.controller.basic;
 import java.util.Date;
 import java.util.List;
 
+import com.ruoyi.common.utils.ShiroUtils;
+import com.ruoyi.system.domain.BaseStoreInfo;
 import com.ruoyi.web.controller.tool.UUIDTool;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +23,7 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 效率级别Controller
@@ -128,4 +131,29 @@ public class BaseEfficiencyLevelController extends BaseController
     {
         return toAjax(baseEfficiencyLevelService.deleteBaseEfficiencyLevelByObjids(ids));
     }
+
+    @RequiresPermissions("system:baseefficiencylevel:view")
+    @GetMapping("/importTemplate")
+    @ResponseBody
+    public AjaxResult importTemplate()
+    {
+        ExcelUtil<BaseEfficiencyLevel> util = new ExcelUtil<>(BaseEfficiencyLevel.class);
+        return util.importTemplateExcel("效率级别信息导入");
+    }
+
+    @Log(title = "效率级别信息导入", businessType = BusinessType.IMPORT)
+    @RequiresPermissions("system:baseefficiencylevel:import")
+    @PostMapping("/importData")
+    @ResponseBody
+    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
+    {
+
+        ExcelUtil<BaseEfficiencyLevel> util = new ExcelUtil<BaseEfficiencyLevel>(BaseEfficiencyLevel.class);
+        List<BaseEfficiencyLevel> baseEfficiencyLevels = util.importExcel(file.getInputStream());
+        String operName = ShiroUtils.getSysUser().getLoginName();
+        String message = baseEfficiencyLevelService.importData(baseEfficiencyLevels, updateSupport, operName);
+        return AjaxResult.success(message);
+
+    }
+
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseMaterialStoreController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseMaterialStoreController.java
index ae5199c..1b94382 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseMaterialStoreController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseMaterialStoreController.java
@@ -3,6 +3,8 @@ package com.ruoyi.web.controller.basic;
 import java.util.Date;
 import java.util.List;
 
+import com.ruoyi.common.utils.ShiroUtils;
+import com.ruoyi.system.domain.BaseEfficiencyLevel;
 import com.ruoyi.system.domain.BaseLocationInfo;
 import com.ruoyi.system.domain.BaseStoreInfo;
 import com.ruoyi.system.service.IBaseStoreInfoService;
@@ -25,6 +27,7 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 物料库位关系Controller
@@ -141,4 +144,28 @@ public class BaseMaterialStoreController extends BaseController
     {
         return toAjax(baseMaterialStoreService.deleteBaseMaterialStoreByObjids(ids));
     }
+
+    @RequiresPermissions("system:basematerialstore:view")
+    @GetMapping("/importTemplate")
+    @ResponseBody
+    public AjaxResult importTemplate()
+    {
+        ExcelUtil<BaseMaterialStore> util = new ExcelUtil<>(BaseMaterialStore.class);
+        return util.importTemplateExcel("物料库位关系导入");
+    }
+
+    @Log(title = "物料库位关系信息导入", businessType = BusinessType.IMPORT)
+    @RequiresPermissions("system:basematerialstore:import")
+    @PostMapping("/importData")
+    @ResponseBody
+    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
+    {
+
+        ExcelUtil<BaseMaterialStore> util = new ExcelUtil<BaseMaterialStore>(BaseMaterialStore.class);
+        List<BaseMaterialStore> baseMaterialStores = util.importExcel(file.getInputStream());
+        String operName = ShiroUtils.getSysUser().getLoginName();
+        String message = baseMaterialStoreService.importData(baseMaterialStores, updateSupport, operName);
+        return AjaxResult.success(message);
+
+    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseStoreInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseStoreInfoController.java
index c42f535..739a6d0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseStoreInfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseStoreInfoController.java
@@ -3,6 +3,8 @@ package com.ruoyi.web.controller.basic;
 import java.util.Date;
 import java.util.List;
 
+import com.ruoyi.common.utils.ShiroUtils;
+import com.ruoyi.system.domain.BaseLocationInfo;
 import com.ruoyi.web.controller.tool.UUIDTool;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +23,7 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 仓库信息Controller
@@ -128,4 +131,30 @@ public class BaseStoreInfoController extends BaseController
     {
         return toAjax(baseStoreInfoService.deleteBaseStoreInfoByObjids(ids));
     }
+
+    @RequiresPermissions("system:basestoreinfo:view")
+    @GetMapping("/importTemplate")
+    @ResponseBody
+    public AjaxResult importTemplate()
+    {
+        ExcelUtil<BaseStoreInfo> util = new ExcelUtil<>(BaseStoreInfo.class);
+        return util.importTemplateExcel("仓库信息导入");
+    }
+
+
+    @Log(title = "仓库信息导入", businessType = BusinessType.IMPORT)
+    @RequiresPermissions("system:basestoreinfo:import")
+    @PostMapping("/importData")
+    @ResponseBody
+    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
+    {
+
+        ExcelUtil<BaseStoreInfo> util = new ExcelUtil<BaseStoreInfo>(BaseStoreInfo.class);
+        List<BaseStoreInfo> baseStoreInfos = util.importExcel(file.getInputStream());
+        String operName = ShiroUtils.getSysUser().getLoginName();
+        String message = baseStoreInfoService.importData(baseStoreInfos, updateSupport, operName);
+        return AjaxResult.success(message);
+
+    }
+
 }
diff --git a/ruoyi-admin/src/main/resources/templates/system/baseefficiencylevel/baseefficiencylevel.html b/ruoyi-admin/src/main/resources/templates/system/baseefficiencylevel/baseefficiencylevel.html
index 892b4b8..cfe123d 100644
--- a/ruoyi-admin/src/main/resources/templates/system/baseefficiencylevel/baseefficiencylevel.html
+++ b/ruoyi-admin/src/main/resources/templates/system/baseefficiencylevel/baseefficiencylevel.html
@@ -37,6 +37,9 @@
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:baseefficiencylevel:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
+                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:baseefficiencylevel:import">
+                    <i class="fa fa-upload"></i> 导入
+                </a>
                 <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:baseefficiencylevel:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
@@ -59,6 +62,8 @@
                 updateUrl: prefix + "/edit/{id}",
                 removeUrl: prefix + "/remove",
                 exportUrl: prefix + "/export",
+                importTemplateUrl: prefix + "/importTemplate",
+                importUrl: prefix + "/importData",
                 modalName: "效率级别",
                 columns: [{
                     checkbox: true
@@ -98,5 +103,21 @@
             $.table.init(options);
         });
     </script>
+
+     <!-- 导入区域 -->
+     <script id="importTpl" type="text/template">
+         <form enctype="multipart/form-data" class="mt20 mb10">
+             <div class="col-xs-offset-1">
+                 <input type="file" id="file" name="file"/>
+                 <div class="mt10 pt5">
+                     <input type="checkbox" id="updateSupport" name="updateSupport" title="如果登录账户已经存在，更新这条数据。"> 是否更新已经存在的用户数据
+                     &nbsp;	<a onclick="$.table.importTemplate()" class="btn btn-default btn-xs"><i class="fa fa-file-excel-o"></i> 下载模板</a>
+                 </div>
+                 <font color="red" class="pull-left mt10">
+                     提示：仅允许导入“xls”或“xlsx”格式文件！
+                 </font>
+             </div>
+         </form>
+     </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/system/basematerialstore/basematerialstore.html b/ruoyi-admin/src/main/resources/templates/system/basematerialstore/basematerialstore.html
index 97f6965..679b99c 100644
--- a/ruoyi-admin/src/main/resources/templates/system/basematerialstore/basematerialstore.html
+++ b/ruoyi-admin/src/main/resources/templates/system/basematerialstore/basematerialstore.html
@@ -59,6 +59,9 @@
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:basematerialstore:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
+                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:basematerialstore:import">
+                    <i class="fa fa-upload"></i> 导入
+                </a>
                 <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:basematerialstore:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
@@ -83,6 +86,8 @@
                 updateUrl: prefix + "/edit/{id}",
                 removeUrl: prefix + "/remove",
                 exportUrl: prefix + "/export",
+                importTemplateUrl: prefix + "/importTemplate",
+                importUrl: prefix + "/importData",
                 modalName: "物料库位关系",
                 columns: [{
                     checkbox: true
@@ -145,5 +150,21 @@
             $.table.init(options);
         });
     </script>
+
+     <!-- 导入区域 -->
+     <script id="importTpl" type="text/template">
+         <form enctype="multipart/form-data" class="mt20 mb10">
+             <div class="col-xs-offset-1">
+                 <input type="file" id="file" name="file"/>
+                 <div class="mt10 pt5">
+                     <input type="checkbox" id="updateSupport" name="updateSupport" title="如果登录账户已经存在，更新这条数据。"> 是否更新已经存在的用户数据
+                     &nbsp;	<a onclick="$.table.importTemplate()" class="btn btn-default btn-xs"><i class="fa fa-file-excel-o"></i> 下载模板</a>
+                 </div>
+                 <font color="red" class="pull-left mt10">
+                     提示：仅允许导入“xls”或“xlsx”格式文件！
+                 </font>
+             </div>
+         </form>
+     </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/system/basestoreinfo/basestoreinfo.html b/ruoyi-admin/src/main/resources/templates/system/basestoreinfo/basestoreinfo.html
index 53f358b..7082122 100644
--- a/ruoyi-admin/src/main/resources/templates/system/basestoreinfo/basestoreinfo.html
+++ b/ruoyi-admin/src/main/resources/templates/system/basestoreinfo/basestoreinfo.html
@@ -70,6 +70,8 @@
                 updateUrl: prefix + "/edit/{id}",
                 removeUrl: prefix + "/remove",
                 exportUrl: prefix + "/export",
+                importTemplateUrl: prefix + "/importTemplate",
+                importUrl: prefix + "/importData",
                 modalName: "仓库信息",
                 columns: [{
                     checkbox: true
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseEfficiencyLevel.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseEfficiencyLevel.java
index 3f78f53..77aa731 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseEfficiencyLevel.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseEfficiencyLevel.java
@@ -37,7 +37,7 @@ public class BaseEfficiencyLevel extends BaseEntity
 
     /** 记录时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
+//    @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date recordTime;
 
     public void setObjid(String objid) 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseMaterialStore.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseMaterialStore.java
index 112c0d2..0d02143 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseMaterialStore.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseMaterialStore.java
@@ -49,7 +49,7 @@ public class BaseMaterialStore extends BaseEntity
 
     /** 记录时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
+//    @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date recordTime;
 
     public void setObjid(String objid) 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseStoreInfo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseStoreInfo.java
index 8bad346..1232336 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseStoreInfo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseStoreInfo.java
@@ -49,7 +49,7 @@ public class BaseStoreInfo extends BaseEntity
 
     /** 记录时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
+   // @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date recordTime;
 
     public void setObjid(String objid) 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseEfficiencyLevelService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseEfficiencyLevelService.java
index 0cbc1fa..8ddbe5a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseEfficiencyLevelService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseEfficiencyLevelService.java
@@ -2,6 +2,7 @@ package com.ruoyi.system.service;
 
 import java.util.List;
 import com.ruoyi.system.domain.BaseEfficiencyLevel;
+import com.ruoyi.system.domain.BaseStoreInfo;
 
 /**
  * 效率级别Service接口
@@ -58,4 +59,13 @@ public interface IBaseEfficiencyLevelService
      * @return 结果
      */
     public int deleteBaseEfficiencyLevelByObjid(String objid);
+
+    /**
+     * 导入效率级别信息数据
+     * @param baseEfficiencyLevels
+     * @param updateSupport
+     * @param operName
+     * @return
+     */
+    String importData(List<BaseEfficiencyLevel> baseEfficiencyLevels, boolean updateSupport, String operName);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseMaterialStoreService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseMaterialStoreService.java
index a957a54..41a4760 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseMaterialStoreService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseMaterialStoreService.java
@@ -66,4 +66,13 @@ public interface IBaseMaterialStoreService
      * @return 结果
      */
     public int deleteBaseMaterialStoreByObjid(String objid);
+
+    /**
+     * 导入物料库位关系数据
+     * @param baseMaterialStores
+     * @param updateSupport
+     * @param operName
+     * @return
+     */
+    String importData(List<BaseMaterialStore> baseMaterialStores, boolean updateSupport, String operName);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseStoreInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseStoreInfoService.java
index 0e1650d..098896b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseStoreInfoService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseStoreInfoService.java
@@ -1,6 +1,8 @@
 package com.ruoyi.system.service;
 
 import java.util.List;
+
+import com.ruoyi.system.domain.BaseLocationInfo;
 import com.ruoyi.system.domain.BaseStoreInfo;
 
 /**
@@ -58,4 +60,14 @@ public interface IBaseStoreInfoService
      * @return 结果
      */
     public int deleteBaseStoreInfoByObjid(String objid);
+
+
+    /**
+     * 导入仓库信息数据
+     * @param baseStoreInfos
+     * @param updateSupport
+     * @param operName
+     * @return
+     */
+    String importData(List<BaseStoreInfo> baseStoreInfos, boolean updateSupport, String operName);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseEfficiencyLevelServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseEfficiencyLevelServiceImpl.java
index d70e71d..4c6eb5b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseEfficiencyLevelServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseEfficiencyLevelServiceImpl.java
@@ -1,6 +1,14 @@
 package com.ruoyi.system.service.impl;
 
+import java.util.Date;
 import java.util.List;
+import java.util.UUID;
+
+import com.ruoyi.common.exception.BusinessException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.BaseStoreInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.BaseEfficiencyLevelMapper;
@@ -17,6 +25,8 @@ import com.ruoyi.common.core.text.Convert;
 @Service("baseEfficiencyLevelService")
 public class BaseEfficiencyLevelServiceImpl implements IBaseEfficiencyLevelService 
 {
+    private Logger log = LoggerFactory.getLogger(BaseStoreInfoServiceImpl.class);
+
     @Autowired
     private BaseEfficiencyLevelMapper baseEfficiencyLevelMapper;
 
@@ -93,4 +103,53 @@ public class BaseEfficiencyLevelServiceImpl implements IBaseEfficiencyLevelServi
     {
         return baseEfficiencyLevelMapper.deleteBaseEfficiencyLevelByObjid(objid);
     }
+
+    @Override
+    public String importData(List<BaseEfficiencyLevel> baseEfficiencyLevels, boolean updateSupport, String operName) {
+        if (StringUtils.isNull(baseEfficiencyLevels) || baseEfficiencyLevels.size() == 0) {
+            throw new BusinessException("效率级别信息不能为空");
+        }
+
+        int successNum = 0;
+        int failureNum = 0;
+        StringBuilder successMsg = new StringBuilder();
+        StringBuilder failureMsg = new StringBuilder();
+        for (BaseEfficiencyLevel baseEfficiencyLevel : baseEfficiencyLevels) {
+            try {
+
+                if (!StringUtils.isEmpty(baseEfficiencyLevel.getLevelName())) {
+                    baseEfficiencyLevel.setDeleteFlag(Long.valueOf(0));
+                    baseEfficiencyLevel.setObjid(generate());
+                    baseEfficiencyLevel.setRecordTime(new Date());
+                    this.insertBaseEfficiencyLevel(baseEfficiencyLevel);
+                    successNum++;
+                    successMsg.append("<br/>" + successNum + "、级别名称 " + baseEfficiencyLevel.getLevelName() + " 导入成功");
+                } else if (updateSupport) {
+                    baseEfficiencyLevel.setUpdateBy(operName);
+                    this.updateBaseEfficiencyLevel(baseEfficiencyLevel);
+                    successNum++;
+                    successMsg.append("<br/>" + successNum + "、级别名称 " + baseEfficiencyLevel.getLevelName() + " 更新成功");
+                } else {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、级别名称 " + baseEfficiencyLevel.getLevelName() + " 已存在");
+                }
+            } catch (Exception e) {
+                failureNum++;
+                String msg = "<br/>" + failureNum + "、级别名称 " + baseEfficiencyLevel.getLevelName() + " 导入失败：";
+                failureMsg.append(msg + e.getMessage());
+                log.error(msg, e);
+            }
+        }
+        if (failureNum > 0) {
+            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
+            throw new BusinessException(failureMsg.toString());
+        } else {
+            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+        }
+        return successMsg.toString();
+    }
+
+    public static String generate(){
+        return String.valueOf(UUID.randomUUID());
+    }
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseMaterialStoreServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseMaterialStoreServiceImpl.java
index 59ade29..397eb55 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseMaterialStoreServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseMaterialStoreServiceImpl.java
@@ -1,6 +1,14 @@
 package com.ruoyi.system.service.impl;
 
+import java.util.Date;
 import java.util.List;
+import java.util.UUID;
+
+import com.ruoyi.common.exception.BusinessException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.BaseEfficiencyLevel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.BaseMaterialStoreMapper;
@@ -17,6 +25,8 @@ import com.ruoyi.common.core.text.Convert;
 @Service
 public class BaseMaterialStoreServiceImpl implements IBaseMaterialStoreService 
 {
+    private Logger log = LoggerFactory.getLogger(BaseMaterialStoreServiceImpl.class);
+
     @Autowired
     private BaseMaterialStoreMapper baseMaterialStoreMapper;
 
@@ -96,4 +106,53 @@ public class BaseMaterialStoreServiceImpl implements IBaseMaterialStoreService
     {
         return baseMaterialStoreMapper.deleteBaseMaterialStoreByObjid(objid);
     }
+
+    @Override
+    public String importData(List<BaseMaterialStore> baseMaterialStores, boolean updateSupport, String operName) {
+        if (StringUtils.isNull(baseMaterialStores) || baseMaterialStores.size() == 0) {
+            throw new BusinessException("物料库位关系信息不能为空");
+        }
+
+        int successNum = 0;
+        int failureNum = 0;
+        StringBuilder successMsg = new StringBuilder();
+        StringBuilder failureMsg = new StringBuilder();
+        for (BaseMaterialStore baseMaterialStore : baseMaterialStores) {
+            try {
+
+                if (!StringUtils.isEmpty(baseMaterialStore.getMaterialCode())) {
+
+                    baseMaterialStore.setObjid(generate());
+                    baseMaterialStore.setRecordTime(new Date());
+                    this.insertBaseMaterialStore(baseMaterialStore);
+                    successNum++;
+                    successMsg.append("<br/>" + successNum + "、物料编码 " + baseMaterialStore.getMaterialCode() + " 导入成功");
+                } else if (updateSupport) {
+                    baseMaterialStore.setUpdateBy(operName);
+                    this.updateBaseMaterialStore(baseMaterialStore);
+                    successNum++;
+                    successMsg.append("<br/>" + successNum + "、物料编码 " + baseMaterialStore.getMaterialCode() + " 更新成功");
+                } else {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、物料编码 " + baseMaterialStore.getMaterialCode() + " 已存在");
+                }
+            } catch (Exception e) {
+                failureNum++;
+                String msg = "<br/>" + failureNum + "、物料编码 " + baseMaterialStore.getMaterialCode() + " 导入失败：";
+                failureMsg.append(msg + e.getMessage());
+                log.error(msg, e);
+            }
+        }
+        if (failureNum > 0) {
+            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
+            throw new BusinessException(failureMsg.toString());
+        } else {
+            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+        }
+        return successMsg.toString();
+    }
+
+    public static String generate(){
+        return String.valueOf(UUID.randomUUID());
+    }
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseStoreInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseStoreInfoServiceImpl.java
index 5cb76e7..9f27202 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseStoreInfoServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseStoreInfoServiceImpl.java
@@ -1,6 +1,14 @@
 package com.ruoyi.system.service.impl;
 
+import java.util.Date;
 import java.util.List;
+import java.util.UUID;
+
+import com.ruoyi.common.exception.BusinessException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.BaseLocationInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.BaseStoreInfoMapper;
@@ -17,6 +25,8 @@ import com.ruoyi.common.core.text.Convert;
 @Service("baseStoreInfoService")
 public class BaseStoreInfoServiceImpl implements IBaseStoreInfoService 
 {
+    private Logger log = LoggerFactory.getLogger(BaseStoreInfoServiceImpl.class);
+
     @Autowired
     private BaseStoreInfoMapper baseStoreInfoMapper;
 
@@ -91,4 +101,52 @@ public class BaseStoreInfoServiceImpl implements IBaseStoreInfoService
     {
         return baseStoreInfoMapper.deleteBaseStoreInfoByObjid(objid);
     }
+
+    @Override
+    public String importData(List<BaseStoreInfo> baseStoreInfos, boolean updateSupport, String operName) {
+        if (StringUtils.isNull(baseStoreInfos) || baseStoreInfos.size() == 0) {
+            throw new BusinessException("仓库信息不能为空");
+        }
+
+        int successNum = 0;
+        int failureNum = 0;
+        StringBuilder successMsg = new StringBuilder();
+        StringBuilder failureMsg = new StringBuilder();
+        for (BaseStoreInfo baseStoreInfo : baseStoreInfos) {
+            try {
+
+                if (!StringUtils.isEmpty(baseStoreInfo.getStoreCode())) {
+                    baseStoreInfo.setObjid(generate());
+                    baseStoreInfo.setRecordTime(new Date());
+                    this.insertBaseStoreInfo(baseStoreInfo);
+                    successNum++;
+                    successMsg.append("<br/>" + successNum + "、仓库编码 " + baseStoreInfo.getStoreCode() + " 导入成功");
+                } else if (updateSupport) {
+                    baseStoreInfo.setUpdateBy(operName);
+                    this.updateBaseStoreInfo(baseStoreInfo);
+                    successNum++;
+                    successMsg.append("<br/>" + successNum + "、仓库编码 " + baseStoreInfo.getStoreCode() + " 更新成功");
+                } else {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、仓库编码 " + baseStoreInfo.getStoreCode() + " 已存在");
+                }
+            } catch (Exception e) {
+                failureNum++;
+                String msg = "<br/>" + failureNum + "、仓库编码 " + baseStoreInfo.getStoreCode() + " 导入失败：";
+                failureMsg.append(msg + e.getMessage());
+                log.error(msg, e);
+            }
+        }
+        if (failureNum > 0) {
+            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
+            throw new BusinessException(failureMsg.toString());
+        } else {
+            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+        }
+        return successMsg.toString();
+    }
+
+    public static String generate(){
+        return String.valueOf(UUID.randomUUID());
+    }
 }
diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseEfficiencyLevelMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseEfficiencyLevelMapper.xml
index 1edd5ca..2397d7c 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BaseEfficiencyLevelMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BaseEfficiencyLevelMapper.xml
@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="efficiencyLevel != null "> and efficiency_level like concat(concat('%', #{efficiencyLevel}), '%')</if>
             <if test="levelName != null  and levelName != ''"> and level_name like concat(concat('%', #{levelName}), '%')</if>
-            and delete_flag = '0'
+            and delete_flag = '1'
         </where>
     </select>
     
diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseStoreInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseStoreInfoMapper.xml
index 1004503..7de4c4f 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BaseStoreInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BaseStoreInfoMapper.xml
@@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="storeCode != null  and storeCode != ''"> and store_code like concat(concat('%', #{storeCode}), '%')</if>
             <if test="storeName != null  and storeName != ''"> and store_name like concat(concat('%', #{storeName}), '%')</if>
             <if test="storeStatus != null"> and store_status = #{storeStatus} </if>
+            and delete_flag = '1'
         </where>
     </select>