报工部分代码提交

src/main/java/com/spring/modules/schedule/data/SoFinalRollData.java

@@ -29,6 +29,7 @@ public class SoFinalRollData extends BaseData {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date manufactureDate; //时间
+    private String rmRollNo; //材料卷号
 
     public SoFinalRollData() {
     }
@@ -112,4 +113,12 @@ public class SoFinalRollData extends BaseData {
     public void setManufactureDate(Date manufactureDate) {
         this.manufactureDate = manufactureDate;
     }
+
+    public String getRmRollNo() {
+        return rmRollNo;
+    }
+
+    public void setRmRollNo(String rmRollNo) {
+        this.rmRollNo = rmRollNo;
+    }
 }

src/main/resources/mapper/schedule/ScheduleMapper.xml

@@ -129,9 +129,9 @@
 
     <!--获取最终卷的数据-->
     <select id="getSoFinalRollsByCon" parameterType="SearchScheduleData" resultType="SoFinalRollData">
-        SELECT id, site, order_no, part_no, seq_no, final_roll_no,
+        SELECT id, site, order_no, part_no, seq_no, final_roll_no, fqc_by,
         roll_qty, status_code, status, created_by, created_date, label_date, fqc_date,
-        manufacture_date
+        rm_roll_no, manufacture_date
         FROM so_final_roll
         WHERE site = #{site} AND order_no = #{orderNo}  AND status_code <![CDATA[ >= ]]> #{statusCode}
     </select>