规则详情修改，物料转换修改

ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesConvertController.java

@@ -93,27 +93,11 @@ public class ActSuppliesConvertController extends BaseController{
     @PostMapping("/converSupplies")
     public TableDataInfo  convertSupplies(@RequestBody String[] names){
 
-        List<String> name = Arrays.asList(names);
-        List<ActOperation> list = actSuppliesConvertService.converSupplies(name);
-
-        name = name.stream()
-                .map(str -> {
-                    if (str == null) {
-                        return null; // 保留原始的null值
-                    }
-                    for (int i = 0; i < list.size(); i++) {
-                        if (str.equals(list.get(i).getDetaliesName())) {
-                            return list.get(i).getSuppliesName();
-                        }
-                    }
-                    return str;
-                })
-                .collect(Collectors.toList());
-
-        return getDataTable(name);
 
-    }
+        List<String> list = actSuppliesConvertService.converSupplies(names);
 
+        return getDataTable(list);
 
+    }
 
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesRoleDetailController.java

@@ -32,7 +32,7 @@ public class ActSuppliesRoleDetailController extends BaseController
 
 
     /**
-     * 查询上级分类
+     * 查询上级分类(所有)
      * */
     @PreAuthorize("@ss.hasPermi('system:suppliesroledetail:savesid')")
     @GetMapping("/savesid")
@@ -45,6 +45,20 @@ public class ActSuppliesRoleDetailController extends BaseController
 
     }
 
+    /**
+     * 查询上级分类（未发布）
+     * */
+    @PreAuthorize("@ss.hasPermi('system:suppliesroledetail:savesidsta')")
+    @GetMapping("/savesidsta")
+    @ResponseBody
+    public TableDataInfo saveSidsta(){
+
+        List<ActSuppliesRole> options = actSuppliesRoleDetailService.saveSidsta();
+
+        return getDataTable(options);
+
+    }
+
 //    /**
 //     * 查询运算方法
 //     * */

ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActOperation.java

@@ -9,7 +9,9 @@ public class ActOperation extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     private Integer id;
-    private String encoding;
+    private String oneLevel;
+    private String twoLevel;
+    private String threeLevel;
     private String suppliesName;
     private String detaliesName;
 
@@ -21,12 +23,28 @@ public class ActOperation extends BaseEntity {
         this.id = id;
     }
 
