From 84537533cc2c02a521c5abeb2f15d84a0857e661 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 11 Nov 2025 09:44:31 +0800
Subject: [PATCH] =?UTF-8?q?2025-11-11=20=E8=BF=87=E7=AB=99=E9=87=87?=
 =?UTF-8?q?=E9=9B=86-=E3=80=8B=E6=8A=A5=E5=B7=A5-=E3=80=8B=E7=BB=93?=
 =?UTF-8?q?=E5=8D=95-=E3=80=8B=E7=BB=93=E5=8D=95=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A1=AB=E5=86=99=E5=A4=87=E6=B3=A8=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/schedule/mapper/ScheduleMapper.java     |  5 +++++
 .../schedule/service/impl/ScheduleServiceImpl.java  |  8 ++++++++
 .../resources/mapper/schedule/ScheduleMapper.xml    | 13 ++++++++++++-
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java b/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java
index 18f39d4..82a002e 100644
--- a/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java
+++ b/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java
@@ -666,6 +666,11 @@ public interface ScheduleMapper {
      */
     void updateSOScheduledRouting(ShopOrderRollDto shopOrderRollDto);
 
+    /**
+     * 更新派工单的备注
+     * @param inData
+     */
+    void updateSOScheduledRoutingRemark(SearchScheduleData inData);
 
     /**
      * @author: sxm
diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
index f1e7cb1..e2cc9f1 100644
--- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
@@ -2781,6 +2781,10 @@ public class ScheduleServiceImpl implements ScheduleService {
         this.finishScheduleProcessSfdcMaterialHist(site, orderNo, itemNo, seqNo, reportedTime);
         //4.调用存储过程处理 派工单和sfdc的信息
         this.finishScheduleProcessSfdcAndSchedule(site, orderNo, itemNo, seqNo, histSeqNo, shiftDesc, username, operatorId, reportedTime, scheduledDate);
+        //4.5 更新派工单的备注信息
+        if (inData.getRemark() != null && !inData.getRemark().trim().isEmpty()) {
+            scheduleMapper.updateSOScheduledRoutingRemark(inData);
+        }
         //5.调用存储过程处理 transHeader TransDetail TransDetailSub数据
         this.finishScheduleProcessTransData(site, orderNo, itemNo, seqNo, username, operatorName, reportedTime);
         //6.调用存储过程 处理异常信息
@@ -4737,6 +4741,10 @@ public class ScheduleServiceImpl implements ScheduleService {
         this.finishScheduleProcessSfdcMaterialHist(site, orderNo, itemNo, seqNo, reportedTime);
         //4.调用存储过程处理 派工单和sfdc的信息
         this.finishScheduleProcessSfdcAndSchedule(site, orderNo, itemNo, seqNo, histSeqNo, shiftDesc, username, operatorId, reportedTime, scheduledDate);
+        //4.5 更新派工单的备注信息
+        if (inData.getRemark() != null && !inData.getRemark().trim().isEmpty()) {
+            scheduleMapper.updateSOScheduledRoutingRemark(inData);
+        }
         //5.调用存储过程处理 transHeader TransDetail TransDetailSub数据
         this.finishRepackScheduleProcessTransData(site, orderNo, itemNo, seqNo, username, operatorName, reportedTime);
         //6.调用存储过程 处理异常信息
diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml
index 93f294f..fe506ca 100644
--- a/src/main/resources/mapper/schedule/ScheduleMapper.xml
+++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml
@@ -306,7 +306,7 @@
                 and T.PlanStartTime<![CDATA[ <= ]]> #{planStartTime2}
             </if>
             <if test="resourceId != null and resourceId != ''">
-                AND T.S_ResourceID like '%' + #{resourceId} + '%'
+                AND T.S_ResourceID = #{resourceId}
             </if>
             <if test="orderNo != null and orderNo != ''">
                 AND T.OrderNo like '%' + #{orderNo} + '%'
@@ -1826,6 +1826,17 @@
           and ItemNo = #{itemNo}
           and SeqNo = #{seqNo}
     </update>
+    
+    <!-- 更新派工单的备注 -->
+    <update id="updateSOScheduledRoutingRemark">
+        UPDATE SOScheduledRouting
+        SET Remark = #{remark}
+        WHERE Site = #{site}
+          AND OrderNo = #{orderNo}
+          AND ItemNo = #{itemNo}
+          AND SeqNo = #{seqNo}
+    </update>
+    
     <select id="checkKeyMart" resultType="java.lang.String">
         Select Isnull(RMType_DB, '') as RMType_DB
         From dbo.view_SAP_SOBOM as B