From 25bb7c487889c994f9dd65e5a107fc3b1b062f2e Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Sat, 11 Oct 2025 13:26:44 +0800
Subject: [PATCH] =?UTF-8?q?2025-10-11=20=E6=8A=A5=E5=B7=A5=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E5=88=86=E5=8D=B7=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../schedule/controller/ScheduleController.java       | 11 +----------
 .../gaotao/modules/schedule/data/ScheduleData.java    |  9 +++++++++
 src/main/resources/mapper/schedule/ScheduleMapper.xml |  3 ++-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java b/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java
index 4d97a89..6e70ec1 100644
--- a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java
+++ b/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java
@@ -710,7 +710,6 @@ public class ScheduleController extends AbstractController {
     /**
      * @author: sxm
      * @description: 获取主材
-     * @param [inData]
      * @return: com.gaotao.common.utils.R
      * @date: 2022/12/6 15:41
      */
@@ -756,7 +755,6 @@ public class ScheduleController extends AbstractController {
     /**
      * @author: sxm
      * @description: 保存主材料上机的记录数据
-     * @param [inData]
      * @return: com.gaotao.common.utils.R
      * @date: 2022/12/6 15:42
      */
@@ -1124,7 +1122,7 @@ public class ScheduleController extends AbstractController {
      * @return com.gaotao.common.utils.R
      **/
     @RequestMapping(value = "checkCreateSplitSfdcRoll")
-    @RepeatSubmit
+//    @RepeatSubmit
     public R checkCreateSplitSfdcRoll(@RequestBody SearchScheduleData inData) {
         Map<String, Object> resultMap = scheduleService.checkCreateSplitSfdcRoll(inData);
         return R.ok()
@@ -1782,7 +1780,6 @@ public class ScheduleController extends AbstractController {
     /**
      * @author: sxm
      * @description: 材料异常处理材料分局按
-     * @param [shopOrderRollDto]
      * @return: com.gaotao.common.utils.R
      * @date: 2022/11/16 17:11
      */
@@ -1795,7 +1792,6 @@ public class ScheduleController extends AbstractController {
     /**
      * @author: sxm
      * @description: 材料异常, 扫描材料
-     * @param []
      * @return: com.gaotao.common.utils.R
      * @date: 2022/11/17 13:21
      */
@@ -1820,7 +1816,6 @@ public class ScheduleController extends AbstractController {
     /**
      * @author: sxm
      * @description: 获取打印数据
-     * @param [site, orderNo, rollNos]
      * @return: com.gaotao.common.utils.R
      * @date: 2022/11/21 13:18
      */
@@ -1833,7 +1828,6 @@ public class ScheduleController extends AbstractController {
     /**
      * @author: sxm
      * @description: 获取加中心总产能
-     * @param [inData]
      * @return: com.gaotao.common.utils.R
      * @date: 2022/12/1 16:53
      */
@@ -1846,7 +1840,6 @@ public class ScheduleController extends AbstractController {
     /**
      * @author: sxm
      * @description: 删除不良卷信息
-     * @param []
      * @return: com.gaotao.common.utils.R
      * @date: 2022/12/7 13:33
      */
@@ -1860,7 +1853,6 @@ public class ScheduleController extends AbstractController {
     /**
      * @author: sxm
      * @description: 删除工单时间记录
-     * @param []
      * @return: com.gaotao.common.utils.R
      * @date: 2022/12/7 13:33
      */
@@ -1873,7 +1865,6 @@ public class ScheduleController extends AbstractController {
     /**
      * @author: sxm
      * @description: 删除物料记录
-     * @param [inData]
      * @return: com.gaotao.common.utils.R
      * @date: 2022/12/8 13:38
      */
diff --git a/src/main/java/com/gaotao/modules/schedule/data/ScheduleData.java b/src/main/java/com/gaotao/modules/schedule/data/ScheduleData.java
index 646b808..1b922b9 100644
--- a/src/main/java/com/gaotao/modules/schedule/data/ScheduleData.java
+++ b/src/main/java/com/gaotao/modules/schedule/data/ScheduleData.java
@@ -86,6 +86,15 @@ public class ScheduleData extends BaseShopOrderData {
     private String toolIssueFlag;//刀模已发
     private Integer rowCount;
     private Integer rollCount;
+    private String carrierNo;
+
+    public String getCarrierNo() {
+        return carrierNo;
+    }
+
+    public void setCarrierNo(String carrierNo) {
+        this.carrierNo = carrierNo;
+    }
 
     public Integer getRowCount() {
         return rowCount;
diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml
index 1479443..c4a42fe 100644
--- a/src/main/resources/mapper/schedule/ScheduleMapper.xml
+++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml
@@ -357,7 +357,8 @@
         SO.RepairSOFlag repairSOFlag,
         SO.ManualFlag manualFlag,
         T.row_count,
-        T.roll_count
+        T.roll_count,
+        T.carrier_no
         from SOScheduledRouting as T
         Left Join SOScheduledList as E on E.Site = T.Site and E.LinkedSeqNo = T.SeqNo,
         SORouting as D, Part as P, ShopOrder as SO