From 2f8733caf7ae5c94483fa332e0d3af69b61a0eb0 Mon Sep 17 00:00:00 2001
From: lss <2538410689@qq.com>
Date: 星期四, 03 七月 2025 23:09:25 +0800
Subject: [PATCH] 111
---
HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs
index 92da512..7b934f2 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs
@@ -27,7 +27,6 @@
{
if (model.state <= 7)
{
-
//鏈変换鍔″彿璇锋眰
switch (model.state)
{
@@ -36,6 +35,7 @@
break;
#region MyRegion
case 3:
+ WCSHelper.UpdateAgvNo(TN_Task, model.forklift_no);
WCSHelper.UpdateStatus(TN_Task, "寮�鍙栬揣");
break;
case 4:
@@ -47,7 +47,11 @@
break;
case 6:
WCSHelper.UpdateStatus(TN_Task, "鍗歌揣瀹屾垚");
- if (TN_Task.S_NOTE != "鍏ュ簱" && TN_Task.S_NOTE != "绌烘墭鍥炲簱")
+ if (!string.IsNullOrEmpty(TN_Task.S_NOTE) && (TN_Task.S_NOTE.Trim() == "鍏ュ簱" || TN_Task.S_NOTE.Trim() == "绌烘墭鍥炲簱"))
+ {
+ LocationHelper.UnlockLoc(TN_Task.S_END_LOC);
+ }
+ else
{
TaskProcess.OperateStatus(TN_Task, 6);
}
@@ -63,14 +67,14 @@
break;
}
WCSHelper.AddActionRecord(model.task_no, model.state, model.forklift_no, model.ext_data);
- //璋冪敤绗笁鏂规帴鍙ｏ紙濡傛灉鏈夛級
+
//鐗╂枡鍒颁綅閫氱煡
- if ((TN_Task.S_TYPE == "鍑哄钩搴� || TN_Task.S_TYPE == "浣欐枡杩斿洖") && model.state == 2)
+ if ((TN_Task.S_TYPE == "鍑哄钩搴� || TN_Task.S_TYPE == "浣欐枡杩斿洖") && model.state == 6)
{
string urlitem = Settings.tableUrls.Find(a => a.id == 5).url;
TaskProcess.MESIteminfoback(TN_Task, urlitem);
}
- if ((TN_Task.S_NOTE == "鍑哄簱" || TN_Task.S_NOTE == "寮傚父搴撳尯鍏ュ簱") && !string.IsNullOrEmpty(TN_Task.S_MES_NO) && model.state == 2)
+ if ((TN_Task.S_NOTE == "鍑哄簱" || TN_Task.S_NOTE == "寮傚父搴撳尯鍏ュ簱") && !string.IsNullOrEmpty(TN_Task.S_MES_NO) && model.state == 6)
{
string urlitem = Settings.tableUrls.Find(a => a.id == 5).url;
TaskProcess.MESIteminfoback(TN_Task, urlitem);
@@ -78,6 +82,7 @@
//浠诲姟鍥炴姤 浠诲姟鏉ユ簮 1.閽笣绔嬪簱 2.鑳剁墖搴� 3.棰勫搴�5.mes涓嬪彂
if (TN_Task.Z_TYPE == 5)
{
+ //TN_Task = WCSHelper.GetTask(TN_Task.S_CODE);
string urlstate = Settings.tableUrls.Find(a => a.id == 4).url;
TaskProcess.MESReportback(TN_Task, model.state, urlstate);
}
@@ -159,6 +164,13 @@
}
else
{
+ var db = new SqlHelper<TaskAction>().GetInstance();
+ var taskAction = db.Queryable<TaskAction>().Where(a => a.S_TASK_CODE == model.task_no && a.N_ACTION_CODE == model.state).First();
+ if (taskAction == null)
+ {
+ WCSHelper.AddActionRecord(model.task_no, model.state, model.forklift_no, model.ext_data);
+ }
+
//瀹夊叏璇锋眰绛� string url = "";
if (TN_Task.Z_TYPE == 1)
@@ -197,7 +209,7 @@
{
//鏌ヨ浠诲姟
//鑾峰彇鎵�湁绛夊緟鐨勪换鍔�-
+ Console.WriteLine("寮�浠诲姟鎺ㄩ�");
var list = WCSHelper.GetTaskListByState("绛夊緟");
if (list.Count > 0)
--
Gitblit v1.9.1