-    public String getEncoding() {
-        return encoding;
+    public String getOneLevel() {
+        return oneLevel;
     }
 
-    public void setEncoding(String encoding) {
-        this.encoding = encoding;
+    public void setOneLevel(String oneLevel) {
+        this.oneLevel = oneLevel;
+    }
+
+    public String getTwoLevel() {
+        return twoLevel;
+    }
+
+    public void setTwoLevel(String twoLevel) {
+        this.twoLevel = twoLevel;
+    }
+
+    public String getThreeLevel() {
+        return threeLevel;
+    }
+
+    public void setThreeLevel(String threeLevel) {
+        this.threeLevel = threeLevel;
     }
 
     public String getSuppliesName() {

ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesRoleDetailMapper.java

@@ -68,5 +68,7 @@ public interface ActSuppliesRoleDetailMapper
 
     void updateRoleDetailStatus(ActSuppliesRoleDetail actSuppliesRoleDetail);
 
+    List<ActSuppliesRole> saveSidsta();
+
 //    List<ActOperation> saveOperation();
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/service/IActSuppliesConvertService.java

@@ -16,5 +16,5 @@ public interface IActSuppliesConvertService {
 
     ActSupplies selectSuppliesname(String name);
 
-    List<ActOperation> converSupplies(List<String> name);
+    List<String> converSupplies(String[] name);
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/service/IActSuppliesRoleDetailService.java

@@ -82,4 +82,7 @@ public interface IActSuppliesRoleDetailService
      * @param id  尝试禁用物料细分类管理的id
      */
     void setDisable(Long id);
+
+    List<ActSuppliesRole> saveSidsta();
+
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesConvertServiceImpl.java

@@ -7,7 +7,9 @@ import com.ruoyi.system.service.IActSuppliesConvertService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class ActSuppliesConvertServiceImpl implements IActSuppliesConvertService {
@@ -41,7 +43,26 @@ public class ActSuppliesConvertServiceImpl implements IActSuppliesConvertService
     }
 
     @Override
-    public List<ActOperation> converSupplies(List<String> name) {
-        return actSuppliesConverMapper.converSupplies(name);
+    public List<String> converSupplies(String[] names) {
+
+        List<String> name = Arrays.asList(names);
+
+        List<ActOperation> list = actSuppliesConverMapper.converSupplies(name);
+
+        name = name.stream()
+                .map(str -> {
+                    if (str == null) {
+                        return null; // 保留原始的null值
+                    }
+                    for (int i = 0; i < list.size(); i++) {
+                        if (str.equals(list.get(i).getDetaliesName())) {
+                            return list.get(i).getSuppliesName();
+                        }
+                    }
+                    return str;
+                })
+                .collect(Collectors.toList());
+
+        return name;
     }
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesRoleDetailServiceImpl.java

@@ -167,6 +167,11 @@ public class ActSuppliesRoleDetailServiceImpl implements IActSuppliesRoleDetailS
         updateStatusById(id,1);
     }
 
+    @Override
+    public List<ActSuppliesRole> saveSidsta() {
+        return actSuppliesRoleDetailMapper.saveSidsta();
+    }
+
 
     private void updateStatusById(Long id, Integer status){
         String[] statusText={"禁用","启用"};

ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesConverMapper.xml

@@ -63,6 +63,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="com.ruoyi.system.domain.ActOperation" id="ActOperationResult">
         <result property="id"    column="id"    />
+        <result property="oneLevel" column="one_level" />
+        <result property="twoLevel" column="two_level" />
+        <result property="threeLevel" column="three_level" />
         <result property="suppliesName"    column="supplies_name"    />
         <result property="detaliesName"    column="details_name"    />
     </resultMap>
@@ -89,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="converSupplies" parameterType="java.util.List" resultMap="ActOperationResult">
 
-        select id , supplies_name, b.details_name from act_supplies a ,(
+        select a.id ,a.one_level,a.two_level,a.three_level, a.supplies_name, b.details_name from act_supplies a ,(
         SELECT sid ,details_name
         FROM act_supplies_details
         WHERE details_name IN

ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesRoleDetailMapper.xml

@@ -47,9 +47,12 @@
     </sql>
 
     <select id="saveSid" parameterType="com.ruoyi.system.domain.ActSuppliesRole" resultMap="ActSuppliesRoleResult">
-        select id, temp_id, role_name from act_supplies_role where status = 1
+        select id, temp_id, role_name from act_supplies_role
     </select>
 
+    <select id="saveSidsta" parameterType="com.ruoyi.system.domain.ActSuppliesRole" resultMap="ActSuppliesRoleResult">
+        select id, temp_id, role_name from act_supplies_role where status = 1;
+    </select>
     <!--    <select id="saveOperation" parameterType="ActOperation" resultMap="ActOperationResult">-->
     <!--        select id, operation_name, status from act_operation_role where status = 0-->
     <!--    </select>-->

ruoyi-ui/src/api/system/suppliesroledetail.js

@@ -16,7 +16,13 @@ export function saveSid() {
     method: 'get'
   })
 }
-
+//查询上级ID
+export function saveSidsta() {
+    return request({
+        url: '/system/suppliesroledetail/savesidsta',
+        method: 'get'
+    })
+}
 
 export function saveOperation(){
   return request({

ruoyi-ui/src/views/system/suppliesroledetail/index.vue

@@ -187,7 +187,7 @@
                 <el-form-item label="上级规则" prop="roleId">
                     <el-select v-model="form.roleId" filterable placeholder="请选择关联项" >
                         <el-option
-                            v-for="option in options1"
+                            v-for="option in options3"
                             :key="option.roleName"
                             :label="option.roleName"
                             :value="option.id"
@@ -279,6 +279,7 @@ import {
     toggleEnable,
     toggleDisable,
     saveOperation,
+    saveSidsta,
 } from "@/api/system/suppliesroledetail";
 import Editor from '@/components/Editor';
 
@@ -424,11 +425,6 @@ export default {
             saveSid().then(response =>{
                 this.options1 = response.rows;
             })
-            // //运算规则
-            // saveOperation().then(response =>{
-            //   this.options2 = response.rows;
-            //   console.log(this.options2)
-            // })
 
         },
 
@@ -483,6 +479,12 @@ export default {
         },
         /** 新增按钮操作 */
         handleAdd() {
+
+            //上级规则
+            saveSidsta().then(response =>{
+                this.options3 = response.rows;
+            })
+
             this.instea=0;
             this.getnameid();
             this.reset();