From 9051d96029c8e860c6e6657b7df2106bfbfdc010 Mon Sep 17 00:00:00 2001
From: chenyong <chenyong@hnkhzn.com>
Date: 星期五, 06 三月 2026 15:20:54 +0800
Subject: [PATCH] 111
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 218 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 190 insertions(+), 28 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 63937d9..4e3383f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -47,7 +47,8 @@
private readonly IRepository<Dt_Router> _routerRepository;
private readonly IRepository<Dt_StationManger> _stationMangerRepository;
private readonly IMapper _mapper;
-
+ private readonly ITaskHtyService _taskHtyService;
+
private Dictionary<string, OrderByType> _taskOrderBy = new()
{
@@ -69,7 +70,7 @@
/// </summary>
public IRepository<Dt_Task> Repository => BaseDal;
- public TaskService(IRepository<Dt_Task> BaseDal, IRouterService routerService, IUnitOfWorkManage unitOfWorkManage, ITaskExecuteDetailService taskExecuteDetailService, IRepository<Dt_TaskExecuteDetail> taskExecuteDetailRepository, IMapper mapper, IRepository<Dt_Router> routerRepository, IRepository<Dt_StationManger> stationMangerRepository) : base(BaseDal)
+ public TaskService(IRepository<Dt_Task> BaseDal, IRouterService routerService, IUnitOfWorkManage unitOfWorkManage, ITaskExecuteDetailService taskExecuteDetailService, IRepository<Dt_TaskExecuteDetail> taskExecuteDetailRepository, IMapper mapper, IRepository<Dt_Router> routerRepository, IRepository<Dt_StationManger> stationMangerRepository, ITaskHtyService taskHtyService) : base(BaseDal)
{
_routerService = routerService;
_taskExecuteDetailService = taskExecuteDetailService;
@@ -78,6 +79,7 @@
_mapper = mapper;
_routerRepository = routerRepository;
_stationMangerRepository = stationMangerRepository;
+ _taskHtyService = taskHtyService;
}
/// <summary>
@@ -197,7 +199,7 @@
/// <returns></returns>
public Dt_Task QueryConveyorLineTask(string deviceNo, string currentAddress)
{
- return BaseDal.QueryFirst(x => (TaskInboundTypes.Contains(x.TaskType) && TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish) && x.CurrentAddress == currentAddress, TaskOrderBy);
+ return BaseDal.QueryFirst(x => (TaskInboundTypes.Contains(x.TaskType) && TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish) && x.CurrentAddress == currentAddress, TaskOrderBy);
}
/// <summary>
@@ -233,7 +235,7 @@
if (taskTypeGroup.Value == TaskTypeGroup.InboundGroup)
return BaseDal.QueryFirst(x => x.DeviceCode == deviceNo && TaskInboundTypes.Contains(x.TaskType), TaskOrderBy);
if (taskTypeGroup.Value == TaskTypeGroup.OutbondGroup)
- return BaseDal.QueryFirst(x => x.DeviceCode == deviceNo && TaskOutboundTypes.Contains(x.TaskType) , TaskOrderBy);
+ return BaseDal.QueryFirst(x => x.DeviceCode == deviceNo && TaskOutboundTypes.Contains(x.TaskType), TaskOrderBy);
return null;
}
/// <summary>
@@ -293,7 +295,7 @@
/// <returns>杩斿洖浠诲姟瀹炰綋瀵硅薄锛屽彲鑳戒负null</returns>
public Dt_Task QueryStackerCraneInTask(string deviceNo, string currentAddress = "")
{
- return BaseDal.QueryFirst(x => x.Roadway == deviceNo && x.TaskType== (int)TaskInboundTypeEnum.Inbound && x.TaskState == (int)TaskInStatusEnum.Line_InFinish, TaskOrderBy);
+ return BaseDal.QueryFirst(x => x.Roadway == deviceNo && x.TaskType == (int)TaskInboundTypeEnum.Inbound && x.TaskState == (int)TaskInStatusEnum.Line_InFinish, TaskOrderBy);
}
/// <summary>
@@ -304,7 +306,7 @@
/// <returns>杩斿洖浠诲姟瀹炰綋瀵硅薄锛屽彲鑳戒负null</returns>
public Dt_Task QueryStackerCraneOutTask(string deviceNo, string currentAddress = "")
{
- return BaseDal.QueryFirst(x => x.Roadway == deviceNo && x.TaskType==(int)TaskOutboundTypeEnum.Outbound && x.TaskState == (int)TaskOutStatusEnum.OutNew, TaskOrderBy);
+ return BaseDal.QueryFirst(x => x.Roadway == deviceNo && x.TaskType == (int)TaskOutboundTypeEnum.Outbound && x.TaskState == (int)TaskOutStatusEnum.OutNew, TaskOrderBy);
}
/// <summary>
@@ -407,7 +409,7 @@
//int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskOutStatusEnum>();
- if (task.TaskState ==(int)TaskOutStatusEnum.SC_OutFinish)
+ if (task.TaskState == (int)TaskOutStatusEnum.SC_OutFinish)
{
task.TaskState = (int)TaskOutStatusEnum.Line_OutFinish;
}
@@ -449,7 +451,7 @@
task.ModifyDate = DateTime.Now;
task.Modifier = "System";
- bool res = BaseDal.UpdateData(task);
+ bool res = BaseDal.UpdateData(task);
if (!res)
{
return content = WebResponseContent.Instance.Error($"鏇存柊浠诲姟淇℃伅澶辫触,浠诲姟鍙�:銆恵task.TaskNum}銆�");
@@ -570,10 +572,10 @@
if (task == null) return false;
// 楠岃瘉浠诲姟鐘舵�佹槸鍚﹀厑璁稿畬鎴�
- if (!IsTaskStateValidForCompletion(task))return false;
+ if (!IsTaskStateValidForCompletion(task)) return false;
// 鏍规嵁浠诲姟绫诲瀷澶勭悊
- res = ProcessTaskCompletion(task);
+ res = ProcessTaskCompletion(task);
}
catch (Exception ex)
{
@@ -654,9 +656,8 @@
BaseDal.UpdateData(task);
// 娣诲姞鍏ュ簱鍘嗗彶璁板綍
- // _task_HtyService.AddTaskHty(task);
+ _taskHtyService.AddTaskHistory(task);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, "鍏ュ簱瀹屾垚");
- //AddTaskHistory(task);
// 鍏ュ簱瀹屾垚鍚庡垹闄や换鍔�
bool res = BaseDal.DeleteData(task);
@@ -692,7 +693,7 @@
if (!response.Status)
{
// 璁板綍閫氱煡澶辫触鏃ュ織锛屼絾涓嶅奖鍝嶄富娴佺▼
- //_logger.Warn($"浠诲姟瀹屾垚閫氱煡澶辫触,浠诲姟鍙�:銆恵taskNum}銆�,鍝嶅簲:銆恵response.Message}銆�");
+ //_logger.Warn($"浠诲姟瀹屾垚閫氱煡澶辫触,浠诲姟鍙�:銆恵taskNum}銆�,鍝嶅簲:銆恵response.Message}銆�");
}
}
catch (Exception ex)
@@ -798,7 +799,7 @@
{
try
{
- Dt_Task task = BaseDal.QueryFirst(x => x.PalletCode == Pallat && x.SourceAddress== StationCode);
+ Dt_Task task = BaseDal.QueryFirst(x => x.PalletCode == Pallat && x.SourceAddress == StationCode);
if (task != null)
{
task.TaskState = (int)TaskInStatusEnum.Line_InFinish;
@@ -857,7 +858,7 @@
public Dt_Task GetOutTaskInfo(string PLCaddress)
{
- return BaseDal.QueryFirst(x => x.TargetAddress== PLCaddress && x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish, TaskOrderBy);
+ return BaseDal.QueryFirst(x => x.TargetAddress == PLCaddress && x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish, TaskOrderBy);
}
public Dt_Task GetOutTaskInfo2(string PalletCode)
@@ -874,12 +875,11 @@
public WebResponseContent WCSCancelinventory(int taskNum)
{
//鏌ヨ浠诲姟淇℃伅
- Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
- if (task == null) return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}銆�");
+ Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum && (x.TaskState == TaskOutStatusEnum.OutNew.ObjToInt() || x.TaskState == TaskRelocationStatusEnum.RelocationNew.ObjToInt() || x.TaskState == TaskInStatusEnum.Line_InExecuting.ObjToInt()));
+ if (task == null) return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}鎴栫姸鎬佷笉瀵广��");
bool taskmsseg = BaseDal.DeleteData(task);
- //bool res = AddTaskHistory(task);
- //return taskmsseg && res ? WebResponseContent.Instance.OK() : WebResponseContent.Instance.Error();
- return null;
+ bool res = AddTaskHistory(task, "鎵嬪姩鍙栨秷");
+ return taskmsseg && res ? WebResponseContent.Instance.OK() : WebResponseContent.Instance.Error();
}
@@ -888,7 +888,7 @@
/// </summary>
/// <param name="task">浠诲姟瀵硅薄</param>
/// <returns>鏄惁娣诲姞鎴愬姛</returns>
- public static bool AddTaskHistory(Dt_Task task)
+ public bool AddTaskHistory(Dt_Task task, string operateType)
{
try
{
@@ -898,15 +898,15 @@
}
// 鍒涘缓浠诲姟鍘嗗彶鏈嶅姟瀹炰緥
- var taskHtyService = App.GetService<ITaskHtyService>();
- if (taskHtyService == null)
- {
- return false;
- }
+ //var taskHtyService = App.GetService<ITaskHtyService>();
+ //if (taskHtyService == null)
+ //{
+ // return false;
+ //}
// 娣诲姞鍘嗗彶璁板綍
- bool result = taskHtyService.AddTaskHistory(task, "鑷姩瀹屾垚");
-
+ bool result = _taskHtyService.AddTaskHistory(task, operateType);
+
return result;
}
catch (Exception ex)
@@ -918,5 +918,167 @@
}
+ /// <summary>
+ /// 鎵嬪姩瀹屾垚鎺ュ彛
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <returns></returns>
+ /// <exception cref="NotImplementedException"></exception>
+
+ public WebResponseContent WCSManualTaskCompleted(int taskNum)
+ {
+ //鏌ヨ浠诲姟淇℃伅
+ Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
+ if (task == null) return WebResponseContent.Instance.OK();
+ bool taskmsseg = BaseDal.DeleteData(task);
+ bool res = AddTaskHistory(task, "鎵嬪姩瀹屾垚");
+ return taskmsseg && res ? WebResponseContent.Instance.OK() : WebResponseContent.Instance.Error();
+ }
+
+ public bool GetYK(string sc)
+ {
+ Dt_Task dt_Task = BaseDal.QueryFirst(x => x.Roadway == sc && x.TaskType == (int)TaskRelocationTypeEnum.Relocation);
+ if (dt_Task != null)
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇宸烽亾浠诲姟杩涘害
+ /// </summary>
+ /// <param name="roadway">宸烽亾缂栧彿</param>
+ /// <returns></returns>
+ public WebResponseContent GetRoadwayTaskProgress(string roadway)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var tasks = BaseDal.QueryData(x => x.Roadway == roadway);
+ var progressInfo = new
+ {
+ roadway = roadway,
+ totalTasks = tasks.Count,
+ inProgressTasks = tasks.Count(t => t.TaskState < (int)TaskStatusEnum.Finish && t.TaskState != (int)TaskStatusEnum.Cancel && t.TaskState != (int)TaskStatusEnum.Exception),
+ completedTasks = tasks.Count(t => t.TaskState == (int)TaskStatusEnum.Finish),
+ cancelledTasks = tasks.Count(t => t.TaskState == (int)TaskStatusEnum.Cancel),
+ exceptionTasks = tasks.Count(t => t.TaskState == (int)TaskStatusEnum.Exception),
+ tasks = tasks.Select(t => new
+ {
+ taskNum = t.TaskNum,
+ taskType = t.TaskType,
+ taskState = t.TaskState,
+ taskStateName = GetTaskStateName(t.TaskState),
+ createDate = t.CreateDate,
+ modifyDate = t.ModifyDate,
+ sourceAddress = t.SourceAddress,
+ targetAddress = t.TargetAddress
+ }).ToList()
+ };
+ content = WebResponseContent.Instance.OK(data: progressInfo);
+ }
+ catch (Exception ex)
+ {
+ content = WebResponseContent.Instance.Error(ex.Message);
+ }
+ return content;
+ }
+
+ /// <summary>
+ /// 鑾峰彇鎵�鏈夊贩閬撲换鍔¤繘搴�
+ /// </summary>
+ /// <returns></returns>
+ public WebResponseContent GetAllRoadwayTaskProgress()
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var allTasks = BaseDal.QueryData();
+ var roadways = allTasks.Select(t => t.Roadway).Distinct().ToList();
+ var progressList = new List<object>();
+
+ foreach (var roadway in roadways)
+ {
+ var roadwayTasks = allTasks.Where(t => t.Roadway == roadway).ToList();
+ progressList.Add(new
+ {
+ roadway = roadway,
+ totalTasks = roadwayTasks.Count,
+ inProgressTasks = roadwayTasks.Count(t => t.TaskState < (int)TaskStatusEnum.Finish && t.TaskState != (int)TaskStatusEnum.Cancel && t.TaskState != (int)TaskStatusEnum.Exception),
+ completedTasks = roadwayTasks.Count(t => t.TaskState == (int)TaskStatusEnum.Finish),
+ cancelledTasks = roadwayTasks.Count(t => t.TaskState == (int)TaskStatusEnum.Cancel),
+ exceptionTasks = roadwayTasks.Count(t => t.TaskState == (int)TaskStatusEnum.Exception)
+ });
+ }
+
+ content = WebResponseContent.Instance.OK(data: progressList);
+ }
+ catch (Exception ex)
+ {
+ content = WebResponseContent.Instance.Error(ex.Message);
+ }
+ return content;
+ }
+
+ /// <summary>
+ /// 鑾峰彇浠诲姟鐘舵�佸悕绉�
+ /// </summary>
+ /// <param name="taskState">浠诲姟鐘舵�佸��</param>
+ /// <returns></returns>
+ private string GetTaskStateName(int taskState)
+ {
+ // 鐩存帴鏍规嵁鐘舵�佸�艰繑鍥炵姸鎬佸悕绉�
+ switch (taskState)
+ {
+ case (int)TaskStatusEnum.New:
+ return "鏂板缓";
+ case (int)TaskStatusEnum.HT_Executing:
+ return "鎻愬崌鏈烘墽琛屼腑";
+ case (int)TaskStatusEnum.SC_Execute:
+ return "鍫嗗灈鏈哄緟鎵ц";
+ case (int)TaskStatusEnum.SC_Executing:
+ return "鍫嗗灈鏈烘墽琛屼腑";
+ case (int)TaskStatusEnum.SC_Finish:
+ return "鍫嗗灈鏈哄畬鎴�";
+ case (int)TaskStatusEnum.Line_Execute:
+ return "杈撻�佺嚎寰呮墽琛�";
+ case (int)TaskStatusEnum.Line_Executing:
+ return "杈撻�佺嚎鎵ц涓�";
+ case (int)TaskStatusEnum.Line_Finish:
+ return "杈撻�佺嚎瀹屾垚";
+ case (int)TaskStatusEnum.RGV_NEW:
+ return "RGV鏂板缓浠诲姟";
+ case (int)TaskStatusEnum.RGV_Execute:
+ return "RGV寰呮墽琛�";
+ case (int)TaskStatusEnum.RGV_Takeing:
+ return "RGV鍙栬揣涓�";
+ case (int)TaskStatusEnum.RGV_Executing:
+ return "RGV鎵ц涓�";
+ case (int)TaskStatusEnum.RGV_WaitToExecute:
+ return "RGV寰呯户缁墽琛�";
+ case (int)TaskStatusEnum.RGV_Puting:
+ return "RGV鏀捐揣涓�";
+ case (int)TaskStatusEnum.RGV_Finish:
+ return "RGV瀹屾垚";
+ case (int)TaskStatusEnum.RGV_TakeError:
+ return "RGV鍙栬揣鍐欏叆寮傚父";
+ case (int)TaskStatusEnum.Finish:
+ return "浠诲姟瀹屾垚";
+ case (int)TaskStatusEnum.Pending:
+ return "浠诲姟鎸傝捣";
+ case (int)TaskStatusEnum.MesPending:
+ return "Mes鍑哄簱鎸傝捣";
+ case (int)TaskStatusEnum.Cancel:
+ return "浠诲姟鍙栨秷";
+ case (int)TaskStatusEnum.Exception:
+ return "浠诲姟寮傚父";
+ default:
+ return "鏈煡鐘舵��";
+ }
+ }
}
}
--
Gitblit v1.9.3