From 8049b5b3cda98d602d495f6e65c5e46a5b281223 Mon Sep 17 00:00:00 2001
From: DouDou <877258667@qq.com>
Date: Wed, 12 Jun 2024 19:20:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E9=83=A8=E5=88=86=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../spring/modules/schedule/data/SoFinalRollData.java    | 9 +++++++++
 src/main/resources/mapper/schedule/ScheduleMapper.xml    | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/spring/modules/schedule/data/SoFinalRollData.java b/src/main/java/com/spring/modules/schedule/data/SoFinalRollData.java
index 5a9b29d..510145f 100644
--- a/src/main/java/com/spring/modules/schedule/data/SoFinalRollData.java
+++ b/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;
+    }
 }
diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml
index 2e1c6e4..dfc1617 100644
--- a/src/main/resources/mapper/schedule/ScheduleMapper.xml
+++ b/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>