From 2d2d6bf8565f5b89fc9ee054bf6e62f9592f8673 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期一, 23 六月 2025 08:37:37 +0800
Subject: [PATCH] 1
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 177 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 90 insertions(+), 87 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 5ce308e..51a7022 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"
@@ -46,11 +46,15 @@
using WIDESEAWCS_Core.Utilities;
using WIDESEAWCS_DTO.Enum;
using WIDESEAWCS_DTO.TaskInfo;
+using WIDESEAWCS_IBasicInfoRepository;
+using WIDESEAWCS_IBasicInfoService;
using WIDESEAWCS_ITaskInfoRepository;
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
+using WIDESEAWCS_QuartzJob;
using WIDESEAWCS_QuartzJob.Models;
using WIDESEAWCS_QuartzJob.Service;
+using WIDESEAWCS_TaskInfoRepository;
using static Microsoft.IO.RecyclableMemoryStreamManager;
namespace WIDESEAWCS_TaskInfoService
@@ -62,6 +66,7 @@
private readonly ITaskExecuteDetailRepository _taskExecuteDetailRepository;
private readonly ITask_HtyService _task_HtyService;
private readonly IMapper _mapper;
+ private readonly IDt_StationManagerRepository _stationManagerRepository;
private Dictionary<string, OrderByType> _taskOrderBy = new()
@@ -75,14 +80,16 @@
public List<int> TaskInboundTypes => typeof(TaskInboundTypeEnum).GetEnumIndexList();
public List<int> TaskOutboundTypes => typeof(TaskOutboundTypeEnum).GetEnumIndexList();
+ public List<int> AGVTaskTypes => typeof(AGVTaskTypeEnum).GetEnumIndexList();
- public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper, ITask_HtyService task_HtyService) : base(BaseDal)
+ public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper, ITask_HtyService task_HtyService, IDt_StationManagerRepository stationManagerRepository) : base(BaseDal)
{
_routerService = routerService;
_taskExecuteDetailService = taskExecuteDetailService;
_taskExecuteDetailRepository = taskExecuteDetailRepository;
_task_HtyService = task_HtyService;
_mapper = mapper;
+ _stationManagerRepository = stationManagerRepository;
}
/// <summary>
@@ -90,13 +97,19 @@
/// </summary>
/// <param name="taskDTOs">WMS浠诲姟瀵硅薄闆嗗悎</param>
/// <returns>杩斿洖澶勭悊缁撴灉</returns>
- public WebResponseContent ReceiveWMSTask(Dt_Task taskDTOs)
+ public WebResponseContent ReceiveWMSTask([NotNull] List<Dt_Task> taskDTOs)
{
WebResponseContent content = new WebResponseContent();
try
- {
-
- BaseDal.AddData(taskDTOs);
+ {// 鍒涘缓涓�涓狣t_Task绫诲瀷鐨勫垪琛ㄧ敤浜庡瓨鍌ㄨ浆鎹㈠悗鐨勪换鍔℃暟鎹�
+ List<Dt_Task> tasks = new List<Dt_Task>();
+ // 閬嶅巻浼犲叆鐨刉MSTaskDTO鍒楄〃
+ foreach (var item in taskDTOs)
+ {
+ tasks.Add(item);
+ }
+ BaseDal.AddData(tasks);
+ _taskExecuteDetailService.AddTaskExecuteDetail(tasks.Select(x => x.TaskNum).ToList(), "鎺ユ敹WMS浠诲姟");
content = WebResponseContent.Instance.OK("鎴愬姛");
}
catch (Exception ex)
@@ -110,15 +123,68 @@
return content;
}
+ public WebResponseContent AddTask(WMSTaskDTO WMSDTO)
+ {
+ var SourceAddress= _stationManagerRepository.QueryFirst(x=>x.stationCode == WMSDTO.SourceAddress&&x.stationArea==int.Parse( WMSDTO.Area));
+ var TargetAddress = _stationManagerRepository.QueryFirst(x=>x.stationCode == WMSDTO.TargetAddress && x.stationArea == int.Parse(WMSDTO.Area));
+ if(SourceAddress == null || TargetAddress == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒拌捣鐐规垨缁堢偣绔欏彴淇℃伅,璧风偣:銆恵WMSDTO.SourceAddress}銆�,缁堢偣:銆恵WMSDTO.TargetAddress}銆�");
+ }
+ if (QueryConveyorLineTask(SourceAddress.stationName) != null)
+ {
+ return WebResponseContent.Instance.Error($"璧风偣:銆恵WMSDTO.SourceAddress}銆戝瓨鍦ㄤ换鍔�"); ;
+ }
+ if (QueryConveyorLineTask(TargetAddress.stationName) != null)
+ {
+ return WebResponseContent.Instance.Error($"缁堢偣:銆恵WMSDTO.TargetAddress}銆戝瓨鍦ㄤ换鍔�"); ;
+ }
+ Dt_Task taskDTO = new Dt_Task()
+ {
+ TaskNum = BaseDal.GetTaskNo().Result,
+ Grade = 1,
+ Roadway = SourceAddress.stationArea.ToString(),
+ SourceAddress = SourceAddress.stationName,
+ CurrentAddress = SourceAddress.stationName,
+ TargetAddress = TargetAddress.stationName,
+ NextAddress = TargetAddress.stationName,
+ TaskState = (int)AGVTaskStatusEnum.AGVNew,
+ TaskType = (int)AGVTaskTypeEnum.AGVCarry,
+ AGVName = SourceAddress.stationArea switch
+ {
+ 1 => "AGV01",
+ 4 => "AGV03",
+ _ => "AGV02",
+ }
+ };
+ ReceiveWMSTask(new List<Dt_Task> { taskDTO });
+ return WebResponseContent.Instance.OK("浠诲姟娣诲姞鎴愬姛");
+ }
+
/// <summary>
/// 鏌ユ壘璇ョ珯鍙版槸鍚︽湁浠诲姟
/// </summary>
/// <param name="deviceNo">璁惧缂栧彿</param>
/// <param name="currentAddress">褰撳墠鍦板潃</param>
/// <returns></returns>
- public List<string> QueryConveyorLineTaskSourceAddress()
+ public List<string> QueryConveyorLineTask()
{
- return BaseDal.QueryData().Select(task => task.SourceAddress).ToList();
+ var query = BaseDal.QueryData();
+ return query.SelectMany(x =>
+ new[] { x.SourceAddress, x.TargetAddress }
+ .Where(address => !string.IsNullOrEmpty(address)))
+ .ToList();
+ }
+
+ /// <summary>
+ /// 鏌ユ壘璇ョ珯鍙版槸鍚︽湁浠诲姟
+ /// </summary>
+ /// <param name="deviceNo">璁惧缂栧彿</param>
+ /// <param name="currentAddress">褰撳墠鍦板潃</param>
+ /// <returns></returns>
+ public Dt_Task QueryConveyorLineTask(string stationName)
+ {
+ return BaseDal.QueryFirst(x => x.SourceAddress == stationName||x.TargetAddress==stationName);
}
/// <summary>
@@ -150,22 +216,9 @@
return content;
}
- /// <summary>
- /// 鏌ユ壘鏄惁鏈変换鍔″彲浠ユ斁鍦ㄨ浣嶇疆
- /// </summary>
- /// <param name="deviceNo">璁惧缂栧彿</param>
- /// <param name="currentAddress">褰撳墠鍦板潃</param>
- /// <returns></returns>
- public Dt_Task QueryConveyorLineTaskRoadway(int agvarea)
+ public bool QueryConveyorLinetaeersuadd(string stationName)
{
- return BaseDal.QueryFirst(x => x.Roadway == agvarea.ToString() && x.MaterialType == (int)AgvStationEnum.BoardUnload && x.TargetAddress =="");
-
- }
-
-
- public bool QueryConveyorLinetaeersuadd(string taeersuadd)
- {
- Dt_Task dt_= BaseDal.QueryFirst(x => x.SourceAddress == taeersuadd || x.TargetAddress == taeersuadd);
+ Dt_Task dt_= BaseDal.QueryFirst(x => x.SourceAddress == stationName || x.TargetAddress == stationName);
if(dt_==null) return true;
else return false;
@@ -211,11 +264,11 @@
/// <returns></returns>
public Dt_Task? QuertStackerCraneTask(string deviceNo, TaskTypeGroup? taskTypeGroup = null)
{
- if(taskTypeGroup == null)
+ if (taskTypeGroup == null)
return BaseDal.QueryFirst(x => x.Roadway == deviceNo && (TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.Line_InFinish || TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.OutNew), TaskOrderBy);
- if(taskTypeGroup.Value == TaskTypeGroup.InboundGroup)
+ if (taskTypeGroup.Value == TaskTypeGroup.InboundGroup)
return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.Line_InFinish, TaskOrderBy);
- if(taskTypeGroup.Value == TaskTypeGroup.OutbondGroup)
+ if (taskTypeGroup.Value == TaskTypeGroup.OutbondGroup)
return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.OutNew, TaskOrderBy);
return null;
}
@@ -228,7 +281,7 @@
/// <returns>杩斿洖浠诲姟瀹炰綋瀵硅薄锛屽彲鑳戒负null</returns>
public Dt_Task QueryStackerCraneTask(string deviceNo, string currentAddress = "")
{
- return BaseDal.QueryFirst(x => x.TaskState == (int)TaskOutStatusEnum.OutNew && (deviceNo == "AGV01" ? x.Roadway == AgvareaEnum.AreaOne.ToString() : x.Roadway != AgvareaEnum.AreaOne.ToString()),TaskOrderBy);
+ return BaseDal.QueryFirst(x => x.TaskState == (int)AGVTaskStatusEnum.AGVNew && x.AGVName == deviceNo, TaskOrderBy);
}
@@ -382,55 +435,23 @@
try
{
int oldState = task.TaskState;
- if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
+ if (task.TaskType == (int)AGVTaskTypeEnum.AGVCarry)
{
- if (task.TaskState >= (int)TaskOutStatusEnum.OutFinish)
+ if (task.TaskState >= (int)AGVTaskStatusEnum.AGVFinish)
{
return content = WebResponseContent.Instance.Error($"璇ヤ换鍔＄姸鎬佷笉鍙烦杞埌涓嬩竴姝�,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskState}銆�");
}
- int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskOutStatusEnum>();
-
+ int nextStatus = task.TaskState.GetNextNotCompletedStatus<AGVTaskStatusEnum>();
task.TaskState = nextStatus;
- if (task.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting)
+ if (task.TaskState == (int)AGVTaskStatusEnum.AGV_Executing)
{
task.Dispatchertime = DateTime.Now;
}
- }
- else if (task.TaskType == (int)TaskInboundTypeEnum.Inbound)
- {
- if (task.TaskState >= (int)TaskInStatusEnum.InFinish)
+ if (task.TaskState == (int)AGVTaskStatusEnum.AGVFinish)
{
- return content = WebResponseContent.Instance.Error($"璇ヤ换鍔＄姸鎬佷笉鍙烦杞埌涓嬩竴姝�,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskState}銆�");
- }
-
- int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
- task.TaskState = nextStatus;
- if (task.TaskState == (int)TaskInStatusEnum.SC_InExecuting)
- {
- task.Dispatchertime = DateTime.Now;
- }
- if (task.TaskState == (int)TaskRelocationTypeEnum.Relocation)
- {
- Random random = new Random();
- task.CurrentAddress = task.NextAddress;
- task.NextAddress = $"{random.Next(1, 100).ToString().PadLeft(3, '0')}-{random.Next(1, 100).ToString().PadLeft(3, '0')}-{random.Next(1, 100).ToString().PadLeft(3, '0')}";
- task.TargetAddress = task.NextAddress;
- }
- }
- else if (task.TaskType == (int)TaskInboundTypeEnum.Inbound)
- {
- if (task.TaskState <= (int)TaskRelocationStatusEnum.SC_RelocationFinish)
- {
-
- return content = WebResponseContent.Instance.Error($"璇ヤ换鍔＄姸鎬佷笉鍙烦杞埌涓嬩竴姝�,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskState}銆�");
- }
-
- int nextStatus = (int)TaskRelocationStatusEnum.SC_RelocationExecuting;
- task.TaskState = nextStatus;
- if (task.TaskState == (int)TaskRelocationStatusEnum.SC_RelocationExecuting)
- {
- task.Dispatchertime = DateTime.Now;
+ content = StackCraneTaskCompleted(task.TaskNum);
+ return content;
}
}
else
@@ -443,7 +464,7 @@
return content = WebResponseContent.Instance.Error($"璇ヤ换鍔＄姸鎬佷笉鍙烦杞埌涓嬩竴姝�,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskState}銆�");
}
-
+
task.ModifyDate = DateTime.Now;
task.Modifier = "System";
BaseDal.UpdateData(task);
@@ -503,31 +524,13 @@
Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
if (task == null) return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}銆�");
- if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound && task.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting)
+ if ( task.TaskState == (int)AGVTaskStatusEnum.AGV_Executing)
{
- /*List<Dt_Router> routers = _routerService.QueryNextRoutes(task.NextAddress, task.TargetAddress);
- if (!routers.Any()) return WebResponseContent.Instance.Error($"鏈壘鍒拌澶囪矾鐢变俊鎭�");*/
-
- task.TaskState = (int)TaskOutStatusEnum.OutFinish;
+ task.TaskState = (int)AGVTaskStatusEnum.AGVFinish;
task.ModifyDate = DateTime.Now;
BaseDal.DeleteData(task);
_task_HtyService.AddTaskHty(task);
- _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍑哄簱瀹屾垚");
- //todo 鍚屾鍒癢MS
-
- //鏆備笉鑰冭檻澶氫釜鍑哄簱鍙�
- }
- else if (task.TaskType == (int)TaskInboundTypeEnum.Inbound && task.TaskState == (int)TaskInStatusEnum.SC_InExecuting)
- {
- //todo
- //int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
- task.TaskState = (int)TaskInStatusEnum.InFinish;
- task.ModifyDate = DateTime.Now;
- task.Modifier = "System";
- BaseDal.DeleteData(task);
- _task_HtyService.AddTaskHty(task);
- _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍏ュ簱瀹屾垚");
-
+ _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"AGV鎼繍瀹屾垚瀹屾垚");
}
else
{
--
Gitblit v1.9.3