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 | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 insertions(+), 1 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 9a3b574..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()
@@ -77,13 +82,14 @@
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>
@@ -117,6 +123,44 @@
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>
--
Gitblit v1.9.3