物料转换添加物料编码字段

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

@@ -92,7 +92,6 @@ public class ActSuppliesConvertController extends BaseController{
     public TableDataInfo  convertSupplies(@RequestBody String[] names){
 
         List<String> name = Arrays.asList(names);
-
         List<ActOperation> list = actSuppliesConvertService.converSupplies(name);
 
         name = name.stream()
@@ -102,15 +101,13 @@ public class ActSuppliesConvertController extends BaseController{
                     }
                     for (int i = 0; i < list.size(); i++) {
                         if (str.equals(list.get(i).getDetaliesName())) {
-                            return list.get(i).getSuppliesName();
+                            return list.get(i).getEncoding();
                         }
                     }
                     return str;
                 })
                 .collect(Collectors.toList());
 
-        System.out.println(name.toString());
-
         return getDataTable(name);
 
     }

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

@@ -9,6 +9,7 @@ public class ActOperation extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     private Integer id;
+    private String encoding;
     private String suppliesName;
     private String detaliesName;
 
@@ -20,6 +21,14 @@ public class ActOperation extends BaseEntity {
         this.id = id;
     }
 
+    public String getEncoding() {
+        return encoding;
+    }
+
+    public void setEncoding(String encoding) {
+        this.encoding = encoding;
+    }
+
     public String getSuppliesName() {
         return suppliesName;
     }

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

@@ -63,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="com.ruoyi.system.domain.ActOperation" id="ActOperationResult">
         <result property="id"    column="id"    />
+        <result property="encoding" column="encoding"/>
         <result property="suppliesName"    column="supplies_name"    />
         <result property="detaliesName"    column="details_name"    />
     </resultMap>
@@ -89,7 +90,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 id , encoding, supplies_name, b.details_name from act_supplies a ,(
         SELECT sid ,details_name
         FROM act_supplies_details
         WHERE details_name IN