作业单元添加序列号、产线名字段

mes/src/main/java/com/ximai/mes/md/vo/MdItemVo.java

@@ -44,6 +44,9 @@ public class MdItemVo extends BaseEntity {
     @Excel(name = "物料/产品名称", type = Excel.Type.ALL)
     private String itemName;
 
+    @Excel(name = "所属产线", type = Excel.Type.ALL)
+    private String lineName;
+
     private String productEnglishName;
 
     @Excel(name = "规格型号", type = Excel.Type.ALL)

mes/src/main/java/com/ximai/mes/md/vo/MdWorkunitVo.java

@@ -50,6 +50,9 @@ public class MdWorkunitVo extends BaseEntity {
     @ApiModelProperty("机台顺序")
     private Integer serial;
 
+    @ApiModelProperty("所属产线")
+    private String lineName;
+
     /**
      * 工作站编码
      */

mes/src/main/resources/mapper/md/MdItemMapper.xml

@@ -117,6 +117,7 @@
                mi.item_english_name,
                mi.item_no,
                mi.message,
+               mi.line_name,
                mi.specification,
                mi.unit_of_measure,
                mi.item_or_product,

mes/src/main/resources/mapper/md/MdWorkunitMapper.xml

@@ -168,6 +168,8 @@
         ws.workstation_code,
         ws.workstation_name,
         w.fault_flag,
+        w.line_name,
+        w.serial,
         w.enable_flag,
         w.solidify_time,
         w.treating_thickness_min,
@@ -199,6 +201,7 @@
             </if>
             <if test="enableFlag != null  and enableFlag != ''">and w.enable_flag = #{enableFlag}</if>
             <if test="faultFlag != null  and faultFlag != ''">and w.fault_flag = #{faultFlag}</if>
+            <if test="lineName != null  and lineName != ''">and w.line_name = #{lineName}</if>
         </where>
     </select>
 
@@ -210,6 +213,8 @@
                w.workunit_code,
                w.workunit_name,
                w.fault_flag,
+               w.line_name,
+               w.serial,
                w.enable_flag,
                w.remark,
                w.workstation_code,