From bc3d7a828114cb9df154da869ec986cf6733a779 Mon Sep 17 00:00:00 2001
From: pulg <plg@Haninfo>
Date: 星期二, 27 五月 2025 17:14:40 +0800
Subject: [PATCH] 1
---
HH.WCS.ZCQTJ/process/TaskProcess.cs | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/HH.WCS.ZCQTJ/process/TaskProcess.cs b/HH.WCS.ZCQTJ/process/TaskProcess.cs
index fc88ee0..6bf2794 100644
--- a/HH.WCS.ZCQTJ/process/TaskProcess.cs
+++ b/HH.WCS.ZCQTJ/process/TaskProcess.cs
@@ -870,6 +870,11 @@
}
}
}
+ else if (tac.CtiaMode == "绔嬪簱")
+ {
+ task.S_TYPE = "鍏ュ簱";
+ BLLCreator.CreateSingleton<WcsTask>().WcsCallback(task, state, forkliftNo);
+ }
}
}
}
@@ -1028,7 +1033,7 @@
}
}
- if (tac.CtiaMode == "VMI")
+ else if (tac.CtiaMode == "VMI")
{
var Alone = newDb.Queryable<SqlCountEntitys>().Where(e => e.ConfigId == tac.host)?.First();
if (Alone == null)
@@ -1105,6 +1110,11 @@
}
LogHelper.Info("瀹屽伐鍥炴姤", "鍐欏畨鍏ㄤ俊鍙蜂氦浜掕〃 IMES_AGV_BAST_ENTRY_TRANSF_DONE 瀛楁涓�0鎴愬姛");
}
+ }
+ else if (tac.CtiaMode == "绔嬪簱")
+ {
+ task.S_TYPE = "鍏ュ簱";
+ var tra = BLLCreator.Create<WcsTask>().WcsCallback(task, state, forkliftNo);
}
}
}
@@ -2673,18 +2683,31 @@
/// <param name="mst"></param>
internal static bool SendTask(WMSTask mst)
{
-
+ var chi = new SqlHelper<object>().GetInstance();
+ var newDb = chi.CopyNew();
try
{
+
var result = false;
var start = 0; var end = 0;
var taskType = mst.S_TYPE.Trim();
var taskState = mst.S_B_STATE.Trim();
if (taskState == "鏈墽琛� || taskState == "寰呮帹閫�)
{
+ var dic = new Dictionary<string, string>();
+ var dic1 = new Dictionary<string, string>();
LogHelper.Info("NDC", $"agv浠诲姟鍙�{mst.S_TASK_NO}");
LogHelper.Info("NDC", $"agv浠诲姟璧风偣:{mst.S_START_LOC}");
start = LocationHelper.GetAgvSiteZc(mst.S_START_LOC);
+ var transportTask = newDb.Queryable<ConfigJsonEntitys>().Where(e => e.Autoindex == "鐗规畩娴佺▼绔欑偣")?.First();
+ if (transportTask != null)
+ {
+ var ListString = JsonConvert.DeserializeObject<AgvCodeTs>(transportTask.TypeJson);
+ if (ListString != null && ListString.LocationCode != null && ListString.EndAreaCode != null && ListString.LocationCode.Contains(mst.S_START_LOC) && ListString.EndAreaCode.Contains(mst.S_END_LAREA))
+ {
+ start = LocationHelper.GetAgvSiteZc2(mst.S_START_LOC);
+ }
+ }
LogHelper.Info("NDC", $"agv 鏌ヨ鐨勭珯鐐�璧风偣):{start}");
LogHelper.Info("NDC", $"agv浠诲姟缁堢偣:{mst.S_END_LOC}");
end = LocationHelper.GetAgvSiteZc(mst.S_END_LOC);
@@ -2692,8 +2715,6 @@
Console.WriteLine($"SendTask {mst.S_TASK_NO}");
Console.WriteLine("start=" + start);
Console.WriteLine("end= " + end);
- var dic = new Dictionary<string, string>();
- var dic1 = new Dictionary<string, string>();
dic.Add("Pri", mst.N_PRIORITY.ToString());//浼樺厛绾� dic.Add("No", mst.S_TASK_NO.Trim());
dic1.Add("From", start.ToString());//璧风偣
@@ -2706,7 +2727,7 @@
}
else
{
- var tac = SqlSugarHelper.Db.Queryable<TN_TcpCont>().Where(a => a.LocationCode == mst.S_END_LOC)?.First();
+ var tac = newDb.Queryable<TN_TcpCont>().Where(a => a.LocationCode == mst.S_END_LOC)?.First();
if (tac != null && tac.C_IS_RFID == "Y")
{
--
Gitblit v1.9.1