From 04eed9fb0fdb0a4c09c482f78d4449f941cfaadb Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期三, 14 五月 2025 17:24:06 +0800
Subject: [PATCH] 金坛bug修改
---
wms/TaskHelper.cs | 85 +++++++++++++++++++++++++++++++++---------
1 files changed, 67 insertions(+), 18 deletions(-)
diff --git a/wms/TaskHelper.cs b/wms/TaskHelper.cs
index cc450d3..5dddfea 100644
--- a/wms/TaskHelper.cs
+++ b/wms/TaskHelper.cs
@@ -49,6 +49,14 @@
return task;
}
+ //鏌ユ壘WCS绔嬪簱浠诲姟 鍙傛暟浣滀笟缂栫爜,璋冨害绫诲瀷 agv/wcs
+ internal static WMSTask GetTaskByWorkNo(string no,string type)
+ {
+ var db = new SqlHelper<WMSTask>().GetInstance();
+ var task = db.Queryable<WMSTask>().Where(a => a.S_OP_CODE == no && a.S_SCHEDULE_TYPE== type).First();
+ return task;
+ }
+
internal static WMSTask GetTaskByCntrCode(string cntrCode)
{
@@ -241,7 +249,7 @@
// 浣滀笟缂栫爜
S_OP_CODE = operation.S_CODE,
// 浠诲姟鍙�- S_CODE = GenerateTaskNo(),
+ S_CODE = operation.S_CODE + "_1",
// 浠诲姟绫诲瀷
N_TYPE = operation.N_TYPE,
// 浠诲姟绫诲瀷
@@ -250,6 +258,10 @@
S_START_LOC = operation.S_START_LOC,
// 璧风偣搴撳尯
S_START_AREA = operation.S_START_AREA,
+ //璧风偣搴撳尯鍚嶇О
+ S_START_AREA_NAME = operation.S_START_AREA_NAME,
+ //缁堢偣搴撳尯鍚嶇О
+ S_END_AREA_NAME = operation.S_END_AREA_NAME,
// 缁堢偣璐т綅
S_END_LOC = operation.S_END_LOC,
// 缁堢偣搴撳尯
@@ -335,6 +347,10 @@
N_PRIORITY = operation.N_PRIORITY,
//宸ヨ绫诲瀷
TOOLSTYPE = operation.TOOLSTYPE,
+ //璧风偣搴撳尯鍚嶇О
+ S_START_AREA_NAME = operation.S_START_AREA_NAME,
+ //缁堢偣搴撳尯鍚嶇О
+ S_END_AREA_NAME = operation.CONNECTION_AREA,
};
@@ -369,6 +385,10 @@
N_PRIORITY = operation.N_PRIORITY,
//宸ヨ绫诲瀷
TOOLSTYPE = operation.TOOLSTYPE,
+ //璧风偣搴撳尯鍚嶇О
+ S_START_AREA_NAME = operation.CONNECTION_AREA,
+ //缁堢偣搴撳尯鍚嶇О
+ S_END_AREA_NAME = operation.S_END_AREA_NAME,
};
try
@@ -411,7 +431,7 @@
// 浣滀笟缂栫爜
S_OP_CODE = operation.S_CODE,
// 浠诲姟鍙�- S_CODE = operation.S_CODE + "_2",
+ S_CODE = operation.S_CODE + "_1",
// 浠诲姟绫诲瀷
N_TYPE = operation.N_TYPE,
// 浠诲姟绫诲瀷
@@ -436,6 +456,10 @@
N_PRIORITY = operation.N_PRIORITY,
//宸ヨ绫诲瀷
TOOLSTYPE = operation.TOOLSTYPE,
+ //璧风偣搴撳尯鍚嶇О
+ S_START_AREA_NAME = operation.S_START_AREA_NAME,
+ //缁堢偣搴撳尯鍚嶇О
+ S_END_AREA_NAME = operation.CONNECTION_AREA,
};
// 浠诲姟2
@@ -444,7 +468,7 @@
// 浣滀笟缂栫爜
S_OP_CODE = operation.S_CODE,
// 浠诲姟鍙�- S_CODE = operation.S_CODE + "_1",
+ S_CODE = operation.S_CODE + "_2",
// 浠诲姟绫诲瀷
N_TYPE = operation.N_TYPE,
// 浠诲姟绫诲瀷
@@ -469,6 +493,10 @@
N_PRIORITY = operation.N_PRIORITY,
//宸ヨ绫诲瀷
TOOLSTYPE = operation.TOOLSTYPE,
+ //璧风偣搴撳尯鍚嶇О
+ S_START_AREA_NAME = operation.CONNECTION_AREA,
+ //缁堢偣搴撳尯鍚嶇О
+ S_END_AREA_NAME = operation.S_END_AREA_NAME,
};
try
@@ -534,7 +562,26 @@
return ac;
}
-
+ /// <summary>
+ /// 浠诲姟鎷︽埅
+ /// </summary>
+ /// <param name="task"></param>
+ /// <returns></returns>
+ internal static bool Intercept()
+ {
+ var db = new SqlHelper<object>().GetInstance();
+
+ var model = db.Queryable<ManualTaskSwitch>().First();
+ if (model != null && model.State == "Y")
+ {
+ return false;
+ }
+ else
+ {
+ return true;
+ }
+
+ }
internal static bool WcsAddActionRecord(string no, string state, string forkliftNo, string extData = "0")
@@ -558,18 +605,18 @@
var db = new SqlHelper<WmsTaskAction>().GetInstance();
return db.Queryable<WmsTaskAction>().Count(a => a.S_TASK_CODE.Trim() == no.Trim() && a.S_ACTION == code) > 0;
}
- internal static void Begin(WMSTask task,string avgNo) {
- var db = new SqlHelper<WMSTask>().GetInstance();
- if (task != null) {
- if (task.S_B_STATE.Trim() == "宸叉帹閫�) {
- task.S_B_STATE = "鎵ц涓�;
- task.T_START_TIME = DateTime.Now;
- task.S_EQ_NO = avgNo;
- db.Updateable(task).UpdateColumns(it => new { it.S_B_STATE, it.T_START_TIME,it.S_EQ_NO }).ExecuteCommand();
- }
+ //internal static void Begin(WMSTask task,string avgNo) {
+ // var db = new SqlHelper<WMSTask>().GetInstance();
+ // if (task != null) {
+ // if (task.S_B_STATE.Trim() == "宸叉帹閫�) {
+ // task.S_B_STATE = "鎵ц涓�;
+ // task.T_START_TIME = DateTime.Now;
+ // task.S_EQ_NO = avgNo;
+ // db.Updateable(task).UpdateColumns(it => new { it.S_B_STATE, it.T_START_TIME,it.S_EQ_NO }).ExecuteCommand();
+ // }
- }
- }
+ // }
+ //}
internal static WcsRfidCheckoutEntitys GetRfid(string TaskCode) {
@@ -581,7 +628,7 @@
- internal static void Begin(WMSTask task)
+ internal static void Begin(WMSTask task, string avgNo="")
{
var db = new SqlHelper<WMSTask>().GetInstance();
if (task != null)
@@ -590,8 +637,9 @@
{
task.N_B_STATE = 2;
task.S_B_STATE = WMSTask.GetStateStr(task.N_B_STATE);
+ task.S_EQ_NO = avgNo;
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();
+ db.Updateable(task).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE, it.T_START_TIME,it.S_EQ_NO }).ExecuteCommand();
}
}
}
@@ -680,7 +728,8 @@
{
task.N_B_STATE = 5;
task.S_B_STATE = WMSTask.GetStateStr(task.N_B_STATE);
- db.Updateable(task).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE }).ExecuteCommand();
+ task.T_END_TIME = DateTime.Now;
+ db.Updateable(task).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE,it.T_END_TIME}).ExecuteCommand();
}
}
--
Gitblit v1.9.1