From f9450eefd3b3248867b660b47a61c2ddb20a3255 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A3=AE=E5=B1=BF=E6=B5=B7=E5=B7=B7?= <15711450175@163.com>
Date: Fri, 10 Sep 2021 16:55:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E5=AE=8C=E6=88=90=20=20=20?=
 =?UTF-8?q?=20=E6=89=80=E6=9C=89=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/BaseLocationInfoController.java          | 10 +++++++++-
 .../src/main/resources/static/ruoyi/js/ry-ui.js    | 14 ++++++++++++++
 .../templates/system/baselocationinfo/add.html     |  7 ++++++-
 .../system/baselocationinfo/baselocationinfo.html  |  5 ++++-
 .../framework/web/service/PermissionService.java   |  2 +-
 .../system/mapper/BaseLocationInfoMapper.java      |  8 ++++++++
 .../system/service/IBaseLocationInfoService.java   |  3 +++
 .../impl/BaseEfficiencyLevelServiceImpl.java       |  4 +++-
 .../service/impl/BaseLocationInfoServiceImpl.java  |  4 +++-
 .../mapper/system/BaseEfficiencyLevelMapper.xml    |  2 ++
 .../mapper/system/BaseLocationInfoMapper.xml       |  8 ++++++--
 11 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseLocationInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseLocationInfoController.java
index 9804381..842e703 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseLocationInfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseLocationInfoController.java
@@ -2,6 +2,8 @@ package com.ruoyi.web.controller.basic;
 
 import java.util.List;
 
+import com.ruoyi.system.domain.BaseEfficiencyLevel;
+import com.ruoyi.system.service.IBaseEfficiencyLevelService;
 import com.ruoyi.web.controller.tool.UUIDTool;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +38,9 @@ public class BaseLocationInfoController extends BaseController
     @Autowired
     private IBaseLocationInfoService baseLocationInfoService;
 
+    @Autowired
+    private IBaseEfficiencyLevelService baseEfficiencyLevelService;
+
     @RequiresPermissions("system:baselocationinfo:view")
     @GetMapping()
     public String baselocationinfo()
@@ -74,8 +79,11 @@ public class BaseLocationInfoController extends BaseController
      * 新增库位信息
      */
     @GetMapping("/add")
-    public String add()
+    public String add(ModelMap modelMap)
     {
+        BaseEfficiencyLevel baseEfficiencyLevel = new BaseEfficiencyLevel();
+        List<BaseEfficiencyLevel> baseEfficiencyLevels = baseEfficiencyLevelService.selectBaseEfficiencyLevelList(baseEfficiencyLevel);
+        modelMap.put("baseEfficiencyLevels",baseEfficiencyLevels);
         return prefix + "/add";
     }
 
diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
index 90b4f5d..2250685 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
@@ -537,6 +537,20 @@ var table = {
                 });
                 return actions.join('');
             },
