From 1572d62a3dbdd2b208744fe8d7bc832a2e2acc68 Mon Sep 17 00:00:00 2001
From: XingCheng3 <1773407212@qq.com>
Date: Fri, 29 May 2026 10:07:09 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=89=A9=E6=96=99=E8=BD=AC?=
 =?UTF-8?q?=E5=BA=8F=E6=8C=89=E8=B5=B7=E6=AD=A2=E5=BA=93=E4=BD=8D=E5=89=8D?=
 =?UTF-8?q?=E7=BC=80=E6=9F=A5=E6=A8=A1=E6=9D=BF=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SlMesDbIterface/Form_MoveSqlTable.cs      |  2 +-
 .../FactoryMES/CALL_Inerface_DataHandle.cs    | 27 +++++++++++++++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/Interface_WebAPI/SlMesDbIterface/Form_MoveSqlTable.cs b/Interface_WebAPI/SlMesDbIterface/Form_MoveSqlTable.cs
index 59f4c39..b52c9dc 100644
--- a/Interface_WebAPI/SlMesDbIterface/Form_MoveSqlTable.cs
+++ b/Interface_WebAPI/SlMesDbIterface/Form_MoveSqlTable.cs
@@ -319,7 +319,7 @@ namespace SlMesDbIterface
 
         private void button8_Click(object sender, EventArgs e)
         {
-            CALL_Inerface_DataHandle.CALL_Inerface_MaterialTransfer("ACHC01", "ACHC02", "211");
+            CALL_Inerface_DataHandle.CALL_Inerface_MaterialTransfer("ACHC01", "ACHC02");
         }
     }
 }
diff --git a/Interface_WebAPI/SlMesDbIterface/WebAPI/FactoryMES/CALL_Inerface_DataHandle.cs b/Interface_WebAPI/SlMesDbIterface/WebAPI/FactoryMES/CALL_Inerface_DataHandle.cs
index 114b74b..682b835 100644
--- a/Interface_WebAPI/SlMesDbIterface/WebAPI/FactoryMES/CALL_Inerface_DataHandle.cs
+++ b/Interface_WebAPI/SlMesDbIterface/WebAPI/FactoryMES/CALL_Inerface_DataHandle.cs
@@ -571,16 +571,39 @@ namespace WebApi
         /// </summary>
         /// <param name="startPositionCode">起始位置编号</param>
         /// <param name="endPositionCode">终点位置编号</param>
-        /// <param name="taskType">任务模板编号</param>
         /// <param name="dataid">派工任务id</param>
         /// <param name="moveTaskType">搬运类型：1：搬运容器，2：搬运货架</param>
         /// <param name="vehicleStatus">载具类型：0-空；1-满</param>
         /// <returns>返回调用结果 JObject，包含 code 和 message</returns>
-        public static JObject CALL_Inerface_MaterialTransfer(string startPositionCode, string endPositionCode, string taskType = "211", string dataid = "", string moveTaskType = "2", string vehicleStatus = "1")
+        public static JObject CALL_Inerface_MaterialTransfer(string startPositionCode, string endPositionCode, string dataid = "", string moveTaskType = "2", string vehicleStatus = "1")
         {
             JObject response = new JObject();
             try
             {
+                // 根据起止库位号前缀（前6位）查询任务模板编号
+                var paramTaskType = new SqlParameter[] {
+                    new SqlParameter("@起始库位号", startPositionCode ?? ""),
+                    new SqlParameter("@结束库位号", endPositionCode ?? "")
+                };
+                DataLinkMesWork2.DataAccess2.ExecuteStoredProcedure("XD_AGV任务模板_获取", ref paramTaskType, out DataTable dtTaskType, out string errTaskType);
+
+                if (!string.IsNullOrEmpty(errTaskType) || dtTaskType == null || dtTaskType.Rows.Count == 0
+                    || string.IsNullOrWhiteSpace(dtTaskType.Rows[0]["任务模板编号"]?.ToString()))
+                {
+                    string errorMsg = $"未找到匹配的任务模板：起点={startPositionCode}, 终点={endPositionCode}";
+                    if (!string.IsNullOrEmpty(errTaskType))
+                    {
+                        errorMsg += $", 错误={errTaskType}";
+                    }
+                    SaveMesLog("MOM", $"物料转序失败：{errorMsg}", MesLogType.ERROR);
+
+                    response["code"] = 500;
+                    response["message"] = errorMsg;
+                    return response;
+                }
+
+                string taskType = dtTaskType.Rows[0]["任务模板编号"].ToString();
+
                 // 构建位置列表
                 List<PositionInfo> positionList = new List<PositionInfo>
         {