From ae75edc771b0161f90f3e5a596d13bee8a4b71cc Mon Sep 17 00:00:00 2001
From: lss <Lss@HanInfo>
Date: 星期四, 19 六月 2025 17:24:20 +0800
Subject: [PATCH] 现场优化
---
HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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..0c2de55 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)
{
@@ -47,7 +46,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);
}
@@ -65,12 +68,12 @@
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);
@@ -159,6 +162,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)
--
Gitblit v1.9.1