From f2518583da4cc3d3737986e112b92154535aea4d Mon Sep 17 00:00:00 2001
From: pengmn <pmn@HanInfo>
Date: 星期四, 29 五月 2025 17:32:48 +0800
Subject: [PATCH] 1
---
HH.WCS.Mobox3.HangYang/wms/WCSHelper.cs | 86 +++++++-----------------------------------
1 files changed, 15 insertions(+), 71 deletions(-)
diff --git a/HH.WCS.Mobox3.HangYang/wms/WCSHelper.cs b/HH.WCS.Mobox3.HangYang/wms/WCSHelper.cs
index c909a2e..40afff4 100644
--- a/HH.WCS.Mobox3.HangYang/wms/WCSHelper.cs
+++ b/HH.WCS.Mobox3.HangYang/wms/WCSHelper.cs
@@ -16,7 +16,7 @@
var date = DateTime.Now.ToString("yyMMdd");
return $"TN{date}{id.ToString().PadLeft(4, '0')}";
}
-
+
internal static bool UpdateStatus(WCSTask task, string status)
{
var res = false;
@@ -24,7 +24,7 @@
var lcrList = db.Queryable<LocCntrRel>().Where(a => a.S_CNTR_CODE.Trim() == task.S_CNTR_CODE).First();
task.S_B_STATE = status;
task.S_NOTE = lcrList == null ? task.S_NOTE : lcrList.S_ACTION_SRC;
- db.Updateable(task).UpdateColumns(it => new { it.S_B_STATE,it.S_NOTE }).ExecuteCommand();
+ db.Updateable(task).UpdateColumns(it => new { it.S_B_STATE, it.S_NOTE }).ExecuteCommand();
return res;
}
internal static bool UpdateStatus(WCSTask task)
@@ -44,16 +44,7 @@
db.Updateable(task).UpdateColumns(it => new { it.S_EQ_TASK_CODE, it.T_MODIFY }).ExecuteCommand();
return res;
}
- internal static bool UpdateInfo(WCSTask task, string sourceNo, string endBit, string status)
- {
- var res = false;
- var db = new SqlHelper<WCSTask>().GetInstance();
- task.S_B_STATE = status;
- task.S_OP_CODE = sourceNo;
- task.S_END_LOC = endBit;
- db.Updateable(task).UpdateColumns(it => new { it.S_B_STATE, it.S_OP_CODE, it.S_END_LOC }).ExecuteCommand();
- return res;
- }
+
internal static WCSTask GetTask(string no)
{
var db = new SqlHelper<WCSTask>().GetInstance();
@@ -61,38 +52,12 @@
return task;
}
+
- internal static List<WCSTask> GetTaskBycntrcode(string no)
- {
- var db = new SqlHelper<WCSTask>().GetInstance();
- var task = db.Queryable<WCSTask>().Where(a => a.S_CNTR_CODE.Trim() == no && a.S_B_STATE.Trim() == "瀹屾垚").ToList();
- return task;
- }
- internal static WCSTask GetTaskBySrcNo(string no)
- {
- var db = new SqlHelper<WCSTask>().GetInstance();
- var task = db.Queryable<WCSTask>().Where(a => a.S_OP_CODE == no).First();
- return task;
- }
- internal static List<WCSTask> GetTaskByStart(string bit)
- {
- var db = new SqlHelper<WCSTask>().GetInstance();
- var task = db.Queryable<WCSTask>().Where(a => a.S_START_LOC == bit).ToList();
- return task;
- }
- internal static List<WCSTask> GetTaskByEnd(string bit)
- {
- var db = new SqlHelper<WCSTask>().GetInstance();
- var task = db.Queryable<WCSTask>().Where(a => a.S_END_LOC == bit).ToList();
- return task;
- }
- internal static List<WCSTask> GetTaskByType(string taskType)
- {
- var db = new SqlHelper<WCSTask>().GetInstance();
- return db.Queryable<WCSTask>().Where(a => a.S_TYPE == taskType).ToList();
- }
+
internal static bool CreateTask(string no, string from, string to, string taskType, int pri, string cntrInfo, int cntrCount = 1, int startLayer = 1, int endLayer = 1)
{
+ var whCode = Settings.WHCode;
var fromLoc = LocationHelper.GetLocation(from);
var endLoc = LocationHelper.GetLocation(to);
WCSTask TN_Task = new WCSTask()
@@ -111,8 +76,9 @@
S_CNTR_CODE = cntrInfo,
N_START_LAYER = startLayer,
N_END_LAYER = endLayer,
- N_CNTR_COUNT = cntrCount
-
+ N_CNTR_COUNT = cntrCount,
+ S_START_WH = whCode,
+ S_END_WH = whCode
};
return CreateTask(TN_Task);
@@ -140,10 +106,7 @@
};
return CreateTask(TN_Task);
}
- internal static bool CheckExist(string no)
- {
- return GetTask(no) != null;
- }
+
internal static bool UpdateStatus(string no, int state)
{
var res = false;
@@ -181,14 +144,10 @@
var db = new SqlHelper<WCSTask>().GetInstance();
if (task != null)
{
- 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();
- }
-
+ 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 void End(WCSTask task)
@@ -236,23 +195,8 @@
internal static List<WCSTask> GetTaskListByState(string status)
{
var db = new SqlHelper<object>().GetInstance();
- return db.Queryable<WCSTask>().Where(a => a.S_B_STATE.Trim() == status).OrderBy(s=>s.T_CREATE).ToList();
+ return db.Queryable<WCSTask>().Where(a => a.S_B_STATE.Trim() == status).OrderBy(s => s.T_CREATE).ToList();
}
-
-
-
- internal static List<WCSTask> GetTaskListByState(int state)
- {
- var db = new SqlHelper<object>().GetInstance();
- return db.Queryable<WCSTask>().Where(a => a.N_B_STATE == state).ToList();
- }
- internal static List<WCSTask> GetWaitingTaskList()
- {
- var db = new SqlHelper<object>().GetInstance();
- return db.Queryable<WCSTask>().Where(a => a.N_B_STATE == 0).ToList();
- }
-
-
}
}
--
Gitblit v1.9.1