已经完成

所有增删改查

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";
     }
 

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)) {

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">    

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',

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 用户是否具有以下任意一个权限

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();
 }

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

@@ -27,6 +27,9 @@ public interface IBaseLocationInfoService
      */
     public List<BaseLocationInfo> selectBaseLocationInfoList(BaseLocationInfo baseLocationInfo);
 
+
+
+
     /**
      * 新增库位信息
      * 

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);
     }
 
+
+
     /**
      * 新增效率级别
      * 

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

@@ -44,6 +44,8 @@ public class BaseLocationInfoServiceImpl implements IBaseLocationInfoService
         return baseLocationInfoMapper.selectBaseLocationInfoList(baseLocationInfo);
     }
 
+
+
     /**
      * 新增库位信息
      * 

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>  

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