+            selectDictLabelss: function(datas, value) {
+                if ($.common.isEmpty(datas) || $.common.isEmpty(value)) {
+                    return '';
+                }
+                var actions = [];
+                $.each(datas, function(index, dict) {
+                    if (dict.dictValue == ('' + value)) {
+                        var listClass = $.common.equals("default", dict.listClass) || $.common.isEmpty(dict.listClass) ? "" : "badge badge-" + dict.listClass;
+                        actions.push($.common.sprintf("<span class='%s'>%s</span>", listClass, dict.dictLabel));
+                        return false;
+                    }
+                });
+                return actions.join('');
+            },
             // 回显数据字典（字符串数组）
             selectDictLabels: function(datas, value, separator) {
                 if ($.common.isEmpty(datas) || $.common.isEmpty(value)) {
diff --git a/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/add.html b/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/add.html
index c8ab47a..be588b9 100644
--- a/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/add.html
@@ -63,10 +63,15 @@
                     </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">
+                    <!--<input name="efficiency" class="form-control" type="text">-->
+                    <select name="efficiency" id="efficiency" class="form-control m-b" required>
+                        <option th:each="baseEfficiencyLevels: ${baseEfficiencyLevels}" th:text="${baseEfficiencyLevels.levelName}" th:value="${baseEfficiencyLevels.efficiencyLevel}"></option>
+                    </select>
                 </div>
             </div>
             <div class="form-group">    
diff --git a/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/baselocationinfo.html b/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/baselocationinfo.html
index 9307578..592bea1 100644
--- a/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/baselocationinfo.html
+++ b/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/baselocationinfo.html
@@ -57,6 +57,8 @@
     <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";
 
@@ -112,12 +114,13 @@
                     field: 'locationStatus',
                     title: '库位状态',
                     formatter: function(value, row, index) {
-                       return $.table.selectDictLabel(locationStatusDatas, value);
+                        return $.table.selectDictLabel(locationStatusDatas, value);
                     }
                 },
                 {
                     field: 'efficiency',
                     title: '效率级别'
+
                 },
                 {
                     field: 'remark',
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
index 6441807..bda14ec 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
@@ -50,7 +50,7 @@ public class PermissionService
     }
 
     /**
-     * 验证用户是否具有以下任意一个权限，无权限返回hidden用于隐藏（如需返回Boolean使用hasAnyPermissions）
+     * 验证用户是否具有以下任意一个`权限，无权限返回hidden用于隐藏（如需返回Boolean使用hasAnyPermissions）
      *
      * @param permissions 以 PERMISSION_NAMES_DELIMETER 为分隔符的权限列表
      * @return 用户是否具有以下任意一个权限
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseLocationInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseLocationInfoMapper.java
index 08018b9..3a3f42a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseLocationInfoMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseLocationInfoMapper.java
@@ -58,4 +58,12 @@ public interface BaseLocationInfoMapper
      * @return 结果
      */
     public int deleteBaseLocationInfoByObjids(String[] objids);
+
+    /**
+     * 查询库位信息列表
+     *
+     * @param baseLocationInfo 库位信息
+     * @return 库位信息集合
+     */
+    public List<BaseLocationInfo> selectBaseLocationInfoListByTable();
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseLocationInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseLocationInfoService.java
index 1284bc0..51709cc 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseLocationInfoService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseLocationInfoService.java
@@ -27,6 +27,9 @@ public interface IBaseLocationInfoService
      */
     public List<BaseLocationInfo> selectBaseLocationInfoList(BaseLocationInfo baseLocationInfo);
 
+
+
+
     /**
      * 新增库位信息
      * 
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 27767a9..d70e71d 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
@@ -14,7 +14,7 @@ import com.ruoyi.common.core.text.Convert;
  * @author Frank zhou
  * @date 2021-09-10
  */
-@Service
+@Service("baseEfficiencyLevelService")
 public class BaseEfficiencyLevelServiceImpl implements IBaseEfficiencyLevelService 
 {
     @Autowired
@@ -44,6 +44,8 @@ public class BaseEfficiencyLevelServiceImpl implements IBaseEfficiencyLevelServi
         return baseEfficiencyLevelMapper.selectBaseEfficiencyLevelList(baseEfficiencyLevel);
     }
 
+
+
     /**
      * 新增效率级别
      * 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseLocationInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseLocationInfoServiceImpl.java
index d5d642f..1879e2e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseLocationInfoServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseLocationInfoServiceImpl.java
@@ -15,7 +15,7 @@ import com.ruoyi.common.core.text.Convert;
  * @date 2021-09-10
  */
 @Service
-public class BaseLocationInfoServiceImpl implements IBaseLocationInfoService 
+public class BaseLocationInfoServiceImpl implements IBaseLocationInfoService
 {
     @Autowired
     private BaseLocationInfoMapper baseLocationInfoMapper;
@@ -44,6 +44,8 @@ public class BaseLocationInfoServiceImpl implements IBaseLocationInfoService
         return baseLocationInfoMapper.selectBaseLocationInfoList(baseLocationInfo);
     }
 
+
+
     /**
      * 新增库位信息
      * 
diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseEfficiencyLevelMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseEfficiencyLevelMapper.xml
index 7aa564d..a471b0f 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BaseEfficiencyLevelMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BaseEfficiencyLevelMapper.xml
@@ -17,6 +17,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select objid, efficiency_level, level_name, efficiency, delete_flag, record_time from base_efficiency_level
     </sql>
 
+
+
     <select id="selectBaseEfficiencyLevelList" parameterType="BaseEfficiencyLevel" resultMap="BaseEfficiencyLevelResult">
         <include refid="selectBaseEfficiencyLevelVo"/>
         <where>  
diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseLocationInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseLocationInfoMapper.xml
index 5c7dbea..3891184 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BaseLocationInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BaseLocationInfoMapper.xml
@@ -25,6 +25,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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>  
@@ -37,9 +40,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <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