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
///
/// 起始位置编号
/// 终点位置编号
- /// 任务模板编号
/// 派工任务id
/// 搬运类型:1:搬运容器,2:搬运货架
/// 载具类型:0-空;1-满
/// 返回调用结果 JObject,包含 code 和 message
- 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 positionList = new List
{