From 17e3ef45fe0a6b6f8a147b50740834ac734f9317 Mon Sep 17 00:00:00 2001
From: lss <2538410689@qq.com>
Date: 星期二, 15 七月 2025 17:30:13 +0800
Subject: [PATCH] 1111
---
HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/wms/WCSHelper.cs | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/wms/WCSHelper.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/wms/WCSHelper.cs
index 184a519..20fe96c 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/wms/WCSHelper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/wms/WCSHelper.cs
@@ -145,7 +145,7 @@
}
return res;
}
- internal static bool AddActionRecord(string no, int state, string forkliftNo, string extData)
+ internal static bool AddActionRecord(string no, int state, string forkliftNo, string extData, string Type)
{
var db = new SqlHelper<TaskAction>().GetInstance();
var action = new TaskAction()
@@ -153,7 +153,7 @@
N_ACTION_CODE = state,
S_TASK_CODE = no,
S_EQ_CODE = forkliftNo,
- S_EQ_TYPE = "agv",
+ S_EQ_TYPE = Type,
S_DATA = extData
};
return db.Insertable(action).ExecuteCommand() > 0;
@@ -168,15 +168,21 @@
var db = new SqlHelper<WCSTask>().GetInstance();
if (task != null)
{
- if (task.N_B_STATE == 1)
- {
+ //if (task.N_B_STATE == 1)
+ // {
task.N_B_STATE = 2;
task.S_B_STATE = WCSTask.GetStateStr(task.N_B_STATE);
task.T_START_TIME = DateTime.Now;
db.Updateable(task).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE, it.T_START_TIME }).ExecuteCommand();
- }
+ //}
}
+ }
+
+ internal static WCSTask GetWcsTaskByState(string opcode,int[] state)
+ {
+ var db = new SqlHelper<object>().GetInstance();
+ return db.Queryable<WCSTask>().Where(a => state.Contains(a.N_B_STATE)&&a.S_OP_CODE== opcode).First();
}
internal static void End(WCSTask task)
{
@@ -236,7 +242,7 @@
internal static List<WCSTask> GetTaskbyType(string type)
{
var db = new SqlHelper<object>().GetInstance();
- string[] statue = new string[] { "瀹屾垚", "鍙栨秷", "閿欒","绛夊緟" };
+ string[] statue = new string[] { "瀹屾垚", "鍙栨秷", "閿欒", "绛夊緟" };
return db.Queryable<WCSTask>().Where(a => a.S_TYPE == type && !statue.Contains(a.S_B_STATE)).ToList();
}
@@ -245,6 +251,12 @@
var db = new SqlHelper<object>().GetInstance();
return db.Queryable<WCSTask>().Where(a => a.N_B_STATE == state).ToList();
}
+
+ internal static WCSTask GetTaskByOpName(string opCode, int state)
+ {
+ var db = new SqlHelper<object>().GetInstance();
+ return db.Queryable<WCSTask>().Where(a => a.S_OP_CODE == opCode && a.N_B_STATE == state).First();
+ }
internal static List<WCSTask> GetWaitingTaskList()
{
var db = new SqlHelper<object>().GetInstance();
--
Gitblit v1.9.1