已经完成

物料库位关系表

ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseLocationInfoController.java

@@ -0,0 +1,129 @@
+package com.ruoyi.web.controller.basic;
+
+import java.util.List;
+
+import com.ruoyi.web.controller.tool.UUIDTool;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.BaseLocationInfo;
+import com.ruoyi.system.service.IBaseLocationInfoService;
+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;
+
+/**
+ * 库位信息Controller
+ * 
+ * @author Frank zhou
+ * @date 2021-09-10
+ */
+@Controller
+@RequestMapping("/system/baselocationinfo")
+public class BaseLocationInfoController extends BaseController
+{
+    private String prefix = "system/baselocationinfo";
+
+    @Autowired
+    private IBaseLocationInfoService baseLocationInfoService;
+
+    @RequiresPermissions("system:baselocationinfo:view")
+    @GetMapping()
+    public String baselocationinfo()
+    {
+        return prefix + "/baselocationinfo";
+    }
+
+    /**
+     * 查询库位信息列表
+     */
+    @RequiresPermissions("system:baselocationinfo:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(BaseLocationInfo baseLocationInfo)
+    {
+        startPage();
+        List<BaseLocationInfo> list = baseLocationInfoService.selectBaseLocationInfoList(baseLocationInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出库位信息列表
+     */
+    @RequiresPermissions("system:baselocationinfo:export")
+    @Log(title = "库位信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(BaseLocationInfo baseLocationInfo)
+    {
+        List<BaseLocationInfo> list = baseLocationInfoService.selectBaseLocationInfoList(baseLocationInfo);
+        ExcelUtil<BaseLocationInfo> util = new ExcelUtil<BaseLocationInfo>(BaseLocationInfo.class);
+        return util.exportExcel(list, "库位信息数据");
+    }
+
+    /**
+     * 新增库位信息
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存库位信息
+     */
+    @RequiresPermissions("system:baselocationinfo:add")
+    @Log(title = "库位信息", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(BaseLocationInfo baseLocationInfo)
+    {
+        baseLocationInfo.setObjid(UUIDTool.generate());
+        return toAjax(baseLocationInfoService.insertBaseLocationInfo(baseLocationInfo));
+    }
+
+    /**
+     * 修改库位信息
+     */
+    @GetMapping("/edit/{objid}")
+    public String edit(@PathVariable("objid") String objid, ModelMap mmap)
+    {
+        BaseLocationInfo baseLocationInfo = baseLocationInfoService.selectBaseLocationInfoByObjid(objid);
+        mmap.put("baseLocationInfo", baseLocationInfo);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存库位信息
+     */
+    @RequiresPermissions("system:baselocationinfo:edit")
+    @Log(title = "库位信息", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(BaseLocationInfo baseLocationInfo)
+    {
+        return toAjax(baseLocationInfoService.updateBaseLocationInfo(baseLocationInfo));
+    }
+
+    /**
+     * 删除库位信息
+     */
+    @RequiresPermissions("system:baselocationinfo:remove")
+    @Log(title = "库位信息", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(baseLocationInfoService.deleteBaseLocationInfoByObjids(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseMaterialStoreController.java

@@ -0,0 +1,129 @@
+package com.ruoyi.web.controller.basic;
+
+import java.util.List;
+
+import com.ruoyi.web.controller.tool.UUIDTool;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.BaseMaterialStore;
+import com.ruoyi.system.service.IBaseMaterialStoreService;
+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;
+
+/**
+ * 物料库位关系Controller
+ * 
+ * @author Frank zhou
+ * @date 2021-09-10
+ */
+@Controller
+@RequestMapping("/system/basematerialstore")
+public class BaseMaterialStoreController extends BaseController
+{
+    private String prefix = "system/basematerialstore";
+
+    @Autowired
+    private IBaseMaterialStoreService baseMaterialStoreService;
+
+    @RequiresPermissions("system:basematerialstore:view")
+    @GetMapping()
+    public String basematerialstore()
+    {
+        return prefix + "/basematerialstore";
+    }
+
+    /**
+     * 查询物料库位关系列表
+     */
+    @RequiresPermissions("system:basematerialstore:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(BaseMaterialStore baseMaterialStore)
+    {
+        startPage();
+        List<BaseMaterialStore> list = baseMaterialStoreService.selectBaseMaterialStoreList(baseMaterialStore);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出物料库位关系列表
+     */
+    @RequiresPermissions("system:basematerialstore:export")
+    @Log(title = "物料库位关系", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(BaseMaterialStore baseMaterialStore)
+    {
+        List<BaseMaterialStore> list = baseMaterialStoreService.selectBaseMaterialStoreList(baseMaterialStore);
+        ExcelUtil<BaseMaterialStore> util = new ExcelUtil<BaseMaterialStore>(BaseMaterialStore.class);
+        return util.exportExcel(list, "物料库位关系数据");
+    }
+
+    /**
+     * 新增物料库位关系
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存物料库位关系
+     */
+    @RequiresPermissions("system:basematerialstore:add")
+    @Log(title = "物料库位关系", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(BaseMaterialStore baseMaterialStore)
+    {
+        baseMaterialStore.setObjid(UUIDTool.generate());
+        return toAjax(baseMaterialStoreService.insertBaseMaterialStore(baseMaterialStore));
+    }
+
+    /**
+     * 修改物料库位关系
+     */
+    @GetMapping("/edit/{objid}")
+    public String edit(@PathVariable("objid") String objid, ModelMap mmap)
+    {
+        BaseMaterialStore baseMaterialStore = baseMaterialStoreService.selectBaseMaterialStoreByObjid(objid);
+        mmap.put("baseMaterialStore", baseMaterialStore);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存物料库位关系
+     */
+    @RequiresPermissions("system:basematerialstore:edit")
+    @Log(title = "物料库位关系", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(BaseMaterialStore baseMaterialStore)
+    {
+        return toAjax(baseMaterialStoreService.updateBaseMaterialStore(baseMaterialStore));
+    }
+
+    /**
+     * 删除物料库位关系
+     */
+    @RequiresPermissions("system:basematerialstore:remove")
+    @Log(title = "物料库位关系", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(baseMaterialStoreService.deleteBaseMaterialStoreByObjids(ids));
+    }
+}

ruoyi-admin/src/main/resources/templates/system/baselocationinfo/add.html

@@ -0,0 +1,110 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增库位信息')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-baselocationinfo-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">库位编号：</label>
+                <div class="col-sm-8">
+                    <input name="locationCode" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">库位名称：</label>
+                <div class="col-sm-8">
+                    <input name="locationName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">物料类别：</label>
+                <div class="col-sm-8">
+                    <input name="materialType" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">所属仓库：</label>
+                <div class="col-sm-8">
+                    <input name="storeCode" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">库位区域：</label>
+                <div class="col-sm-8">
+                    <input name="locationArea" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">所处排：</label>
+                <div class="col-sm-8">
+                    <input name="locationRow" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">所处列：</label>
+                <div class="col-sm-8">
+                    <input name="locationLine" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">所处层：</label>
+                <div class="col-sm-8">
+                    <input name="locationTier" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">库位状态：</label>
+                <div class="col-sm-8">
+                    <select name="locationStatus" class="form-control m-b" th:with="type=${@dict.getType('location_status')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">效率级别：</label>
+                <div class="col-sm-8">
+                    <input name="efficiency" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">备注：</label>
+                <div class="col-sm-8">
+                    <input name="remark" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">记录时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="recordTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/baselocationinfo"
+        $("#form-baselocationinfo-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-baselocationinfo-add').serialize());
+            }
+        }
+
+        $("input[name='recordTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/baselocationinfo/baselocationinfo.html

@@ -0,0 +1,145 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('库位信息列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>库位编号：</label>
+                                <input type="text" name="locationCode"/>
+                            </li>
+                            <li>
+                                <label>库位名称：</label>
+                                <input type="text" name="locationName"/>
+                            </li>
+                            <li>
+                                <label>库位状态：</label>
+                                <select name="locationStatus" th:with="type=${@dict.getType('location_status')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:baselocationinfo:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:baselocationinfo:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:baselocationinfo:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:baselocationinfo:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('system:baselocationinfo:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('system:baselocationinfo:remove')}]];
+        var locationStatusDatas = [[${@dict.getType('location_status')}]];
+        var prefix = ctx + "system/baselocationinfo";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "库位信息",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'objid',
+                    title: '主键',
+                    visible: false
+                },
+                {
+                    field: 'locationCode',
+                    title: '库位编号'
+                },
+                {
+                    field: 'locationName',
+                    title: '库位名称'
+                },
+                {
+                    field: 'materialType',
+                    title: '物料类别'
+                },
+                {
+                    field: 'storeCode',
+                    title: '所属仓库'
+                },
+                {
+                    field: 'locationArea',
+                    title: '库位区域'
+                },
+                {
+                    field: 'locationRow',
+                    title: '所处排'
+                },
+                {
+                    field: 'locationLine',
+                    title: '所处列'
+                },
+                {
+                    field: 'locationTier',
+                    title: '所处层'
+                },
+                {
+                    field: 'locationStatus',
+                    title: '库位状态',
+                    formatter: function(value, row, index) {
+                       return $.table.selectDictLabel(locationStatusDatas, value);
+                    }
+                },
+                {
+                    field: 'efficiency',
+                    title: '效率级别'
+                },
+                {
+                    field: 'remark',
+                    title: '备注'
+                },
+                {
+                    field: 'recordTime',
+                    title: '记录时间'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.objid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.objid + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/baselocationinfo/edit.html

@@ -0,0 +1,111 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改库位信息')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-baselocationinfo-edit" th:object="${baseLocationInfo}">
+            <input name="objid" th:field="*{objid}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">库位编号：</label>
+                <div class="col-sm-8">
+                    <input name="locationCode" th:field="*{locationCode}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">库位名称：</label>
+                <div class="col-sm-8">
+                    <input name="locationName" th:field="*{locationName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">物料类别：</label>
+                <div class="col-sm-8">
+                    <input name="materialType" th:field="*{materialType}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">所属仓库：</label>
+                <div class="col-sm-8">
+                    <input name="storeCode" th:field="*{storeCode}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">库位区域：</label>
+                <div class="col-sm-8">
+                    <input name="locationArea" th:field="*{locationArea}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">所处排：</label>
+                <div class="col-sm-8">
+                    <input name="locationRow" th:field="*{locationRow}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">所处列：</label>
+                <div class="col-sm-8">
+                    <input name="locationLine" th:field="*{locationLine}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">所处层：</label>
+                <div class="col-sm-8">
+                    <input name="locationTier" th:field="*{locationTier}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">库位状态：</label>
+                <div class="col-sm-8">
+                    <select name="locationStatus" class="form-control m-b" th:with="type=${@dict.getType('location_status')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{locationStatus}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">效率级别：</label>
+                <div class="col-sm-8">
+                    <input name="efficiency" th:field="*{efficiency}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">备注：</label>
+                <div class="col-sm-8">
+                    <input name="remark" th:field="*{remark}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">记录时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="recordTime" th:value="${#dates.format(baseLocationInfo.recordTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/baselocationinfo";
+        $("#form-baselocationinfo-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-baselocationinfo-edit').serialize());
+            }
+        }
+
+        $("input[name='recordTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/basematerialstore/add.html

@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增物料库位关系')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-basematerialstore-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">物料编码：</label>
+                <div class="col-sm-8">
+                    <input name="materialCode" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">物料类型：</label>
+                <div class="col-sm-8">
+                    <input name="materialType" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">库位编码：</label>
+                <div class="col-sm-8">
+                    <input name="locationCode" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">库位状态：</label>
+                <div class="col-sm-8">
+                    <select name="locationStatus" class="form-control m-b" th:with="type=${@dict.getType('location_status')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">库位区域：</label>
+                <div class="col-sm-8">
+                    <input name="locationArea" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">记录时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="recordTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/basematerialstore"
+        $("#form-basematerialstore-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-basematerialstore-add').serialize());
+            }
+        }
+
+        $("input[name='recordTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/basematerialstore/basematerialstore.html

@@ -0,0 +1,114 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('物料库位关系列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>物料编码：</label>
+                                <input type="text" name="materialCode"/>
+                            </li>
+                            <li>
+                                <label>物料类型：</label>
+                                <input type="text" name="materialType"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:basematerialstore:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:basematerialstore:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <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-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:basematerialstore:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('system:basematerialstore:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('system:basematerialstore:remove')}]];
+        var locationStatusDatas = [[${@dict.getType('location_status')}]];
+        var prefix = ctx + "system/basematerialstore";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "物料库位关系",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'objid',
+                    title: '主键',
+                    visible: false
+                },
+                {
+                    field: 'materialCode',
+                    title: '物料编码'
+                },
+                {
+                    field: 'materialType',
+                    title: '物料类型'
+                },
+                {
+                    field: 'locationCode',
+                    title: '库位编码'
+                },
+                {
+                    field: 'locationStatus',
+                    title: '库位状态',
+                    formatter: function(value, row, index) {
+                       return $.table.selectDictLabel(locationStatusDatas, value);
+                    }
+                },
+                {
+                    field: 'locationArea',
+                    title: '库位区域'
+                },
+                {
+                    field: 'recordTime',
+                    title: '记录时间'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.objid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.objid + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/basematerialstore/edit.html

@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改物料库位关系')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-basematerialstore-edit" th:object="${baseMaterialStore}">
+            <input name="objid" th:field="*{objid}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">物料编码：</label>
+                <div class="col-sm-8">
+                    <input name="materialCode" th:field="*{materialCode}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">物料类型：</label>
+                <div class="col-sm-8">
+                    <input name="materialType" th:field="*{materialType}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">库位编码：</label>
+                <div class="col-sm-8">
+                    <input name="locationCode" th:field="*{locationCode}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">库位状态：</label>
+                <div class="col-sm-8">
+                    <select name="locationStatus" class="form-control m-b" th:with="type=${@dict.getType('location_status')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{locationStatus}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">库位区域：</label>
+                <div class="col-sm-8">
+                    <input name="locationArea" th:field="*{locationArea}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">记录时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="recordTime" th:value="${#dates.format(baseMaterialStore.recordTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/basematerialstore";
+        $("#form-basematerialstore-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-basematerialstore-edit').serialize());
+            }
+        }
+
+        $("input[name='recordTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>

ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseLocationInfo.java

@@ -0,0 +1,208 @@
+package com.ruoyi.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 库位信息对象 base_location_info
+ * 
+ * @author Frank zhou
+ * @date 2021-09-10
+ */
+public class BaseLocationInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private String objid;
+
+    /** 库位编号 */
+    @Excel(name = "库位编号")
+    private String locationCode;
+
+    /** 库位名称 */
+    @Excel(name = "库位名称")
+    private String locationName;
+
+    /** 物料类别 */
+    @Excel(name = "物料类别")
+    private String materialType;
+
+    /** 所属仓库 */
+    @Excel(name = "所属仓库")
+    private String storeCode;
+
+    /** 库位区域 */
+    @Excel(name = "库位区域")
+    private String locationArea;
+
+    /** 所处排 */
+    @Excel(name = "所处排")
+    private Long locationRow;
+
+    /** 所处列 */
+    @Excel(name = "所处列")
+    private Long locationLine;
+
+    /** 所处层 */
+    @Excel(name = "所处层")
+    private Long locationTier;
+
+    /** 库位状态 */
+    @Excel(name = "库位状态")
+    private Long locationStatus;
+
+    /** 效率级别 */
+    @Excel(name = "效率级别")
+    private Long efficiency;
+
+    /** 删除标志 */
+    private Long deleteFlag;
+
+    /** 记录时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date recordTime;
+
+    public void setObjid(String objid) 
+    {
+        this.objid = objid;
+    }
+
+    public String getObjid() 
+    {
+        return objid;
+    }
+    public void setLocationCode(String locationCode) 
+    {
+        this.locationCode = locationCode;
+    }
+
+    public String getLocationCode() 
+    {
+        return locationCode;
+    }
+    public void setLocationName(String locationName) 
+    {
+        this.locationName = locationName;
+    }
+
+    public String getLocationName() 
+    {
+        return locationName;
+    }
+    public void setMaterialType(String materialType) 
+    {
+        this.materialType = materialType;
+    }
+
+    public String getMaterialType() 
+    {
+        return materialType;
+    }
+    public void setStoreCode(String storeCode) 
+    {
+        this.storeCode = storeCode;
+    }
+
+    public String getStoreCode() 
+    {
+        return storeCode;
+    }
+    public void setLocationArea(String locationArea) 
+    {
+        this.locationArea = locationArea;
+    }
+
+    public String getLocationArea() 
+    {
+        return locationArea;
+    }
+    public void setLocationRow(Long locationRow) 
+    {
+        this.locationRow = locationRow;
+    }
+
+    public Long getLocationRow() 
+    {
+        return locationRow;
+    }
+    public void setLocationLine(Long locationLine) 
+    {
+        this.locationLine = locationLine;
+    }
+
+    public Long getLocationLine() 
+    {
+        return locationLine;
+    }
+    public void setLocationTier(Long locationTier) 
+    {
+        this.locationTier = locationTier;
+    }
+
+    public Long getLocationTier() 
+    {
+        return locationTier;
+    }
+    public void setLocationStatus(Long locationStatus) 
+    {
+        this.locationStatus = locationStatus;
+    }
+
+    public Long getLocationStatus() 
+    {
+        return locationStatus;
+    }
+    public void setEfficiency(Long efficiency) 
+    {
+        this.efficiency = efficiency;
+    }
+
+    public Long getEfficiency() 
+    {
+        return efficiency;
+    }
+    public void setDeleteFlag(Long deleteFlag) 
+    {
+        this.deleteFlag = deleteFlag;
+    }
+
+    public Long getDeleteFlag() 
+    {
+        return deleteFlag;
+    }
+    public void setRecordTime(Date recordTime) 
+    {
+        this.recordTime = recordTime;
+    }
+
+    public Date getRecordTime() 
+    {
+        return recordTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("objid", getObjid())
+            .append("locationCode", getLocationCode())
+            .append("locationName", getLocationName())
+            .append("materialType", getMaterialType())
+            .append("storeCode", getStoreCode())
+            .append("locationArea", getLocationArea())
+            .append("locationRow", getLocationRow())
+            .append("locationLine", getLocationLine())
+            .append("locationTier", getLocationTier())
+            .append("locationStatus", getLocationStatus())
+            .append("efficiency", getEfficiency())
+            .append("remark", getRemark())
+            .append("deleteFlag", getDeleteFlag())
+            .append("recordTime", getRecordTime())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseMaterialStore.java

@@ -0,0 +1,137 @@
+package com.ruoyi.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 物料库位关系对象 base_material_store
+ * 
+ * @author Frank zhou
+ * @date 2021-09-10
+ */
+public class BaseMaterialStore extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private String objid;
+
+    /** 物料编码 */
+    @Excel(name = "物料编码")
+    private String materialCode;
+
+    /** 物料类型 */
+    @Excel(name = "物料类型")
+    private String materialType;
+
+    /** 库位编码 */
+    @Excel(name = "库位编码")
+    private String locationCode;
+
+    /** 库位状态 */
+    @Excel(name = "库位状态")
+    private Long locationStatus;
+
+    /** 库位区域 */
+    @Excel(name = "库位区域")
+    private String locationArea;
+
+    /** 删除标志 */
+    private Long deleteFlag;
+
+    /** 记录时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date recordTime;
+
+    public void setObjid(String objid) 
+    {
+        this.objid = objid;
+    }
+
+    public String getObjid() 
+    {
+        return objid;
+    }
+    public void setMaterialCode(String materialCode) 
+    {
+        this.materialCode = materialCode;
+    }
+
+    public String getMaterialCode() 
+    {
+        return materialCode;
+    }
+    public void setMaterialType(String materialType) 
+    {
+        this.materialType = materialType;
+    }
+
+    public String getMaterialType() 
+    {
+        return materialType;
+    }
+    public void setLocationCode(String locationCode) 
+    {
+        this.locationCode = locationCode;
+    }
+
+    public String getLocationCode() 
+    {
+        return locationCode;
+    }
+    public void setLocationStatus(Long locationStatus) 
+    {
+        this.locationStatus = locationStatus;
+    }
+
+    public Long getLocationStatus() 
+    {
+        return locationStatus;
+    }
+    public void setLocationArea(String locationArea) 
+    {
+        this.locationArea = locationArea;
+    }
+
+    public String getLocationArea() 
+    {
+        return locationArea;
+    }
+    public void setDeleteFlag(Long deleteFlag) 
+    {
+        this.deleteFlag = deleteFlag;
+    }
+
+    public Long getDeleteFlag() 
+    {
+        return deleteFlag;
+    }
+    public void setRecordTime(Date recordTime) 
+    {
+        this.recordTime = recordTime;
+    }
+
+    public Date getRecordTime() 
+    {
+        return recordTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("objid", getObjid())
+            .append("materialCode", getMaterialCode())
+            .append("materialType", getMaterialType())
+            .append("locationCode", getLocationCode())
+            .append("locationStatus", getLocationStatus())
+            .append("locationArea", getLocationArea())
+            .append("deleteFlag", getDeleteFlag())
+            .append("recordTime", getRecordTime())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseLocationInfoMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.BaseLocationInfo;
+
+/**
+ * 库位信息Mapper接口
+ * 
+ * @author Frank zhou
+ * @date 2021-09-10
+ */
+public interface BaseLocationInfoMapper 
+{
+    /**
+     * 查询库位信息
+     * 
+     * @param objid 库位信息主键
+     * @return 库位信息
+     */
+    public BaseLocationInfo selectBaseLocationInfoByObjid(String objid);
+
+    /**
+     * 查询库位信息列表
+     * 
+     * @param baseLocationInfo 库位信息
+     * @return 库位信息集合
+     */
+    public List<BaseLocationInfo> selectBaseLocationInfoList(BaseLocationInfo baseLocationInfo);
+
+    /**
+     * 新增库位信息
+     * 
+     * @param baseLocationInfo 库位信息
+     * @return 结果
+     */
+    public int insertBaseLocationInfo(BaseLocationInfo baseLocationInfo);
+
+    /**
+     * 修改库位信息
+     * 
+     * @param baseLocationInfo 库位信息
+     * @return 结果
+     */
+    public int updateBaseLocationInfo(BaseLocationInfo baseLocationInfo);
+
+    /**
+     * 删除库位信息
+     * 
+     * @param objid 库位信息主键
+     * @return 结果
+     */
+    public int deleteBaseLocationInfoByObjid(String objid);
+
+    /**
+     * 批量删除库位信息
+     * 
+     * @param objids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteBaseLocationInfoByObjids(String[] objids);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseMaterialStoreMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.BaseMaterialStore;
+
+/**
+ * 物料库位关系Mapper接口
+ * 
+ * @author Frank zhou
+ * @date 2021-09-10
+ */
+public interface BaseMaterialStoreMapper 
+{
+    /**
+     * 查询物料库位关系
+     * 
+     * @param objid 物料库位关系主键
+     * @return 物料库位关系
+     */
+    public BaseMaterialStore selectBaseMaterialStoreByObjid(String objid);
+
+    /**
+     * 查询物料库位关系列表
+     * 
+     * @param baseMaterialStore 物料库位关系
+     * @return 物料库位关系集合
+     */
+    public List<BaseMaterialStore> selectBaseMaterialStoreList(BaseMaterialStore baseMaterialStore);
+
+    /**
+     * 新增物料库位关系
+     * 
+     * @param baseMaterialStore 物料库位关系
+     * @return 结果
+     */
+    public int insertBaseMaterialStore(BaseMaterialStore baseMaterialStore);
+
+    /**
+     * 修改物料库位关系
+     * 
+     * @param baseMaterialStore 物料库位关系
+     * @return 结果
+     */
+    public int updateBaseMaterialStore(BaseMaterialStore baseMaterialStore);
+
+    /**
+     * 删除物料库位关系
+     * 
+     * @param objid 物料库位关系主键
+     * @return 结果
+     */
+    public int deleteBaseMaterialStoreByObjid(String objid);
+
+    /**
+     * 批量删除物料库位关系
+     * 
+     * @param objids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteBaseMaterialStoreByObjids(String[] objids);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseLocationInfoService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.BaseLocationInfo;
+
+/**
+ * 库位信息Service接口
+ * 
+ * @author Frank zhou
+ * @date 2021-09-10
+ */
+public interface IBaseLocationInfoService 
+{
+    /**
+     * 查询库位信息
+     * 
+     * @param objid 库位信息主键
+     * @return 库位信息
+     */
+    public BaseLocationInfo selectBaseLocationInfoByObjid(String objid);
+
+    /**
+     * 查询库位信息列表
+     * 
+     * @param baseLocationInfo 库位信息
+     * @return 库位信息集合
+     */
+    public List<BaseLocationInfo> selectBaseLocationInfoList(BaseLocationInfo baseLocationInfo);
+
+    /**
+     * 新增库位信息
+     * 
+     * @param baseLocationInfo 库位信息
+     * @return 结果
+     */
+    public int insertBaseLocationInfo(BaseLocationInfo baseLocationInfo);
+
+    /**
+     * 修改库位信息
+     * 
+     * @param baseLocationInfo 库位信息
+     * @return 结果
+     */
+    public int updateBaseLocationInfo(BaseLocationInfo baseLocationInfo);
+
+    /**
+     * 批量删除库位信息
+     * 
+     * @param objids 需要删除的库位信息主键集合
+     * @return 结果
+     */
+    public int deleteBaseLocationInfoByObjids(String objids);
+
+    /**
+     * 删除库位信息信息
+     * 
+     * @param objid 库位信息主键
+     * @return 结果
+     */
+    public int deleteBaseLocationInfoByObjid(String objid);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseMaterialStoreService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.BaseMaterialStore;
+
+/**
+ * 物料库位关系Service接口
+ * 
+ * @author Frank zhou
+ * @date 2021-09-10
+ */
+public interface IBaseMaterialStoreService 
+{
+    /**
+     * 查询物料库位关系
+     * 
+     * @param objid 物料库位关系主键
+     * @return 物料库位关系
+     */
+    public BaseMaterialStore selectBaseMaterialStoreByObjid(String objid);
+
+    /**
+     * 查询物料库位关系列表
+     * 
+     * @param baseMaterialStore 物料库位关系
+     * @return 物料库位关系集合
+     */
+    public List<BaseMaterialStore> selectBaseMaterialStoreList(BaseMaterialStore baseMaterialStore);
+
+    /**
+     * 新增物料库位关系
+     * 
+     * @param baseMaterialStore 物料库位关系
+     * @return 结果
+     */
+    public int insertBaseMaterialStore(BaseMaterialStore baseMaterialStore);
+
+    /**
+     * 修改物料库位关系
+     * 
+     * @param baseMaterialStore 物料库位关系
+     * @return 结果
+     */
+    public int updateBaseMaterialStore(BaseMaterialStore baseMaterialStore);
+
+    /**
+     * 批量删除物料库位关系
+     * 
+     * @param objids 需要删除的物料库位关系主键集合
+     * @return 结果
+     */
+    public int deleteBaseMaterialStoreByObjids(String objids);
+
+    /**
+     * 删除物料库位关系信息
+     * 
+     * @param objid 物料库位关系主键
+     * @return 结果
+     */
+    public int deleteBaseMaterialStoreByObjid(String objid);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseLocationInfoServiceImpl.java

@@ -0,0 +1,94 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.BaseLocationInfoMapper;
+import com.ruoyi.system.domain.BaseLocationInfo;
+import com.ruoyi.system.service.IBaseLocationInfoService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 库位信息Service业务层处理
+ * 
+ * @author Frank zhou
+ * @date 2021-09-10
+ */
+@Service
+public class BaseLocationInfoServiceImpl implements IBaseLocationInfoService 
+{
+    @Autowired
+    private BaseLocationInfoMapper baseLocationInfoMapper;
+
+    /**
+     * 查询库位信息
+     * 
+     * @param objid 库位信息主键
+     * @return 库位信息
+     */
+    @Override
+    public BaseLocationInfo selectBaseLocationInfoByObjid(String objid)
+    {
+        return baseLocationInfoMapper.selectBaseLocationInfoByObjid(objid);
+    }
+
+    /**
+     * 查询库位信息列表
+     * 
+     * @param baseLocationInfo 库位信息
+     * @return 库位信息
+     */
+    @Override
+    public List<BaseLocationInfo> selectBaseLocationInfoList(BaseLocationInfo baseLocationInfo)
+    {
+        return baseLocationInfoMapper.selectBaseLocationInfoList(baseLocationInfo);
+    }
+
+    /**
+     * 新增库位信息
+     * 
+     * @param baseLocationInfo 库位信息
+     * @return 结果
+     */
+    @Override
+    public int insertBaseLocationInfo(BaseLocationInfo baseLocationInfo)
+    {
+        return baseLocationInfoMapper.insertBaseLocationInfo(baseLocationInfo);
+    }
+
+    /**
+     * 修改库位信息
+     * 
+     * @param baseLocationInfo 库位信息
+     * @return 结果
+     */
+    @Override
+    public int updateBaseLocationInfo(BaseLocationInfo baseLocationInfo)
+    {
+        return baseLocationInfoMapper.updateBaseLocationInfo(baseLocationInfo);
+    }
+
+    /**
+     * 批量删除库位信息
+     * 
+     * @param objids 需要删除的库位信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBaseLocationInfoByObjids(String objids)
+    {
+        return baseLocationInfoMapper.deleteBaseLocationInfoByObjids(Convert.toStrArray(objids));
+    }
+
+    /**
+     * 删除库位信息信息
+     * 
+     * @param objid 库位信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBaseLocationInfoByObjid(String objid)
+    {
+        return baseLocationInfoMapper.deleteBaseLocationInfoByObjid(objid);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseMaterialStoreServiceImpl.java

@@ -0,0 +1,94 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.BaseMaterialStoreMapper;
+import com.ruoyi.system.domain.BaseMaterialStore;
+import com.ruoyi.system.service.IBaseMaterialStoreService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 物料库位关系Service业务层处理
+ * 
+ * @author Frank zhou
+ * @date 2021-09-10
+ */
+@Service
+public class BaseMaterialStoreServiceImpl implements IBaseMaterialStoreService 
+{
+    @Autowired
+    private BaseMaterialStoreMapper baseMaterialStoreMapper;
+
+    /**
+     * 查询物料库位关系
+     * 
+     * @param objid 物料库位关系主键
+     * @return 物料库位关系
+     */
+    @Override
+    public BaseMaterialStore selectBaseMaterialStoreByObjid(String objid)
+    {
+        return baseMaterialStoreMapper.selectBaseMaterialStoreByObjid(objid);
+    }
+
+    /**
+     * 查询物料库位关系列表
+     * 
+     * @param baseMaterialStore 物料库位关系
+     * @return 物料库位关系
+     */
+    @Override
+    public List<BaseMaterialStore> selectBaseMaterialStoreList(BaseMaterialStore baseMaterialStore)
+    {
+        return baseMaterialStoreMapper.selectBaseMaterialStoreList(baseMaterialStore);
+    }
+
+    /**
+     * 新增物料库位关系
+     * 
+     * @param baseMaterialStore 物料库位关系
+     * @return 结果
+     */
+    @Override
+    public int insertBaseMaterialStore(BaseMaterialStore baseMaterialStore)
+    {
+        return baseMaterialStoreMapper.insertBaseMaterialStore(baseMaterialStore);
+    }
+
+    /**
+     * 修改物料库位关系
+     * 
+     * @param baseMaterialStore 物料库位关系
+     * @return 结果
+     */
+    @Override
+    public int updateBaseMaterialStore(BaseMaterialStore baseMaterialStore)
+    {
+        return baseMaterialStoreMapper.updateBaseMaterialStore(baseMaterialStore);
+    }
+
+    /**
+     * 批量删除物料库位关系
+     * 
+     * @param objids 需要删除的物料库位关系主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBaseMaterialStoreByObjids(String objids)
+    {
+        return baseMaterialStoreMapper.deleteBaseMaterialStoreByObjids(Convert.toStrArray(objids));
+    }
+
+    /**
+     * 删除物料库位关系信息
+     * 
+     * @param objid 物料库位关系主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBaseMaterialStoreByObjid(String objid)
+    {
+        return baseMaterialStoreMapper.deleteBaseMaterialStoreByObjid(objid);
+    }
+}

ruoyi-system/src/main/resources/mapper/system/BaseLocationInfoMapper.xml

@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.BaseLocationInfoMapper">
+    
+    <resultMap type="BaseLocationInfo" id="BaseLocationInfoResult">
+        <result property="objid"    column="objid"    />
+        <result property="locationCode"    column="location_code"    />
+        <result property="locationName"    column="location_name"    />
+        <result property="materialType"    column="material_type"    />
+        <result property="storeCode"    column="store_code"    />
+        <result property="locationArea"    column="location_area"    />
+        <result property="locationRow"    column="location_row"    />
+        <result property="locationLine"    column="location_line"    />
+        <result property="locationTier"    column="location_tier"    />
+        <result property="locationStatus"    column="location_status"    />
+        <result property="efficiency"    column="efficiency"    />
+        <result property="remark"    column="remark"    />
+        <result property="deleteFlag"    column="delete_flag"    />
+        <result property="recordTime"    column="record_time"    />
+    </resultMap>
+
+    <sql id="selectBaseLocationInfoVo">
+        select objid, location_code, location_name, material_type, store_code, location_area, location_row, location_line, location_tier, location_status, efficiency, remark, delete_flag, record_time from base_location_info
+    </sql>
+
+    <select id="selectBaseLocationInfoList" parameterType="BaseLocationInfo" resultMap="BaseLocationInfoResult">
+        <include refid="selectBaseLocationInfoVo"/>
+        <where>  
+            <if test="locationCode != null  and locationCode != ''"> and location_code like concat(concat('%', #{locationCode}), '%')</if>
+            <if test="locationName != null  and locationName != ''"> and location_name like concat(concat('%', #{locationName}), '%')</if>
+            <if test="locationStatus != null "> and location_status = #{locationStatus}</if>
+             and delete_flag = '0'
+        </where>
+    </select>
+    
+    <select id="selectBaseLocationInfoByObjid" parameterType="String" resultMap="BaseLocationInfoResult">
+        <include refid="selectBaseLocationInfoVo"/>
+        where objid = #{objid}
+    </select>
+        
+    <insert id="insertBaseLocationInfo" parameterType="BaseLocationInfo">
+        <!--<selectKey keyProperty="objid" resultType="long" order="BEFORE">
+            SELECT seq_base_location_info.NEXTVAL as objid FROM DUAL
+        </selectKey>-->
+        insert into base_location_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="objid != null">objid,</if>
+            <if test="locationCode != null">location_code,</if>
+            <if test="locationName != null">location_name,</if>
+            <if test="materialType != null">material_type,</if>
+            <if test="storeCode != null">store_code,</if>
+            <if test="locationArea != null">location_area,</if>
+            <if test="locationRow != null">location_row,</if>
+            <if test="locationLine != null">location_line,</if>
+            <if test="locationTier != null">location_tier,</if>
+            <if test="locationStatus != null">location_status,</if>
+            <if test="efficiency != null">efficiency,</if>
+            <if test="remark != null">remark,</if>
+            <if test="deleteFlag != null">delete_flag,</if>
+            <if test="recordTime != null">record_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="objid != null">#{objid},</if>
+            <if test="locationCode != null">#{locationCode},</if>
+            <if test="locationName != null">#{locationName},</if>
+            <if test="materialType != null">#{materialType},</if>
+            <if test="storeCode != null">#{storeCode},</if>
+            <if test="locationArea != null">#{locationArea},</if>
+            <if test="locationRow != null">#{locationRow},</if>
+            <if test="locationLine != null">#{locationLine},</if>
+            <if test="locationTier != null">#{locationTier},</if>
+            <if test="locationStatus != null">#{locationStatus},</if>
+            <if test="efficiency != null">#{efficiency},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="deleteFlag != null">#{deleteFlag},</if>
+            <if test="recordTime != null">#{recordTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBaseLocationInfo" parameterType="BaseLocationInfo">
+        update base_location_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="locationCode != null">location_code = #{locationCode},</if>
+            <if test="locationName != null">location_name = #{locationName},</if>
+            <if test="materialType != null">material_type = #{materialType},</if>
+            <if test="storeCode != null">store_code = #{storeCode},</if>
+            <if test="locationArea != null">location_area = #{locationArea},</if>
+            <if test="locationRow != null">location_row = #{locationRow},</if>
+            <if test="locationLine != null">location_line = #{locationLine},</if>
+            <if test="locationTier != null">location_tier = #{locationTier},</if>
+            <if test="locationStatus != null">location_status = #{locationStatus},</if>
+            <if test="efficiency != null">efficiency = #{efficiency},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="deleteFlag != null">delete_flag = #{deleteFlag},</if>
+            <if test="recordTime != null">record_time = #{recordTime},</if>
+        </trim>
+        where objid = #{objid}
+    </update>
+
+    <delete id="deleteBaseLocationInfoByObjid" parameterType="String">
+        delete from base_location_info where objid = #{objid}
+    </delete>
+
+    <delete id="deleteBaseLocationInfoByObjids" parameterType="String">
+        update base_location_info set delete_flag = '1'
+            where objid in
+        <foreach item="objid" collection="array" open="(" separator="," close=")">
+            #{objid}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/BaseMaterialStoreMapper.xml

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.BaseMaterialStoreMapper">
+    
+    <resultMap type="BaseMaterialStore" id="BaseMaterialStoreResult">
+        <result property="objid"    column="objid"    />
+        <result property="materialCode"    column="material_code"    />
+        <result property="materialType"    column="material_type"    />
+        <result property="locationCode"    column="location_code"    />
+        <result property="locationStatus"    column="location_status"    />
+        <result property="locationArea"    column="location_area"    />
+        <result property="deleteFlag"    column="delete_flag"    />
+        <result property="recordTime"    column="record_time"    />
+    </resultMap>
+
+    <sql id="selectBaseMaterialStoreVo">
+        select objid, material_code, material_type, location_code, location_status, location_area, delete_flag, record_time from base_material_store
+    </sql>
+
+    <select id="selectBaseMaterialStoreList" parameterType="BaseMaterialStore" resultMap="BaseMaterialStoreResult">
+        <include refid="selectBaseMaterialStoreVo"/>
+        <where>  
+            <if test="materialCode != null  and materialCode != ''"> and material_code like concat(concat('%', #{materialCode}), '%')</if>
+            <if test="materialType != null  and materialType != ''"> and material_type like concat(concat('%', #{materialType}), '%')</if>
+            and delete_flag = '0'
+        </where>
+    </select>
+    
+    <select id="selectBaseMaterialStoreByObjid" parameterType="String" resultMap="BaseMaterialStoreResult">
+        <include refid="selectBaseMaterialStoreVo"/>
+        where objid = #{objid}
+    </select>
+        
+    <insert id="insertBaseMaterialStore" parameterType="BaseMaterialStore">
+        <!--<selectKey keyProperty="objid" resultType="long" order="BEFORE">
+            SELECT seq_base_material_store.NEXTVAL as objid FROM DUAL
+        </selectKey>-->
+        insert into base_material_store
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="objid != null">objid,</if>
+            <if test="materialCode != null">material_code,</if>
+            <if test="materialType != null">material_type,</if>
+            <if test="locationCode != null">location_code,</if>
+            <if test="locationStatus != null">location_status,</if>
+            <if test="locationArea != null">location_area,</if>
+            <if test="deleteFlag != null">delete_flag,</if>
+            <if test="recordTime != null">record_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="objid != null">#{objid},</if>
+            <if test="materialCode != null">#{materialCode},</if>
+            <if test="materialType != null">#{materialType},</if>
+            <if test="locationCode != null">#{locationCode},</if>
+            <if test="locationStatus != null">#{locationStatus},</if>
+            <if test="locationArea != null">#{locationArea},</if>
+            <if test="deleteFlag != null">#{deleteFlag},</if>
+            <if test="recordTime != null">#{recordTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBaseMaterialStore" parameterType="BaseMaterialStore">
+        update base_material_store
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="materialCode != null">material_code = #{materialCode},</if>
+            <if test="materialType != null">material_type = #{materialType},</if>
+            <if test="locationCode != null">location_code = #{locationCode},</if>
+            <if test="locationStatus != null">location_status = #{locationStatus},</if>
+            <if test="locationArea != null">location_area = #{locationArea},</if>
+            <if test="deleteFlag != null">delete_flag = #{deleteFlag},</if>
+            <if test="recordTime != null">record_time = #{recordTime},</if>
+        </trim>
+        where objid = #{objid}
+    </update>
+
+    <delete id="deleteBaseMaterialStoreByObjid" parameterType="String">
+        delete from base_material_store where objid = #{objid}
+    </delete>
+
+    <delete id="deleteBaseMaterialStoreByObjids" parameterType="String">
+        update base_material_store set DELETE_FLAG =  '1'
+            where objid in
+        <foreach item="objid" collection="array" open="(" separator="," close=")">
+            #{objid}
+        </foreach>
+    </delete>
+</mapper>