From 201f679225383f21d6fcce0d60d17a1b9c4cd36f Mon Sep 17 00:00:00 2001
From: Admin <Admin@ADMIN>
Date: 星期六, 24 一月 2026 09:49:51 +0800
Subject: [PATCH] 优化巷道逻辑
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
index 4408ee1..e33f81b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
@@ -96,7 +96,7 @@
public WebResponseContent CESTEXT()
{
- WriteLog.Write_Log("鎺ユ敹MES鍏ュ簱浠诲姟涓嬪彂", $"浠诲姟鎺ユ敹鍙傛暟", "鎴愬姛", $"鍙傛暟锛�234jkljsldafjlasdf");
+
return WebResponseContent.Instance.OK();
}
@@ -668,5 +668,42 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
+
+
+
+
+ //浠诲姟鑾峰彇
+ public List<Dt_Task> GetaskQueue(string deviceId)
+ {
+ return BaseDal.QueryData(x => x.Roadway == deviceId && (x.TaskStatus == (int)InTaskStatusEnum.PLC_InFinish || x.TaskStatus == (int)OutTaskStatusEnum.OutNew) && x.NumberSsuances==0);
+ }
+
+ //鑾峰彇褰撳墠鍫嗗灈鏈烘墽琛岀殑浠诲姟
+ public bool CurrentTaskProgress(string deviceId)
+ {
+ int taskcount=BaseDal.QueryData(x => x.Roadway == deviceId && (x.TaskStatus == (int)InTaskStatusEnum.SC_IntExecuting || x.TaskStatus == (int)OutTaskStatusEnum.SC_OutExecuting || x.TaskStatus == (int)RelocationTaskStatusEnum.RelocationExecuting)).Count();
+ if (taskcount == 0) return false;
+ return true;
+ }
+
+ //鑾峰彇鍫嗗灈鏈哄畬鎴愶紝涓嬪彂杈撻�佺嚎鐨勪换鍔�
+ public static List<string> OutSCList = new List<string>() { "1109", "1105", "1210", "1212", "1214" };
+ public List<Dt_Task> GetaskQueuePLC()
+ {
+ return BaseDal.QueryData(x => x.TaskStatus == (int)OutTaskStatusEnum.SC_OutFinish && OutSCList.Contains(x.CurrentAddress));
+ }
+
+ //鑾峰彇鏄惁鏈夌Щ搴撶殑浠诲姟
+ public Dt_Task GeRelocationTaskQueue(string LocationCode)
+ {
+ return BaseDal.QueryData(x => x.TaskStatus == (int)RelocationTaskStatusEnum.RelocationNew && x.CurrentAddress == LocationCode).FirstOrDefault();
+ }
+
+ public bool RelocationTaskProgress(string deviceId)
+ {
+ int taskcount = BaseDal.QueryData(x => x.Roadway == deviceId && (x.TaskStatus == (int)RelocationTaskStatusEnum.RelocationExecuting || x.TaskStatus == (int)RelocationTaskStatusEnum.RelocationNew) ).Count();
+ if (taskcount == 0) return false;
+ return true;
+ }
}
}
--
Gitblit v1.9.3