From baf741a2c65777b70d96b6c5d60204170dd92626 Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期二, 03 六月 2025 17:31:05 +0800
Subject: [PATCH] 出库修改
---
wms/TaskHelper.cs | 73 ++++++++++++++++++++++++++++++------
1 files changed, 61 insertions(+), 12 deletions(-)
diff --git a/wms/TaskHelper.cs b/wms/TaskHelper.cs
index bd314c6..77bc78b 100644
--- a/wms/TaskHelper.cs
+++ b/wms/TaskHelper.cs
@@ -111,7 +111,7 @@
internal static WMSTask GetTaskByStartLoc(string loc)
{
var db = new SqlHelper<WMSTask>().GetInstance();
- var task = db.Queryable<WMSTask>().Where(a => a.S_START_LOC == loc && a.S_B_STATE != "瀹屾垚" && a.S_B_STATE != "鍙栨秷" && a.S_B_STATE != "澶辫触" && a.S_B_STATE != "宸插畬鎴�).OrderByDescending(b => b.T_CREATE).First();
+ var task = db.Queryable<WMSTask>().Where(a => a.S_START_LOC == loc && a.S_B_STATE != "瀹屾垚" && a.S_B_STATE != "鍙栨秷" && a.S_B_STATE != "澶辫触" && a.S_B_STATE != "宸插畬鎴� && a.S_B_STATE != "鏈墽琛�).OrderByDescending(b => b.T_CREATE).First();
return task;
}
/// <summary>
@@ -122,7 +122,7 @@
internal static WMSTask GetTaskByEndLoc(string loc)
{
var db = new SqlHelper<WMSTask>().GetInstance();
- var task = db.Queryable<WMSTask>().Where(a => a.S_END_LOC == loc && a.S_B_STATE != "瀹屾垚" && a.S_B_STATE != "鍙栨秷" && a.S_B_STATE != "澶辫触" && a.S_B_STATE != "宸插畬鎴�).OrderByDescending(b => b.T_CREATE).First();
+ var task = db.Queryable<WMSTask>().Where(a => a.S_END_LOC == loc && a.S_B_STATE != "瀹屾垚" && a.S_B_STATE != "鍙栨秷" && a.S_B_STATE != "澶辫触" && a.S_B_STATE != "宸插畬鎴� && a.S_B_STATE != "鏈墽琛�).OrderByDescending(b => b.T_CREATE).First();
return task;
}
@@ -723,15 +723,15 @@
LocationHelper.LockLoc(task.S_END_LOC, "鍑哄簱閿�, 2);
}
- if (task.S_TYPE.Contains("鍑哄簱")&&task.S_SCHEDULE_TYPE.Contains("agv") )
- {
- var location = db.Queryable<Location>().Where(a => a.S_CODE == task.S_END_LOC).First();
- location.N_CURRENT_NUM = 0;
- db.Updateable(location).UpdateColumns(it => new { it.N_CURRENT_NUM}).ExecuteCommand();
- db.Deleteable<Container>().Where(it => it.S_CODE == task.S_CNTR_CODE).ExecuteCommand();
- db.Deleteable<LocCntrRel>().Where(it => it.S_CNTR_CODE == task.S_CNTR_CODE).ExecuteCommand();
- db.Deleteable<CntrItemRel>().Where(it => it.S_CNTR_CODE == task.S_CNTR_CODE).ExecuteCommand();
- }
+ //if (task.S_TYPE.Contains("鍑哄簱")&&task.S_SCHEDULE_TYPE.Contains("agv") )
+ //{
+ // var location = db.Queryable<Location>().Where(a => a.S_CODE == task.S_END_LOC).First();
+ // location.N_CURRENT_NUM = 0;
+ // db.Updateable(location).UpdateColumns(it => new { it.N_CURRENT_NUM}).ExecuteCommand();
+ // db.Deleteable<Container>().Where(it => it.S_CODE == task.S_CNTR_CODE).ExecuteCommand();
+ // db.Deleteable<LocCntrRel>().Where(it => it.S_CNTR_CODE == task.S_CNTR_CODE).ExecuteCommand();
+ // db.Deleteable<CntrItemRel>().Where(it => it.S_CNTR_CODE == task.S_CNTR_CODE).ExecuteCommand();
+ //}
}
@@ -861,6 +861,56 @@
}
+ /// <summary>
+ /// 鏍规嵁浣滀笟缂栫爜鍜岃澶囩被鍨嬭幏鍙栧崟涓换鍔�+ /// </summary>
+ /// <param name="state"></param>
+ /// <returns></returns>
+ internal static WMSTask GetTaskByWork(string eq, string opCode)
+ {
+ try
+ {
+ var db = new SqlHelper<object>().GetInstance();
+ return db.Queryable<WMSTask>().Where(a => a.S_SCHEDULE_TYPE.Contains(eq) && a.S_OP_CODE.Contains(opCode)).First();
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Error(ex.Message, ex);
+ return new WMSTask();
+ }
+
+ }
+
+ /// <summary>
+ /// 杩斿洖褰撳墠鎺ラ┏浣嶆墽琛屼腑浠诲姟鏁伴噺
+ /// </summary>
+ internal static int GetConnectionTask(string Connection)
+ {
+ var db = new SqlHelper<object>().GetInstance();
+
+
+ var ConnectionList = 0;
+ ConnectionList = db.Queryable<WMSTask>().Where(a => a.S_END_LOC.Contains(Connection) && a.S_TYPE.Contains("鍑哄簱") && a.S_B_STATE != "瀹屾垚" && a.S_B_STATE != "鍙栨秷" && a.S_B_STATE != "鏈墽琛�).ToList().Count();
+
+ return ConnectionList;
+ }
+
+
+ //internal static bool CreateAgvState(AgvState agvState)
+ //{
+ // try
+ // {
+ // var db = new SqlHelper<object>().GetInstance();
+
+ // return db.Insertable<AgvState>(agvState).ExecuteCommand() > 0;
+ // }
+ // catch (Exception ex)
+ // {
+ // LogHelper.Info($"娣诲姞Agv鍔ㄤ綔缂撳瓨寮傚父" + ex.Message, "NDC");
+ // throw;
+ // }
+ //}
+
internal static bool CreateMesKtTask(MesKtTask cntr)
{
@@ -872,7 +922,6 @@
}
catch (Exception ex)
{
- Console.WriteLine(ex.Message);
LogHelper.Info($"娣诲姞Mes绌烘墭缂撳瓨寮傚父" + ex.Message, "Mes浠诲姟涓嬪彂");
throw;
}
--
Gitblit v1.9.1