From c1eac732fc3ef407d51b76d288f311d2fa43e618 Mon Sep 17 00:00:00 2001
From: xby-y <2251528873@qq.com>
Date: 星期一, 12 一月 2026 15:18:41 +0800
Subject: [PATCH] 1
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 97 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 87 insertions(+), 10 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 9181cac..7ff9f2f 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"
@@ -1,4 +1,4 @@
-锘�#region << 鐗� 鏈� 娉� 閲� >>
+#region << 鐗� 鏈� 娉� 閲� >>
/*----------------------------------------------------------------
* 鍛藉悕绌洪棿锛歐IDESEAWCS_TaskInfoService
* 鍒涘缓鑰咃細鑳＄搴�
@@ -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>
@@ -407,9 +409,14 @@
//int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskOutStatusEnum>();
-
- task.TaskState = (int)TaskOutStatusEnum.SC_OutExecuting;
-
+ if (task.TaskState ==(int)TaskOutStatusEnum.SC_OutFinish)
+ {
+ task.TaskState = (int)TaskOutStatusEnum.Line_OutFinish;
+ }
+ else
+ {
+ task.TaskState = (int)TaskOutStatusEnum.SC_OutExecuting;
+ }
task.Dispatchertime = DateTime.Now;
}
else if (task.TaskType == (int)TaskInboundTypeEnum.Inbound)
@@ -444,7 +451,11 @@
task.ModifyDate = DateTime.Now;
task.Modifier = "System";
- BaseDal.UpdateData(task);
+ bool res = BaseDal.UpdateData(task);
+ if (!res)
+ {
+ return content = WebResponseContent.Instance.Error($"鏇存柊浠诲姟淇℃伅澶辫触,浠诲姟鍙�:銆恵task.TaskNum}銆�");
+ }
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, App.User.UserId > 0 ? $"浜哄伐鎵嬪姩灏嗕换鍔＄姸鎬佷粠銆恵oldState}銆戣烦杞埌銆恵task.TaskState}銆�" : $"绯荤粺鑷姩娴佺▼锛屼换鍔＄姸鎬佷粠銆恵oldState}銆戣浆鍒般�恵task.TaskState}銆�");
@@ -629,6 +640,9 @@
{
task.TaskState = (int)TaskOutStatusEnum.SC_OutFinish;
bool res = BaseDal.UpdateData(task);
+ // 娣诲姞鍏ュ簱鍘嗗彶璁板綍
+ //AddTaskHistory(task);
+
return res;
}
@@ -642,7 +656,7 @@
BaseDal.UpdateData(task);
// 娣诲姞鍏ュ簱鍘嗗彶璁板綍
- // _task_HtyService.AddTaskHty(task);
+ _taskHtyService.AddTaskHistory(task);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, "鍏ュ簱瀹屾垚");
// 鍏ュ簱瀹屾垚鍚庡垹闄や换鍔�
@@ -660,7 +674,7 @@
BaseDal.UpdateData(task);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, "绉诲簱瀹屾垚");
-
+ //AddTaskHistory(task);
// 绉诲簱瀹屾垚鍚庡垹闄や换鍔�
bool res = BaseDal.DeleteData(task);
// _task_HtyService.AddTaskHty(task);
@@ -849,7 +863,7 @@
public Dt_Task GetOutTaskInfo2(string PalletCode)
{
- return BaseDal.QueryFirst(x => x.PalletCode == PalletCode && x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish, TaskOrderBy);
+ return BaseDal.QueryFirst(x => x.PalletCode == PalletCode && x.TaskState == (int)TaskOutStatusEnum.Line_OutFinish, TaskOrderBy);
}
public List<Dt_Task> QueryStackerCraneYKTasks(string deviceNo)
@@ -857,5 +871,68 @@
return BaseDal.QueryData(x => x.Roadway == deviceNo && x.TaskType == (int)TaskRelocationTypeEnum.Relocation && x.TaskState == (int)TaskRelocationStatusEnum.RelocationNew, TaskOrderBy);
}
+
+ public WebResponseContent WCSCancelinventory(int 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();
+
+ }
+
+ /// <summary>
+ /// 娣诲姞鍘嗗彶浠诲姟璁板綍锛堥潤鎬佹柟娉曪級
+ /// </summary>
+ /// <param name="task">浠诲姟瀵硅薄</param>
+ /// <returns>鏄惁娣诲姞鎴愬姛</returns>
+ public bool AddTaskHistory(Dt_Task task,string operateType)
+ {
+ try
+ {
+ if (task == null)
+ {
+ return false;
+ }
+
+ // 鍒涘缓浠诲姟鍘嗗彶鏈嶅姟瀹炰緥
+ //var taskHtyService = App.GetService<ITaskHtyService>();
+ //if (taskHtyService == null)
+ //{
+ // return false;
+ //}
+
+ // 娣诲姞鍘嗗彶璁板綍
+ bool result = _taskHtyService.AddTaskHistory(task, operateType);
+
+ return result;
+ }
+ catch (Exception ex)
+ {
+ // 璁板綍寮傚父鏃ュ織
+ Console.WriteLine($"娣诲姞鍘嗗彶浠诲姟璁板綍澶辫触: {ex.Message}");
+ return false;
+ }
+ }
+
+
+ /// <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();
+ }
}
}
--
Gitblit v1.9.3