From 79db8fda0f71b65dfe1e1c72f307b29efc565126 Mon Sep 17 00:00:00 2001
From: lss <2538410689@qq.com>
Date: 星期一, 04 八月 2025 17:31:22 +0800
Subject: [PATCH] 111
---
HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/wms/WCSHelper.cs | 56 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 7 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/wms/WCSHelper.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/wms/WCSHelper.cs
index 8ffeb37..6d12d3e 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/wms/WCSHelper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/wms/WCSHelper.cs
@@ -20,7 +20,9 @@
{
var res = false;
var db = new SqlHelper<WCSTask>().GetInstance();
+
task.S_B_STATE = status;
+
db.Updateable(task).UpdateColumns(it => new { it.S_B_STATE }).ExecuteCommand();
return res;
}
@@ -68,6 +70,26 @@
string[] statue = new string[] { "瀹屾垚", "鍙栨秷", "閿欒" };
var task = db.Queryable<WCSTask>().Where(a => a.S_START_LOC.Trim() == loc && !statue.Contains(a.S_B_STATE.Trim())).First();
return task;
+ }
+
+ /// <summary>
+ /// 鏍规嵁缁堢偣搴撳尯鏌ユ壘鏈畬鎴愮殑浠诲姟鏁伴噺
+ /// </summary>
+ /// <param name="loc"></param>
+ /// <returns></returns>
+ internal static int GetTaskByEndArea(string area, string locType = null)
+ {
+ var db = new SqlHelper<WCSTask>().GetInstance();
+ string[] statue = new string[] { "瀹屾垚", "鍙栨秷", "閿欒" };
+ if (string.IsNullOrEmpty(locType))
+ {
+ return db.Queryable<WCSTask>().Where(a => a.S_END_AREA.Trim() == area && !statue.Contains(a.S_B_STATE.Trim())).Count();
+ }
+ else
+ {
+ return db.Queryable<WCSTask>().Where(a => a.S_END_AREA.Trim() == area && !statue.Contains(a.S_B_STATE.Trim())&&a.S_END_LOC.Contains(locType)).Count();
+ }
+
}
/// <summary>
/// 鏍规嵁鎵樼洏缂栫爜鑾峰彇瀹屾垚鐨勪换鍔�@@ -169,9 +191,12 @@
}
return res;
}
+ public static object _add;
internal static bool AddActionRecord(string no, int state, string forkliftNo, string extData)
{
+
var db = new SqlHelper<TaskAction>().GetInstance();
+
var action = new TaskAction()
{
N_ACTION_CODE = state,
@@ -181,6 +206,8 @@
S_DATA = extData
};
return db.Insertable(action).ExecuteCommand() > 0;
+
+
}
internal static bool CheckActionRecordExist(string no, int code)
{
@@ -198,8 +225,23 @@
task.S_B_STATE = WCSTask.GetStateStr(task.N_B_STATE);
task.T_START_TIME = DateTime.Now;
task.S_WORKSHOP_NO = agvno;
- db.Updateable(task).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE, it.T_START_TIME, it.S_WORKSHOP_NO }).ExecuteCommand();
+ db.Updateable(task).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE, it.S_WORKSHOP_NO }).ExecuteCommand();
}
+
+ }
+ }
+
+ internal static void UpdateAgvNo(WCSTask task, string agvno)
+ {
+ var db = new SqlHelper<WCSTask>().GetInstance();
+ if (task != null)
+ {
+
+
+ task.T_START_TIME = DateTime.Now;
+ task.S_WORKSHOP_NO = agvno;
+ db.Updateable(task).UpdateColumns(it => new { it.T_START_TIME, it.S_WORKSHOP_NO }).ExecuteCommand();
+
}
}
@@ -245,12 +287,12 @@
Startmodel.S_LOCK_STATE = Location.GetLockStateStr(2);
res = db.Updateable(Startmodel).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE }).ExecuteCommand() > 0;
}
- else
- {
- LogHelper.Info($"浠诲姟:{TN_Task.S_CODE}鐢熸垚澶辫触,璧风偣璐т綅涓嶅彲鐢�);
- db.RollbackTran();
- return false;
- }
+ //else
+ //{
+ // LogHelper.Info($"浠诲姟:{TN_Task.S_CODE}鐢熸垚澶辫触,璧风偣璐т綅涓嶅彲鐢�);
+ // db.RollbackTran();
+ // return false;
+ //}
if (Endmodel != null && Endmodel.S_LOCK_STATE.Trim() == "鏃�)
{
Endmodel.N_LOCK_STATE = 1;
--
Gitblit v1.9.1