From 5321419f5fddb4e877fe90ccd90ebdc1a115af64 Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期五, 18 七月 2025 17:29:26 +0800
Subject: [PATCH] 出库修改
---
core/Monitor.cs | 120 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 75 insertions(+), 45 deletions(-)
diff --git a/core/Monitor.cs b/core/Monitor.cs
index 5480a47..fb5cd58 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -23,6 +23,8 @@
/// </summary>
internal class Monitor
{
+ private static object CreateTaskLocker = new object();
+
/// <summary>
/// 鏍规嵁浣滀笟鍒涘缓瀵瑰簲浠诲姟
/// </summary>
@@ -30,12 +32,18 @@
{
var db = new SqlHelper<object>().GetInstance();
- // 鑾峰彇鎵�湁绛夊緟涓殑浣滀笟
- var operations = db.Queryable<WmsWork>().Where(p => p.N_B_STATE == 0).ToList();
- foreach (var operation in operations)
+ lock (CreateTaskLocker)
{
- TaskHelper.CreateTask(operation);
+ // 鑾峰彇鎵�湁绛夊緟涓殑浣滀笟
+ var operations = db.Queryable<WmsWork>().Where(p => p.N_B_STATE == 0).ToList();
+
+ foreach (var operation in operations)
+ {
+ TaskHelper.CreateTask(operation);
+ }
}
+
+
}
@@ -88,22 +96,33 @@
public static void UpdateOutTaskPriority()
{
var db = new SqlHelper<object>().GetInstance();
- var st = Settings.outMinutePriority;
+ //var st = Settings.outMinutePriority;
+
+ var st = TaskHelper.GetOutMinutePriority();
+
+ if (st==null)
+ {
+ return;
+ }
+
var list = TaskHelper.GetWcsTaskListByState("鎵ц", "agv", "鍑哄簱");
foreach (var item in list)
{
- var action = db.Queryable<WmsTaskAction>().Where(p => p.S_TASK_CODE==item.S_CODE && p.N_ACTION_CODE == 1).First();
- if (action != null)
- {
- var action3 = db.Queryable<WmsTaskAction>().Where(p => p.S_TASK_CODE == item.S_CODE && p.N_ACTION_CODE == 3).First();
- if (action3 == null)
+ var wcsTask = TaskHelper.GetTaskByState("瀹屾垚", "wcs", item.S_OP_CODE, "鍑哄簱");
+ if (wcsTask != null) {
+ var action = db.Queryable<WmsTaskAction>().Where(p => p.S_TASK_CODE == item.S_CODE && p.N_ACTION_CODE == 1).First();
+ if (action != null)
{
- if (DateTime.Now.Subtract(action.T_CREATE).TotalMinutes > st.Minute)
+ var action3 = db.Queryable<WmsTaskAction>().Where(p => p.S_TASK_CODE == item.S_CODE && p.N_ACTION_CODE == 3).First();
+ if (action3 == null)
{
- item.N_PRIORITY += st.Priority;
- db.Updateable(item).UpdateColumns(it => new { it.N_PRIORITY }).ExecuteCommand();
- NDCApi.ChangeOrderPri(item.S_CODE, item.N_PRIORITY);
+ if (DateTime.Now.Subtract(action.T_CREATE).TotalMinutes > st.Minute)
+ {
+ item.N_PRIORITY += st.Priority;
+ db.Updateable(item).UpdateColumns(it => new { it.N_PRIORITY }).ExecuteCommand();
+ NDCApi.ChangeOrderPri(item.S_CODE, item.N_PRIORITY);
+ }
}
}
}
@@ -154,6 +173,7 @@
TaskHelper.UpdateStatus(wmsTask, "鍙栬揣瀹屾垚");
LocationHelper.UnLockLoc(wmsTask.S_START_LOC);
TaskProcess.OperateStatus(wmsTask, 4);
+ TaskHelper.opMesTask(wmsTask, 1);
break;
case 5:
TaskHelper.UpdateStatus(wmsTask, "寮�鍗歌揣");
@@ -177,20 +197,25 @@
LogHelper.Info($"浠诲姟{wmsTask.S_CODE}瀹屾垚锛屽垽鏂叆搴撲紭鍏堢骇", "鍏ュ簱浼樺厛绾�);
TaskProcess.inPri(wmsTask);
TaskHelper.End(wmsTask);
+
break;
case 7:
-
- var wcsTask1 = TaskHelper.GetTaskByWorkNo(wmsTask.S_OP_CODE, "wcs");
- if (wcsTask1 != null)
- {
- //agv鎵ц閫氱煡 wcs鍙栨秷
- WcsTask.WcsCallback(wmsTask, model.state, model.forklift_no);
- if (!TaskHelper.CheckActionRecordExist(wcsTask1.S_CODE, "6"))
- {
- TaskHelper.Fail(wcsTask1);
- TaskProcess.OperateStatus(wcsTask1, 7);
- }
+ if (!LocationHelper.GetErroArea(wmsTask.S_END_AREA)) {
+ TaskHelper.opMesTask(wmsTask, 3);
}
+
+ var wcsTask1 = TaskHelper.GetTaskByWorkNo(wmsTask.S_OP_CODE, "wcs");
+ if (wcsTask1 != null)
+ {
+ //agv鎵ц閫氱煡 wcs鍙栨秷
+ WcsTask.WcsCallback(wmsTask, model.state, model.forklift_no.ToString());
+ if (wcsTask1.S_B_STATE.Trim() != "鍙栨秷" && wcsTask1.S_B_STATE.Trim() != "澶辫触" && wcsTask1.S_B_STATE.Trim() != "瀹屾垚")
+ {
+ TaskHelper.Fail(wcsTask1);
+ TaskProcess.OperateStatus(wcsTask1, 7);
+ }
+ }
+
TaskHelper.Fail(wmsTask);
TaskProcess.OperateStatus(wmsTask, 7);
@@ -199,16 +224,21 @@
{
ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
+ ContainerHelper.delCntrLoc(wmsTask.S_CNTR_CODE);
}
-
- //鍑哄簱鍙栨秷鍒ゆ柇鎺ラ┏浣嶆槸鍚︽湁璐э紝鏈夎揣闇�瑙ｇ粦
- if (!WcsTask.WcsCvstate(wmsTask))
- {
- LogHelper.Info($"Wcs绔嬪簱鎺ラ┏浣嶆棤璐э紝瑙ｇ粦璐т綅:{wmsTask.S_START_LOC}", "绔嬪簱");
- TaskProcess.OperateStatus(wmsTask, 4);
- ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
- ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
+ else {
+ //鍑哄簱鍙栨秷鍒ゆ柇鎺ラ┏浣嶆槸鍚︽湁璐э紝鏈夎揣闇�瑙ｇ粦
+ if (!WcsTask.WcsCvstate(wmsTask))
+ {
+ LogHelper.Info($"Wcs绔嬪簱鎺ラ┏浣嶆棤璐э紝瑙ｇ粦璐т綅:{wmsTask.S_START_LOC}", "绔嬪簱");
+ TaskProcess.OperateStatus(wmsTask, 4);
+ ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
+ ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
+ }
}
+
+
+
break;
}
@@ -320,7 +350,7 @@
//瀵绘壘绔嬪簱鍖虹┖鎵�- start = LocationHelper.FindStartcolByLoclistAndcntr(strrtList, workFlow.STARTAREA);
+ start = LocationHelper.FindStartcolByLoclistAndcntr(strrtList, workFlow.STARTAREA,workFlow.CONNECTION);
LogHelper.Info($"绌烘墭{kt.task_no}鍑哄簱浠诲姟涓嬪彂璧风偣淇℃伅" + JsonConvert.SerializeObject(start), "绌烘墭鍑哄簱");
@@ -342,23 +372,20 @@
var cntrCode = LocationHelper.GetLocCntrCode(start.S_CODE);
if (workFlow.SENDWCS == "Y")
- {
-
- //姝ｅ紡浠ｇ爜锛岃皟鐢ㄦ帴鍙ｅ鎵惧彲鐢ㄦ帴椹充綅
+ {
var connectionList = LocationHelper.GetConnectionList(workFlow.CONNECTION);
-
+ //鏍规嵁鎺ラ┏浣嶄换鍔℃暟閲忚幏鍙栧潎琛℃帴椹充綅闆嗗悎浼樺厛浠诲姟鏁板皯鐨勬帴椹充綅
var balanceConnectionList = LocationHelper.GetBalanceConnectionList(connectionList);
foreach (var item in balanceConnectionList)
{
- if (item.loc.N_CURRENT_NUM < 2)
+ if (item.loc.CONNEC_ROADWAY == start.N_ROADWAY)
{
connection = item.loc.S_CODE;
connectionArea = item.loc.S_AREA_Name;
- LogHelper.Info($"绌烘墭{kt.task_no}鍑哄簱浠诲姟涓嬪彂瀵绘壘鍒板彲鐢ㄦ帴椹充綅{connection}", "绌烘墭鍑哄簱");
+ LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟涓嬪彂瀵绘壘鍒板彲鐢ㄦ帴椹充綅{connection}", "Mes浠诲姟涓嬪彂");
break;
}
}
-
if (connection == "")
{
LogHelper.Info($"绌烘墭{kt.task_no}鍑哄簱浠诲姟涓嬪彂瀵绘壘鎺ラ┏浣嶅け璐�, "Mes浠荤┖鎵樺嚭搴撳姟涓嬪彂");
@@ -374,9 +401,6 @@
continue;
}
-
-
- LocationHelper.LockLoc(start.S_CODE, "鍑哄簱閿�, 2);
@@ -418,10 +442,16 @@
CONNECTION_AREA = connectionArea
};
+
//鍒涘缓浣滀笟
if (WMSHelper.CreateWmsWork(operation) && TaskHelper.ChangeMesKtTask(kt))
{
-
+ if (connection != "")
+ {
+ LocationHelper.LockLoc(operation.S_START_LOC, "鍑哄簱閿�, 2);
+ LocationHelper.LockLoc(operation.S_END_LOC, "鍏ュ簱閿�, 1);
+ LocationHelper.LockLoc(operation.CONNECTION, "鍏ュ簱閿�, 1);
+ }
LogHelper.Info($"绌烘墭{kt.task_no}鍑哄簱浣滀笟鍒涘缓鎴愬姛{operation.S_CODE}", "绌烘墭鍑哄簱");
}
else
--
Gitblit v1.9.1