物料转换接口

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

@@ -10,7 +10,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 /**
  * 模板转换页面接口
@@ -83,4 +87,33 @@ public class ActSuppliesConvertController extends BaseController{
     }
 
 
+    @PreAuthorize("@ss.hasPermi('ActSuppliesConvert:ActSuppliesConvert:converSupplies')")
+    @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());
+
+        System.out.println(name.toString());
+
+        return getDataTable(name);
+
+    }
+
+
 }

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

@@ -103,6 +103,7 @@ public class ActSuppliesRoleDetailController extends BaseController
     public AjaxResult add(@RequestBody ActSuppliesRoleDetail actSuppliesRoleDetail)
     {
         return toAjax(actSuppliesRoleDetailService.insertActSuppliesRoleDetail(actSuppliesRoleDetail));
+
     }
 
     /**

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

 package com.ruoyi.system.domain;
 
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 public class ActOperation extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
     private Integer id;
-    private String OperationName;
-    private Integer status;
+    private String suppliesName;
+    private String detaliesName;
 
     public Integer getId() {
         return id;
@@ -18,19 +20,28 @@ public class ActOperation extends BaseEntity {
         this.id = id;
     }
 
-    public String getOperationName() {
-        return OperationName;
+    public String getSuppliesName() {
+        return suppliesName;
     }
 
-    public void setOperationName(String operationName) {
-        OperationName = operationName;
+    public void setSuppliesName(String operationName) {
+        suppliesName = operationName;
     }
 
-    public Integer getStatus() {
-        return status;
+    public String getDetaliesName() {
+        return detaliesName;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDetaliesName(String detaliesName) {
+        this.detaliesName = detaliesName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("suppliesName", getSuppliesName())
+                .append("detaliesName", getDetaliesName())
+                .toString();
     }
 }

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

 package com.ruoyi.system.mapper;
 
-import com.ruoyi.system.domain.ActSupplies;
-import com.ruoyi.system.domain.ActSuppliesRole;
-import com.ruoyi.system.domain.ActSuppliesRoleDetail;
-import com.ruoyi.system.domain.ActSuppliesTemplate;
+import com.ruoyi.system.domain.*;
 
 import java.util.List;
 
@@ -18,4 +15,6 @@ public interface ActSuppliesConverMapper {
     List<ActSuppliesRoleDetail> roleListid(Integer id);
 
     ActSupplies selectSuppliesname(String name);
+
+    List<ActOperation> converSupplies(List<String> name);
 }

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

@@ -15,4 +15,6 @@ public interface IActSuppliesConvertService {
     List<ActSuppliesRoleDetail> roleListid(Integer id);
 
     ActSupplies selectSuppliesname(String name);
+
+    List<ActOperation> converSupplies(List<String> name);
 }

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

@@ -39,4 +39,9 @@ public class ActSuppliesConvertServiceImpl implements IActSuppliesConvertService
     public ActSupplies selectSuppliesname(String name) {
         return actSuppliesConverMapper.selectSuppliesname(name);
     }
+
+    @Override
+    public List<ActOperation> converSupplies(List<String> name) {
+        return actSuppliesConverMapper.converSupplies(name);
+    }
 }

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

@@ -60,6 +60,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
+    <resultMap type="com.ruoyi.system.domain.ActOperation" id="ActOperationResult">
+        <result property="id"    column="id"    />
+        <result property="suppliesName"    column="supplies_name"    />
+        <result property="detaliesName"    column="details_name"    />
+    </resultMap>
+
     <select id="templiteList" parameterType="com.ruoyi.system.domain.ActSuppliesTemplate" resultMap="SuppliesTemplateResult">
         select id, det_id, template_name from act_supplies_template where status = 0
     </select>
@@ -80,6 +86,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, supplies_name from act_supplies where id=(select sid from act_supplies_details where details_name = #{name})
     </select>
 
+    <select id="converSupplies" parameterType="java.util.List" resultMap="ActOperationResult">
+
+        select id ,supplies_name, b.details_name from act_supplies a ,(
+        SELECT sid ,details_name
+        FROM act_supplies_details
+        WHERE details_name IN
+        <foreach item="name" collection="list" open="(" separator="," close=")">
+            #{name}
+        </foreach>
+        ) b where a.id = b.sid
 
+    </select>
 
 </mapper>
\ No newline at end of file

ruoyi-ui/src/api/ruoyi-myLuckyexcel/myluckyexcel.js

@@ -95,10 +95,6 @@ export function findName(name) {
 }
 
 
-
-
-
-
 // 模板转换页面查询规则对应用友物料名称
 export function getSuppliesName(name) {
   return request({