From f9ee14fbfe22a0a56350580838bb6e4b57f829dc Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期二, 29 七月 2025 17:28:13 +0800
Subject: [PATCH] 等待交互修改
---
dispatch/WcsTask.cs | 44 +++++++++++++++++++++++++-------------------
1 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/dispatch/WcsTask.cs b/dispatch/WcsTask.cs
index 2e50bb6..566ac59 100644
--- a/dispatch/WcsTask.cs
+++ b/dispatch/WcsTask.cs
@@ -12,6 +12,7 @@
using System.Linq;
using System.Reflection;
using System.Text;
+using System.Threading;
using System.Threading.Tasks;
using System.Web.Services.Description;
using Top.Api;
@@ -288,8 +289,6 @@
{
//浣滀笟娴佺▼
WorkFlow workFlow =null;
-
-
var item = new MesReturnItem();
@@ -585,13 +584,9 @@
default:
break;
}
-
-
return false;
}
-
-
///// <summary>
@@ -641,8 +636,8 @@
//浠诲姟瀹屾垚
case "2":
LogHelper.Info($"浠诲姟{taskNo}瀹屾垚", "Wcs浠诲姟鎵ц閫氱煡");
- TaskProcess.OperateStatus(transportTask, 4);
TaskProcess.OperateStatus(transportTask, 6);
+ LocationHelper.UnLockLoc(transportTask.S_END_LOC);
TaskHelper.End(transportTask);
LocationHelper.CreateUpAndDown(transportTask);
break;
@@ -664,10 +659,20 @@
RfidChek.S_OLDTRAY_CODE = transportTask.S_CNTR_CODE;
RfidChek.S_JBWBIT = transportTask.S_START_LOC;
+ var agvTask = TaskHelper.GetTaskByWorkNo(transportTask.S_OP_CODE, "agv");
+ if (agvTask==null)
+ {
+ LogHelper.Info($"RFID鏍￠獙澶辫触锛屾病鎵惧埌瀵瑰簲{transportTask.S_OP_CODE}鐨刟gv浠诲姟", "Wcs浠诲姟鎵ц閫氱煡");
+ throw new Exception($"RFID鏍￠獙澶辫触,娌℃壘鍒板搴攞transportTask.S_OP_CODE}鐨刟gv浠诲姟");
+ }
+
if (model.code=="0")
{
LogHelper.Info($"RFID鏍￠獙鐮佹垚鍔�, "Wcs浠诲姟鎵ц閫氱煡");
RfidChek.S_RESULT = "RFID鏍￠獙鎴愬姛";
+ LogHelper.Info($"浠诲姟鍙�{agvTask.S_CODE}锛岀瓑寰呬氦绠℃垚鍔燂紝淇敼鍙傛暟6涓�,4涓�", "瀹夊叏浜や簰");
+ NDCApi.ChangeOrderParam(agvTask.S_CODE, 4, "0");
+ NDCApi.ChangeOrderParam(agvTask.S_CODE, 6, "1");
}
if (model.code == "1")
{
@@ -676,18 +681,9 @@
RfidChek.S_RESULT = "RFID鏍￠獙澶辫触";
if (WcsCancellTask(transportTask))
{
-
TaskHelper.Fail(transportTask);
TaskProcess.OperateStatus(transportTask, 7);
- var agvTask = TaskHelper.GetTaskByWorkNo(transportTask.S_OP_CODE, "agv");
-
- if (agvTask == null)
- {
- LogHelper.Info($"RFID鏍￠獙澶辫触锛屾病鎵惧埌瀵瑰簲{transportTask.S_OP_CODE}鐨刟gv浠诲姟", "Wcs浠诲姟鎵ц閫氱煡");
- throw new Exception($"RFID鏍￠獙澶辫触,娌℃壘鍒板搴攞transportTask.S_OP_CODE}鐨刟gv浠诲姟");
- }
-
WmsTaskAction ac7 = TaskHelper.GetActionRecord(agvTask.S_CODE, "7");
if (ac7!=null)
{
@@ -731,6 +727,16 @@
throw new Exception("淇敼浠诲姟琛ㄥけ璐�);
}
newDb.CommitTran();
+
+ var startSite = LocationHelper.GetAgvSiteZc(agvTask.S_END_LOC);
+ var endSite = LocationHelper.GetAgvSiteZc(end.S_CODE);
+ LogHelper.Info($"浠诲姟{agvTask.S_CODE}RFID鏍￠獙澶辫触锛屾敼鍙傛暟1涓簕startSite},鏀瑰弬鏁�涓簕endSite}锛屽弬鏁�涓�锛�涓�", "瀹夊叏浜や簰");
+ NDCApi.ChangeOrderParam(agvTask.S_CODE, 1, startSite);
+ NDCApi.ChangeOrderParam(agvTask.S_CODE, 2, endSite);
+ NDCApi.ChangeOrderParam(agvTask.S_CODE, 4, "0");
+ Thread.Sleep(1000);
+ NDCApi.ChangeOrderParam(agvTask.S_CODE, 6, "2");
+
var agvTask1 = TaskHelper.GetTaskByWorkNo(transportTask.S_OP_CODE, "agv");
TaskHelper.opMesTask(agvTask1, 3);
@@ -860,7 +866,7 @@
//鍙栬揣瀹屾垚
case "5":
TaskHelper.UpdateStatus(transportTask, "鍙栬揣瀹屾垚");
- LocationHelper.UnBindingLoc(transportTask.S_START_LOC, transportTask.S_CNTR_CODE.Split(',').ToList());
+ TaskProcess.OperateStatus(transportTask, 4);
break;
//7鍙栨秷
@@ -1352,7 +1358,7 @@
TaskHelper.Fail(task);
TaskProcess.OperateStatus(task, 7);
- LocationHelper.updateLocLock(task.S_START_LOC, 3, "鍏朵粬閿�);
+ LocationHelper.updateLocLock(task.S_START_LOC, 3, "鍏跺畠閿�);
var agvTask = TaskHelper.GetTaskByWorkNo(task.S_OP_CODE, "agv");
if (agvTask != null)
{
@@ -1428,7 +1434,7 @@
{
newDb.BeginTran();
endLoc.N_LOCK_STATE = 3;
- endLoc.S_LOCK_STATE = "鍏朵粬閿�;
+ endLoc.S_LOCK_STATE = "鍏跺畠閿�;
newDb.Updateable(endLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE }).ExecuteCommand();
task.S_END_LOC = end.S_CODE;
newDb.Updateable(task).UpdateColumns(it => new { it.S_END_LOC }).ExecuteCommand();
--
Gitblit v1.9.1