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 | 48 ++++++++++++++++++++++++++++++++----------------
1 files changed, 32 insertions(+), 16 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..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"
@@ -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>
@@ -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);
@@ -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,14 +898,14 @@
}
// 鍒涘缓浠诲姟鍘嗗彶鏈嶅姟瀹炰緥
- 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;
}
@@ -918,5 +918,21 @@
}
+ /// <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