From 569e91c63636345391f741df049c9374a141a434 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期一, 26 八月 2024 08:57:33 +0800
Subject: [PATCH] 添加路由新建配置，重新导出种子数据
---
WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 174 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 132 insertions(+), 42 deletions(-)
diff --git a/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs b/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
index a4af572..bc199e9 100644
--- a/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
+++ b/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
@@ -15,6 +15,7 @@
*----------------------------------------------------------------*/
#endregion << 鐗� 鏈� 娉� 閲� >>
+using AutoMapper;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using SqlSugar;
using System;
@@ -41,12 +42,14 @@
private readonly IRouterService _routerService;
private readonly ITaskExecuteDetailService _taskExecuteDetailService;
private readonly ITaskExecuteDetailRepository _taskExecuteDetailRepository;
+ private readonly IMapper _mapper;
- public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository) : base(BaseDal)
+ public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper) : base(BaseDal)
{
_routerService = routerService;
_taskExecuteDetailService = taskExecuteDetailService;
_taskExecuteDetailRepository = taskExecuteDetailRepository;
+ _mapper = mapper;
}
/// <summary>
@@ -66,30 +69,18 @@
{
continue;
}
-
- Dt_Task task = new()
- {
- PalletCode = item.PalletCode,
- TaskNum = item.TaskNum,
- Roadway = item.RoadWay,
- TaskType = item.TaskType,
- SourceAddress = item.SourceAddress,
- WMSId = item.Id,
- TargetAddress = item.TargetAddress,
- Grade = item.Grade,
- Creater = "WMS"
- };
-
+ Dt_Task task = _mapper.Map<Dt_Task>(item);
+ task.Creater = "WMS";
if (!int.TryParse(Enum.Parse<TaskOutboundTypeEnum>(task.TaskType.ToString()).ToString(), out int result))
{
- List<Dt_Router> routers = _routerService.QueryNextRoutes(item.SourceAddress, item.TargetAddress);
+ List<Dt_Router> routers = _routerService.QueryNextRoutes(item.RoadWay, item.TargetAddress);
//鏆備笉鑰冭檻澶氳矾寰�
if (routers.Count > 0)
{
task.TaskState = (int)TaskOutStatusEnum.OutNew;
task.CurrentAddress = item.SourceAddress;
task.NextAddress = routers.FirstOrDefault().ChildPosi;
- tasks.Add(task);
+
}
}
else if (!int.TryParse(Enum.Parse<TaskInboundTypeEnum>(task.TaskType.ToString()).ToString(), out result))
@@ -101,18 +92,11 @@
task.TaskState = (int)TaskInStatusEnum.InNew;
task.CurrentAddress = item.SourceAddress;
task.NextAddress = routers.FirstOrDefault().ChildPosi;
- tasks.Add(task);
}
}
else if (!int.TryParse(Enum.Parse<TaskRelocationTypeEnum>(task.TaskType.ToString()).ToString(), out result))
{
- //if ((TaskRelocationTypeEnum)result == TaskRelocationTypeEnum.Relocation)
- //{
- // task.TaskState = (int)TaskOutStatusEnum.OutNew;
- // task.CurrentAddress = item.SourceAddress;
- // task.NextAddress = item.TargetAddress;
- // tasks.Add(task);
- //}
+
}
else if (!int.TryParse(Enum.Parse<TaskOtherTypeEnum>(task.TaskType.ToString()).ToString(), out result))
{
@@ -122,10 +106,12 @@
{
throw new Exception($"鎺ユ敹WMS浠诲姟澶辫触,浠诲姟绫诲瀷閿欒,鏈壘鍒拌浠诲姟绫诲瀷,浠诲姟鍙�:銆恵item.TaskNum}銆�,浠诲姟绫诲瀷:銆恵item.TaskType}銆�");
}
-
+ tasks.Add(task);
}
BaseDal.AddData(tasks);
+
+ _taskExecuteDetailService.AddTaskExecuteDetail(tasks.Select(x => x.TaskNum).ToList(), "鎺ユ敹WMS浠诲姟");
content = WebResponseContent.Instance.OK("鎴愬姛");
}
@@ -134,6 +120,69 @@
content = WebResponseContent.Instance.Error($"浠诲姟鎺ユ敹閿欒,閿欒淇℃伅:{ex.Message}");
}
return content;
+ }
+
+ public WebResponseContent RequestWMsTask(string palletCode, string sourceAddress)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ WMSTaskDTO taskDTO = new WMSTaskDTO()
+ {
+ TaskNum = Convert.ToInt32(DateTime.Now.ToString("HHmmss")),
+ Grade = 1,
+ PalletCode = palletCode,
+ RoadWay = "SC01",
+ SourceAddress = sourceAddress,
+ TargetAddress = "SC01",
+ TaskState = (int)TaskInStatusEnum.InNew,
+ Id = 0,
+ TaskType = (int)TaskInboundTypeEnum.Inbound
+ };
+
+ content = ReceiveWMSTask(new List<WMSTaskDTO> { taskDTO });
+ }
+ catch (Exception ex)
+ {
+ content = WebResponseContent.Instance.Error(ex.Message);
+ }
+ return content;
+ }
+
+ public Dt_Task QueryConveyorLineTask(string deviceNo, string currentAddress)
+ {
+ IEnumerable<int> taskInboundTypes = Enum.GetValues(typeof(TaskInboundTypeEnum)).Cast<int>();
+ IEnumerable<int> taskOutboundTypes = Enum.GetValues(typeof(TaskOutboundTypeEnum)).Cast<int>();
+
+ Dictionary<string, OrderByType> orderBy = new()
+ {
+ {nameof(Dt_Task.Grade),OrderByType.Desc },
+ {nameof(Dt_Task.CreateDate),OrderByType.Asc},
+ };
+
+ return BaseDal.QueryFirst(x => (x.TaskType >= taskInboundTypes.Min() && x.TaskType <= taskInboundTypes.Max() && x.TaskState == (int)TaskInStatusEnum.InNew || x.TaskType >= taskOutboundTypes.Min() && x.TaskType <= taskOutboundTypes.Max() && x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish) && x.CurrentAddress == currentAddress, orderBy);
+ }
+
+ public Dt_Task QueryExecutingConveyorLineTask(int taskNum, string nextAddress)
+ {
+ Dictionary<string, OrderByType> orderBy = new()
+ {
+ {nameof(Dt_Task.Grade),OrderByType.Desc },
+ {nameof(Dt_Task.CreateDate),OrderByType.Asc},
+ };
+
+ return BaseDal.QueryFirst(x => x.TaskNum == taskNum && x.NextAddress == nextAddress, orderBy);
+ }
+
+ public Dt_Task QueryCompletedConveyorLineTask(int taskNum, string currentAddress)
+ {
+ Dictionary<string, OrderByType> orderBy = new()
+ {
+ {nameof(Dt_Task.Grade),OrderByType.Desc },
+ {nameof(Dt_Task.CreateDate),OrderByType.Asc},
+ };
+
+ return BaseDal.QueryFirst(x => x.TaskNum == taskNum && x.CurrentAddress == currentAddress, orderBy);
}
/// <summary>
@@ -156,7 +205,7 @@
if (string.IsNullOrEmpty(currentAddress))
return BaseDal.QueryFirst(x => x.Roadway == deviceNo && (x.TaskType >= taskInboundTypes.Min() && x.TaskType <= taskInboundTypes.Max() && x.TaskState == (int)TaskInStatusEnum.Line_InFinish || x.TaskType >= taskOutboundTypes.Min() && x.TaskType <= taskOutboundTypes.Max() && x.TaskState == (int)TaskOutStatusEnum.OutNew), orderBy);
else
- return BaseDal.QueryFirst(x => x.Roadway == deviceNo && (x.TaskType >= taskInboundTypes.Min() && x.TaskType <= taskInboundTypes.Max() && x.TaskState == (int)TaskInStatusEnum.Line_InFinish || x.TaskType >= taskOutboundTypes.Min() && x.TaskType <= taskOutboundTypes.Max() && x.TaskState == (int)TaskOutStatusEnum.OutNew), orderBy);
+ return BaseDal.QueryFirst(x => x.Roadway == deviceNo && x.CurrentAddress == currentAddress && (x.TaskType >= taskInboundTypes.Min() && x.TaskType <= taskInboundTypes.Max() && x.TaskState == (int)TaskInStatusEnum.Line_InFinish || x.TaskType >= taskOutboundTypes.Min() && x.TaskType <= taskOutboundTypes.Max() && x.TaskState == (int)TaskOutStatusEnum.OutNew), orderBy);
}
/// <summary>
@@ -303,6 +352,14 @@
int nextStatus = Enum.GetValues(typeof(TaskInStatusEnum)).Cast<int>().Where(x => x > task.TaskState && x < (int)TaskInStatusEnum.InFinish).OrderBy(x => x).FirstOrDefault();
task.TaskState = nextStatus;
+
+ if (task.TaskState == (int)TaskInStatusEnum.Line_InFinish)
+ {
+ 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 (!int.TryParse(Enum.Parse<TaskRelocationTypeEnum>(task.TaskType.ToString()).ToString(), out result))
{
@@ -322,15 +379,6 @@
return content = WebResponseContent.Instance.Error($"璇ヤ换鍔＄姸鎬佷笉鍙烦杞埌涓嬩竴姝�,浠诲姟鍙�:銆恵taskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskState}銆�");
}
- if (task.TaskState == (int)TaskInStatusEnum.Line_InFinish || task.TaskState == (int)TaskInStatusEnum.AGV_InFinish || task.TaskState == (int)TaskInStatusEnum.SC_InFinish || task.TaskState == (int)TaskOutStatusEnum.Line_OutFinish || task.TaskState == (int)TaskOutStatusEnum.AGV_OutFinish || task.TaskState == (int)TaskOutStatusEnum.SC_OutFinish)
- {
- List<Dt_Router> routers = _routerService.QueryNextRoutes(task.NextAddress, task.TargetAddress);
- if (!routers.Any()) return WebResponseContent.Instance.Error($"鏈壘鍒拌澶囪矾鐢变俊鎭�");
-
- task.CurrentAddress = task.NextAddress;
- task.NextAddress = routers.FirstOrDefault().ChildPosi;
- }
-
task.ModifyDate = DateTime.Now;
task.Modifier = "System";
BaseDal.UpdateData(task);
@@ -344,6 +392,35 @@
content = WebResponseContent.Instance.Error(ex.Message);
}
return content;
+ }
+
+ public Dt_Task? UpdatePosition(int taskNum, string currentAddress)
+ {
+ try
+ {
+ Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum && x.CurrentAddress == currentAddress);
+ if (task == null) throw new Exception($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}銆�");
+
+ string oldCurrentPos = task.CurrentAddress;
+ string oldNextPos = task.NextAddress;
+
+ List<Dt_Router> routers = _routerService.QueryNextRoutes(task.NextAddress, task.TargetAddress);
+ if (!routers.Any()) throw new Exception($"鏈壘鍒拌澶囪矾鐢变俊鎭�");
+
+ task.CurrentAddress = task.NextAddress;
+ task.NextAddress = routers.FirstOrDefault().ChildPosi;
+
+ task.ModifyDate = DateTime.Now;
+ task.Modifier = "System";
+ BaseDal.UpdateData(task);
+
+ _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"绯荤粺鑷姩娴佺▼锛屾洿鏂板綋鍓嶄綅缃�恵oldCurrentPos} ----> {task.CurrentAddress}銆戝拰涓嬩竴浣嶇疆銆恵oldNextPos} ----> {task.NextAddress}銆�");
+ return task;
+ }
+ catch (Exception ex)
+ {
+ }
+ return null;
}
/// <summary>
@@ -380,15 +457,28 @@
}
else if (!int.TryParse(Enum.Parse<TaskInboundTypeEnum>(task.TaskType.ToString()).ToString(), out result) && task.TaskState == (int)TaskInStatusEnum.SC_InExecuting)
{
- string locationCode = "";
- //todo 璋冪敤WMS鐢宠鍒嗛厤璐т綅
-
+ //todo
int nextStatus = Enum.GetValues(typeof(TaskInStatusEnum)).Cast<int>().Where(x => x > task.TaskState).OrderBy(x => x).FirstOrDefault();
task.TaskState = nextStatus;
- task.CurrentAddress = task.NextAddress;
- task.NextAddress = locationCode;
-
+ task.ModifyDate = DateTime.Now;
+ task.Modifier = "System";
+ BaseDal.UpdateData(task);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄叆搴撳畬鎴�");
+
+ WMSTaskDTO taskDTO = new WMSTaskDTO()
+ {
+ TaskNum = Convert.ToInt32(DateTime.Now.ToString("HHmmss")),
+ Grade = 1,
+ PalletCode = task.PalletCode + "S",
+ RoadWay = "SC01",
+ SourceAddress = task.TargetAddress,
+ TargetAddress = "CLOutAreaA",
+ TaskState = (int)TaskOutStatusEnum.OutNew,
+ Id = 0,
+ TaskType = (int)TaskOutboundTypeEnum.Outbound
+ };
+
+ content = ReceiveWMSTask(new List<WMSTaskDTO> { taskDTO });
}
else if (!int.TryParse(Enum.Parse<TaskRelocationTypeEnum>(task.TaskType.ToString()).ToString(), out result))
{
--
Gitblit v1.9.3