From 40f71192f067a48fff730a52fa8f47a1b69ba59d Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期一, 13 十月 2025 17:28:00 +0800
Subject: [PATCH] 支持跨楼层与AGV搬运任务，优化货位管理新增跨楼层与AGV搬运任务相关页面、API及服务逻辑，支持任务状态更新与多任务类型处理。 更新货位管理功能，支持批量创建货位及批量记录货位状态变动。 重构任务状态更新逻辑，增强事务处理能力，优化代码结构。 调整页面配置与文档布局，新增常量与枚举以支持新功能。 修复部分任务状态处理中的潜在问题。
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 939 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 603 insertions(+), 336 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
index 9417b92..30e9837 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
@@ -1,16 +1,22 @@
-锘縰sing Mapster;
+锘縰sing AngleSharp.Dom;
+using log4net.Core;
+using Mapster;
using Masuit.Tools;
+using OfficeOpenXml.Table.PivotTable;
using SixLabors.Fonts.Tables.AdvancedTypographic;
using SqlSugar;
using System;
+using System.Reflection.Metadata;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using WIDESEA_Cache;
+using WIDESEA_Common;
using WIDESEA_Core.Const;
using WIDESEA_DTO.Location;
using WIDESEA_DTO.WMS;
using WIDESEA_IServices;
using WIDESEA_Model.Models;
+using WIDESEA_Model.Models.Basic;
using WIDESEAWCS_BasicInfoRepository;
using WIDESEAWCS_QuartzJob.Models;
@@ -272,18 +278,15 @@
try
{
- var task = await GetByTaskAddress(taskDto.Position, taskDto.TargetAddress);
- if (task != null)
- {
- return content.Error("璧风偣鎴栫粓鐐瑰瓨鍦ㄤ换鍔�");
- }
var station = _stationManagerRepository.QueryFirst(x => x.stationType == 1 && x.Roadway == "SC1");
+
+ var location = await _locationRepository.QueryFirstAsync(x => x.LocationCode == taskDto.Position);
Dt_Task taskNew = new Dt_Task
{
Grade = 1,
Roadway = "SC1",
- TargetAddress = taskDto.TargetAddress,
+ TargetAddress = "SC1",
Dispatchertime = DateTime.Now,
MaterialNo = "",
NextAddress = station.stationChildCode,
@@ -301,6 +304,13 @@
};
var taskDTO = CreateListTaskDTO(taskNew);
+ var isResult = await AddInBoundTaskAsync(taskNew, location);
+ if (!isResult)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return content.Error("鏂板浠诲姟澶辫触");
+ }
+
return content = await SendWCSTask(taskDTO);
}
catch (Exception err)
@@ -311,241 +321,16 @@
return content;
}
+
+ #endregion 璇锋眰浠诲姟鍏ュ簱
+
+ #region 鏇存柊浠诲姟鐘舵��
+
+
/// <summary>
/// 鏇存柊浠诲姟璐т綅
/// </summary>
/// <param name="input"></param>
- /// <returns></returns>
- public async Task<WebResponseContent> UpdateExistingTask(RequestTaskDto input)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == input.PalletCode);
- if (task == null)
- return content.Error($"鏆傛湭鎵惧埌銆恵input.PalletCode}銆戠殑浠诲姟");
-
- return content = await UpdateExistingTask(input, task);
- }
- catch (Exception err)
- {
- return content.Error(err.Message);
- }
- }
-
- #endregion 璇锋眰浠诲姟鍏ュ簱
-
- #region 璇锋眰鍑哄簱
-
- /// <summary>
- /// 璇锋眰鎵樼洏浠诲姟
- /// </summary>
- /// <param name="position">鐩爣浣嶇疆</param>
- /// <param name="tag">鎵樼洏绫诲瀷锛�1锛氬疄鐩橈紝2锛氱┖鐩橈級</param>
- /// <param name="areaCode">鍖哄煙缂栫爜</param>
- /// <param name="roadways">宸烽亾缂栫爜闆嗗悎</param>
- /// <returns>杩斿洖缁撴灉闆�</returns>
- public async Task<WebResponseContent> RequestOutTaskAsync(RequestTaskDto taskDto)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- var task = await GetByTaskAddress(taskDto.Position, taskDto.TargetAddress);
- if (task != null)
- {
- return content.Error("璧风偣鎴栫粓鐐瑰瓨鍦ㄤ换鍔�");
- }
- var station = _stationManagerRepository.QueryFirst(x => x.stationType == 1 && x.Roadway == "SC1");
-
- Dt_Task taskNew = new Dt_Task
- {
- Grade = 1,
- Roadway = "SC1",
- TargetAddress = taskDto.TargetAddress,
- Dispatchertime = DateTime.Now,
- MaterialNo = "",
- NextAddress = station.stationChildCode,
- OrderNo = null,
- PalletCode = taskDto.PalletCode,
- SourceAddress = taskDto.Position,
- CurrentAddress = taskDto.Position,
- TaskState = (int)TaskOutStatusEnum.OutNew,
- TaskType = (int)TaskOutboundTypeEnum.Outbound,
- TaskNum = BaseDal.GetTaskNo().Result,
- CreateDate = DateTime.Now,
- TaskId = 0,
- AGVTaskNum = GenerateUniqueId(),
- Floor = "1F",
- };
- var taskDTO = CreateListTaskDTO(taskNew);
-
- return content = await SendWCSTask(taskDTO);
- }
- catch (Exception ex)
- {
- return content.Error(ex.Message);
- }
- }
-
-
- #endregion 璇锋眰鍑哄簱锛堝疄鐩�&绌虹洏锛�
-
- #region 璇锋眰璺ㄦゼ灞�2浠诲姟
- /// <summary>
- /// 璇锋眰璺ㄦゼ灞�2浠诲姟
- /// </summary>
- /// <param name="taskDto"></param>
- /// <returns></returns>
- public async Task<WebResponseContent> AcrossFloorTaskAsync(RequestAcrossFloorTaskDto taskDto)
- {
- WebResponseContent content=new WebResponseContent();
- try
- {
- var task = BaseDal.QueryFirst(x => x.TaskNum == Convert.ToInt32(taskDto.TaskNum) && x.PalletCode == taskDto.PalletCode);
- if(task == null)
- return content.Error("鏈壘鍒颁换鍔�");
- Dt_Task taskNew = new Dt_Task
- {
- Grade = 1,
- Roadway = "AGV",
- TargetAddress = task.TargetAddress,
- Dispatchertime = DateTime.Now,
- MaterialNo = "",
- NextAddress = taskDto.NextAddress,
- OrderNo = null,
- PalletCode = task.PalletCode,
- SourceAddress = taskDto.NextAddress,
- CurrentAddress = taskDto.NextAddress,
- TaskState = (int)TaskAcrossFloorStatusEnum.SecondCarry,
- TaskType = (int)TaskAcrossFloorTypeEnum.AcrossFloorCarry,
- TaskNum = BaseDal.GetTaskNo().Result,
- CreateDate = DateTime.Now,
- TaskId = 0,
- AGVTaskNum = GenerateUniqueId(),
- Floor = "",
- };
- var taskDTO = CreateTaskDTO(taskNew);
-
- var taskHty = task.Adapt<Dt_Task_Hty>();
- taskHty.FinishTime = DateTime.Now;
- taskHty.OperateType = App.User.UserName != null ? (int)OperateTypeEnum.浜哄伐瀹屾垚 : (int)OperateTypeEnum.鑷姩瀹屾垚;
- taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";
- await _unitOfWorkManage.UseTranAsync(async () =>
- {
- await DeleteTaskAsync(task.TaskId);
- await AddTaskHtyAsync(taskHty);
- });
- return content.OK(data: taskDTO);
- }
- catch (Exception ex)
- {
- return content.Error(ex.Message);
- }
- }
-
- #endregion
-
- #region 璇锋眰璺ㄦゼ灞備换鍔�
- public async Task<WebResponseContent> RequestAcrossFloorTaskAsync(RequestTaskDto taskDto)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- var task = await GetByTaskAddress(taskDto.Position, taskDto.TargetAddress);
- if (task != null)
- {
- return content.Error("璧风偣鎴栫粓鐐瑰瓨鍦ㄤ换鍔�");
- }
- var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == taskDto.Position);
-
- if (station != null)
- {
- var next = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == station.stationFloor);
- Dt_Task taskNew = new Dt_Task
- {
- Grade = 1,
- Roadway = "AGV",
- TargetAddress = taskDto.TargetAddress,
- Dispatchertime = DateTime.Now,
- MaterialNo = "",
- NextAddress = next.stationChildCode,
- OrderNo = null,
- PalletCode = taskDto.PalletCode,
- SourceAddress = taskDto.Position,
- CurrentAddress = taskDto.Position,
- TaskState = (int)TaskAcrossFloorStatusEnum.CarryNew,
- TaskType = (int)TaskAcrossFloorTypeEnum.AcrossFloorCarry,
- TaskNum = BaseDal.GetTaskNo().Result,
- CreateDate = DateTime.Now,
- TaskId = 0,
- AGVTaskNum = GenerateUniqueId(),
- Floor = station.stationFloor,
- };
- var taskDTO = CreateListTaskDTO(taskNew);
-
- return content = await SendWCSTask(taskDTO);
- }
- return content.Error("鏈壘鍒版彁鍗囨満绔欑偣");
- }
- catch (Exception ex)
- {
- return content.Error(ex.Message);
- }
- }
-
- #endregion
-
- #region 璇锋眰AGV鎼繍浠诲姟
- public async Task<WebResponseContent> RequestAGVCarryTaskAsync(RequestTaskDto taskDto)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- var task = await GetByTaskAddress(taskDto.Position,taskDto.TargetAddress);
- if (task != null)
- {
- return content.Error("璧风偣鎴栫粓鐐瑰瓨鍦ㄤ换鍔�");
- }
- var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == taskDto.Position);
- Dt_Task taskNew = new Dt_Task
- {
- Grade = 1,
- Roadway = "AGV",
- TargetAddress = taskDto.TargetAddress,
- Dispatchertime = DateTime.Now,
- MaterialNo = "",
- NextAddress = taskDto.TargetAddress,
- OrderNo = null,
- PalletCode = taskDto.PalletCode,
- SourceAddress = taskDto.Position,
- CurrentAddress = taskDto.Position,
- TaskState = (int)TaskAGVCarryStatusEnum.CarryNew,
- TaskType = (int)TaskAGVCarryTypeEnum.Carry,
- TaskNum = BaseDal.GetTaskNo().Result,
- CreateDate = DateTime.Now,
- TaskId = 0,
- AGVTaskNum = GenerateUniqueId(),
- Floor = station.stationFloor,
- };
- var taskDTO = CreateListTaskDTO(taskNew);
-
- return content = await SendWCSTask(taskDTO);
- }
- catch (Exception ex)
- {
- return content.Error(ex.Message);
- }
- }
-
- #endregion
-
- #region 浠诲姟鐘舵�佹洿鏀�
-
- /// <summary>
- /// 鏇存柊浠诲姟鐘舵��&鍑哄簱瑙ｇ洏
- /// </summary>
- /// <param name="taskNum"></param>
- /// <param name="taskState"></param>
/// <returns></returns>
public async Task<WebResponseContent> UpdateTaskStatus(int taskNum, int taskState)
{
@@ -556,7 +341,7 @@
if (task == null)
return content.Error("鏈壘鍒颁换鍔�");
- if (taskState == (int)TaskOutStatusEnum.Line_OutFinish || taskState == (int)TaskInStatusEnum.SC_InFinish)
+ if (taskState == (int)TaskOutStatusEnum.Line_OutFinish || taskState == (int)TaskInStatusEnum.SC_InFinish || taskState == (int)TaskRelocationStatusEnum.SC_RelocationFinish || taskState == (int)TaskAGVCarryStatusEnum.AGV_CarryFinish)
{
var taskHty = CreateHistoricalTask(task);
await _unitOfWorkManage.UseTranAsync(async () =>
@@ -587,7 +372,416 @@
return content;
}
- #endregion 浠诲姟鐘舵�佹洿鏀�
+ public async Task<WebResponseContent> RequestLocationAsync(RequestTaskDto input)
+ {
+ await _semaphoreUpdate.WaitAsync();
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Dt_Task task = BaseDal.QueryFirst(x => x.PalletCode == input.PalletCode);
+ if (task == null)
+ {
+ return content.Error("浠诲姟瀵硅薄涓虹┖");
+ }
+
+ task.TaskState = (int)TaskInStatusEnum.Line_InFinish;
+ var location = await GetEmptyLocation(task.Roadway);
+ if (location == null)
+ {
+ return content.Error("鏃犳硶鑾峰彇璐т綅淇℃伅");
+ }
+ int beforeStatus = location.LocationStatus;
+
+ location.LocationStatus = (int)LocationEnum.Lock;
+ task.CurrentAddress = input.Position;
+ task.TargetAddress = location.LocationCode;
+ task.NextAddress = location.LocationCode;
+ task.TaskState = (int)TaskInStatusEnum.Line_InFinish;
+ // 寮�濮嬩簨鍔�
+ var isResult = await UpdateTaskAsync(task, location, beforeStatus);
+ if (!isResult)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return content.Error("鏇存柊浠诲姟澶辫触");
+ }
+ return content.OK(data: task);
+ }
+ catch (Exception)
+ {
+ throw;
+ }
+ finally { _semaphoreUpdate.Release(); }
+ }
+
+ #endregion
+
+
+ #region 璇锋眰鍑哄簱
+
+ /// <summary>
+ /// 璇锋眰鎵樼洏浠诲姟
+ /// </summary>
+ /// <param name="position">鐩爣浣嶇疆</param>
+ /// <param name="tag">鎵樼洏绫诲瀷锛�1锛氬疄鐩橈紝2锛氱┖鐩橈級</param>
+ /// <param name="areaCode">鍖哄煙缂栫爜</param>
+ /// <param name="roadways">宸烽亾缂栫爜闆嗗悎</param>
+ /// <returns>杩斿洖缁撴灉闆�</returns>
+ public async Task<WebResponseContent> RequestOutTaskAsync(RequestTaskDto taskDto)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var station = _stationManagerRepository.QueryFirst(x => x.stationType == 1 && x.Roadway == "SC1");
+
+ var Sourcelocation = await _locationRepository.QueryFirstAsync(x => x.LocationCode == taskDto.Position);
+
+ DtLocationInfo Targetlocation = await GetAGVEmptyCacheLocation(2);
+ Dt_Task taskNew = new Dt_Task
+ {
+ Grade = 1,
+ Roadway = "SC1",
+ TargetAddress = Targetlocation.LocationCode,
+ Dispatchertime = DateTime.Now,
+ MaterialNo = "",
+ NextAddress = station.stationChildCode,
+ OrderNo = null,
+ PalletCode = taskDto.PalletCode,
+ SourceAddress = taskDto.Position,
+ CurrentAddress = taskDto.Position,
+ TaskState = (int)TaskOutStatusEnum.OutNew,
+ TaskType = (int)TaskOutboundTypeEnum.Outbound,
+ TaskNum = BaseDal.GetTaskNo().Result,
+ CreateDate = DateTime.Now,
+ TaskId = 0,
+ AGVTaskNum = GenerateUniqueId(),
+ Floor = "1F",
+ };
+ var taskDTO = CreateListTaskDTO(taskNew);
+
+ var isResult = await AddTaskAsync(taskNew, Sourcelocation, Targetlocation);
+ if (!isResult)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return content.Error("鏂板浠诲姟澶辫触");
+ }
+ return content = await SendWCSTask(taskDTO);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+
+
+ #endregion 璇锋眰鍑哄簱锛堝疄鐩�&绌虹洏锛�
+
+ #region 璇锋眰璺ㄦゼ灞�2浠诲姟
+ /// <summary>
+ /// 璇锋眰璺ㄦゼ灞�2浠诲姟
+ /// </summary>
+ /// <param name="taskDto"></param>
+ /// <returns></returns>
+ public async Task<WebResponseContent> AcrossFloorTaskAsync(RequestAcrossFloorTaskDto taskDto)
+ {
+ WebResponseContent content=new WebResponseContent();
+ try
+ {
+ var task = BaseDal.QueryFirst(x => x.TaskNum == Convert.ToInt32(taskDto.TaskNum) && x.PalletCode == taskDto.PalletCode);
+ if(task == null)
+ return content.Error("鏈壘鍒颁换鍔�");
+ Dt_StationManager stationManager = new Dt_StationManager();
+ if (task.Floor == "1F")
+ {
+ stationManager = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == "2F");
+ }
+ else
+ {
+ stationManager = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == "1F");
+ }
+ Dt_Task taskNew = new Dt_Task
+ {
+ Grade = 1,
+ Roadway = "AGV",
+ TargetAddress = task.TargetAddress,
+ Dispatchertime = DateTime.Now,
+ MaterialNo = "",
+ NextAddress = task.TargetAddress,
+ OrderNo = null,
+ PalletCode = task.PalletCode,
+ SourceAddress = task.SourceAddress,
+ CurrentAddress = stationManager.stationChildCode,
+ TaskState = (int)TaskAcrossFloorStatusEnum.SecondCarry,
+ TaskType = (int)TaskAcrossFloorTypeEnum.AcrossFloorCarry,
+ TaskNum = BaseDal.GetTaskNo().Result,
+ CreateDate = DateTime.Now,
+ TaskId = 0,
+ AGVTaskNum = GenerateUniqueId(),
+ Floor = stationManager.stationFloor,
+ };
+ var taskDTO = CreateTaskDTO(taskNew);
+
+ var taskHty = task.Adapt<Dt_Task_Hty>();
+ taskHty.FinishTime = DateTime.Now;
+ taskHty.OperateType = App.User.UserName != null ? (int)OperateTypeEnum.浜哄伐瀹屾垚 : (int)OperateTypeEnum.鑷姩瀹屾垚;
+ taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ BaseDal.AddData(taskNew);
+ await DeleteTaskAsync(task.TaskId);
+ await AddTaskHtyAsync(taskHty);
+ });
+ return content.OK(data: taskDTO);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+
+ #endregion
+
+ #region 璇锋眰璺ㄦゼ灞備换鍔�
+ public async Task<WebResponseContent> RequestAcrossFloorTaskAsync(RequestTaskDto taskDto)
+ {
+ LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "绉诲簱浠诲姟瀹屾垚", $"111111");
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+
+ var Sourcelocation = await _locationRepository.QueryFirstAsync(x => x.LocationCode == taskDto.Position);
+
+ DtLocationInfo Targetlocation = await GetAGVEmptyCacheLocation(taskDto.AreaId);
+
+ if (Targetlocation == null || Sourcelocation == null)
+ {
+ return content.Error("璧风偣鏈畾涔夋垨缁堢偣鍖哄煙鏈壘鍒扮┖闂插簱浣�");
+ }
+
+ if (IsAcrossFloor(Sourcelocation, Targetlocation))
+ {
+ return content.Error("鍚屾ゼ灞備笉鍏佽璇锋眰璺ㄦゼ灞備换鍔�");
+ }
+
+ if (Sourcelocation != null)
+ {
+ var next = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == Sourcelocation.Floor);
+ Dt_Task taskNew = new Dt_Task
+ {
+ Grade = 1,
+ Roadway = "AGV",
+ TargetAddress = Targetlocation.LocationCode,
+ Dispatchertime = DateTime.Now,
+ MaterialNo = "",
+ NextAddress = next.stationChildCode,
+ OrderNo = null,
+ PalletCode = taskDto.PalletCode,
+ SourceAddress = taskDto.Position,
+ CurrentAddress = taskDto.Position,
+ TaskState = (int)TaskAcrossFloorStatusEnum.CarryNew,
+ TaskType = (int)TaskAcrossFloorTypeEnum.AcrossFloorCarry,
+ TaskNum = BaseDal.GetTaskNo().Result,
+ CreateDate = DateTime.Now,
+ TaskId = 0,
+ AGVTaskNum = GenerateUniqueId(),
+ Floor = Sourcelocation.Floor,
+ };
+ var taskDTO = CreateListTaskDTO(taskNew);
+
+
+ var isResult = await AddTaskAsync(taskNew, Sourcelocation, Targetlocation);
+ if (!isResult)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return content.Error("鏂板浠诲姟澶辫触");
+ }
+
+ return content = await SendWCSTask(taskDTO);
+ }
+ return content.Error("鏈壘鍒版彁鍗囨満绔欑偣");
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+
+ public async Task<WebResponseContent> RequestPointAcrossFloorTaskAsync(RequestTaskDto taskDto)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var Sourcelocation = await _locationRepository.QueryFirstAsync(x => x.LocationCode == taskDto.Position);
+
+ var Targetlocation = await _locationRepository.QueryFirstAsync(x => x.LocationCode == taskDto.TargetAddress);
+
+ if (Targetlocation == null || Sourcelocation == null)
+ {
+ return content.Error("璧风偣鎴栫粓鐐规湭瀹氫箟");
+ }
+
+ if (IsAcrossFloor(Sourcelocation, Targetlocation))
+ {
+ return content.Error("鍚屾ゼ灞備笉鍏佽璇锋眰璺ㄦゼ灞備换鍔�");
+ }
+ if (Sourcelocation != null)
+ {
+ var next = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == Sourcelocation.Floor);
+ Dt_Task taskNew = new Dt_Task
+ {
+ Grade = 1,
+ Roadway = "AGV",
+ TargetAddress = Targetlocation.LocationCode,
+ Dispatchertime = DateTime.Now,
+ MaterialNo = "",
+ NextAddress = next.stationChildCode,
+ OrderNo = null,
+ PalletCode = taskDto.PalletCode,
+ SourceAddress = taskDto.Position,
+ CurrentAddress = taskDto.Position,
+ TaskState = (int)TaskAcrossFloorStatusEnum.CarryNew,
+ TaskType = (int)TaskAcrossFloorTypeEnum.AcrossFloorCarry,
+ TaskNum = BaseDal.GetTaskNo().Result,
+ CreateDate = DateTime.Now,
+ TaskId = 0,
+ AGVTaskNum = GenerateUniqueId(),
+ Floor = Sourcelocation.Floor,
+ };
+ var taskDTO = CreateListTaskDTO(taskNew);
+
+
+ var isResult = await AddTaskAsync(taskNew, Sourcelocation, Targetlocation);
+ if (!isResult)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return content.Error("鏂板浠诲姟澶辫触");
+ }
+
+ return content = await SendWCSTask(taskDTO);
+ }
+ return content.Error("鏈壘鍒版彁鍗囨満绔欑偣");
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+
+ #endregion
+
+ #region 璇锋眰AGV鎼繍浠诲姟
+ public async Task<WebResponseContent> RequestAGVCarryTaskAsync(RequestTaskDto taskDto)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var Sourcelocation = await _locationRepository.QueryFirstAsync(x => x.LocationCode == taskDto.Position);
+
+ DtLocationInfo Targetlocation = await GetAGVEmptyCacheLocation(taskDto.AreaId);
+
+ if (Targetlocation == null || Sourcelocation == null)
+ {
+ return content.Error("璧风偣鏈畾涔夋垨缁堢偣鍖哄煙鏈壘鍒扮┖闂插簱浣�");
+ }
+
+ if (!IsSamefloor(Sourcelocation, Targetlocation))
+ {
+ return content.Error("鍚屾ゼ灞備笉鍏佽璇锋眰璺ㄦゼ灞備换鍔�");
+ }
+
+ Dt_Task taskNew = new Dt_Task
+ {
+ Grade = 1,
+ Roadway = "AGV",
+ TargetAddress = Targetlocation.LocationCode,
+ Dispatchertime = DateTime.Now,
+ MaterialNo = "",
+ NextAddress = taskDto.TargetAddress,
+ OrderNo = null,
+ PalletCode = taskDto.PalletCode,
+ SourceAddress = taskDto.Position,
+ CurrentAddress = taskDto.Position,
+ TaskState = (int)TaskAGVCarryStatusEnum.CarryNew,
+ TaskType = (int)TaskAGVCarryTypeEnum.Carry,
+ TaskNum = BaseDal.GetTaskNo().Result,
+ CreateDate = DateTime.Now,
+ TaskId = 0,
+ AGVTaskNum = GenerateUniqueId(),
+ Floor = Sourcelocation.Floor,
+ };
+ var taskDTO = CreateListTaskDTO(taskNew);
+
+ var isResult = await AddTaskAsync(taskNew, Sourcelocation, Targetlocation);
+ if (!isResult)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return content.Error("鏂板浠诲姟澶辫触");
+ }
+
+ return content = await SendWCSTask(taskDTO);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+
+
+ public async Task<WebResponseContent> RequestPointAGVCarryTaskAsync(RequestTaskDto taskDto)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var Sourcelocation = await _locationRepository.QueryFirstAsync(x => x.LocationCode == taskDto.Position);
+
+ var Targetlocation = await _locationRepository.QueryFirstAsync(x => x.LocationCode == taskDto.TargetAddress);
+
+ if (Targetlocation == null || Sourcelocation == null)
+ {
+ return content.Error("璧风偣鎴栫粓鐐规湭瀹氫箟");
+ }
+
+ if (!IsSamefloor(Sourcelocation, Targetlocation))
+ {
+ return content.Error("鍚屾ゼ灞備笉鍏佽璇锋眰璺ㄦゼ灞備换鍔�");
+ }
+ Dt_Task taskNew = new Dt_Task
+ {
+ Grade = 1,
+ Roadway = "AGV",
+ TargetAddress = Targetlocation.LocationCode,
+ Dispatchertime = DateTime.Now,
+ MaterialNo = "",
+ NextAddress = taskDto.TargetAddress,
+ OrderNo = null,
+ PalletCode = taskDto.PalletCode,
+ SourceAddress = taskDto.Position,
+ CurrentAddress = taskDto.Position,
+ TaskState = (int)TaskAGVCarryStatusEnum.CarryNew,
+ TaskType = (int)TaskAGVCarryTypeEnum.Carry,
+ TaskNum = BaseDal.GetTaskNo().Result,
+ CreateDate = DateTime.Now,
+ TaskId = 0,
+ AGVTaskNum = GenerateUniqueId(),
+ Floor = Sourcelocation.Floor,
+ };
+ var taskDTO = CreateListTaskDTO(taskNew);
+
+ var isResult = await AddTaskAsync(taskNew, Sourcelocation, Targetlocation);
+ if (!isResult)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return content.Error("鏂板浠诲姟澶辫触");
+ }
+
+ return content = await SendWCSTask(taskDTO);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+ #endregion
+
#region 鑾峰彇AGV浠诲姟鍙�
@@ -648,7 +842,7 @@
RoadWay = task.Roadway,
SourceAddress = task.SourceAddress,
TargetAddress = task.TargetAddress,
- TaskState = task.TaskState.Value,
+ TaskState = task.TaskState,
Id = 0,
TaskType = task.TaskType,
AGVTaskNum = task.AGVTaskNum,
@@ -665,11 +859,21 @@
RoadWay = task.Roadway,
SourceAddress = task.SourceAddress,
TargetAddress = task.TargetAddress,
- TaskState = task.TaskState.Value,
+ TaskState = task.TaskState,
Id = 0,
TaskType = task.TaskType,
AGVTaskNum = task.AGVTaskNum,
};
+ }
+
+ private bool IsAcrossFloor(DtLocationInfo Sourcelocation,DtLocationInfo Targetlocation)
+ {
+ return Sourcelocation.Floor == Targetlocation.Floor;
+ }
+
+ private bool IsSamefloor(DtLocationInfo Sourcelocation, DtLocationInfo Targetlocation)
+ {
+ return Sourcelocation.Floor == Targetlocation.Floor;
}
private async Task DeleteStockInfoAsync(int stockId)
{
@@ -820,79 +1024,10 @@
private static readonly SemaphoreSlim _semaphoreUpdate = new SemaphoreSlim(1, 1);
// 鏇存柊浠诲姟璐т綅
- private async Task<WebResponseContent> UpdateExistingTask(RequestTaskDto input, Dt_Task task)
- {
- await _semaphoreUpdate.WaitAsync();
- try
- {
- if (task == null)
- {
- return new WebResponseContent().Error("浠诲姟瀵硅薄涓虹┖");
- }
-
- try
- {
- // 鍒涘缓WebResponseContent瀵硅薄
- var content = new WebResponseContent();
-
-
- var location = await GetEmptyLocation(task.Roadway);
- if (location == null)
- {
- return content.Error("鏃犳硶鑾峰彇璐т綅淇℃伅");
- }
-
- string toAddress = location.LocationCode;
- int taskState = (int)TaskInStatusEnum.Line_InFinish;
- int beforeStatus = location.LocationStatus;
- // 鏇存柊璐т綅淇℃伅
- location.LocationStatus = (int)LocationEnum.Lock;
-
- // 鏇存柊浠诲姟淇℃伅
- MapTaskProperties(task, input, toAddress, taskState);
-
- // 寮�濮嬩簨鍔�
- var isResult = await UpdateTaskAsync(task, location, beforeStatus);
- if (!isResult)
- {
- _unitOfWorkManage.RollbackTran();
- return content.Error("鏇存柊浠诲姟澶辫触");
- }
-
- // 鎻愪氦浜嬪姟
- _unitOfWorkManage.CommitTran();
- return content.OK(data: task);
-
- }
- catch (Exception ex)
- {
- // 鍥炴粴浜嬪姟
- _unitOfWorkManage.RollbackTran();
- // 杩欓噷鍙互娣诲姞鏃ュ織璁板綍
- return new WebResponseContent().Error($"鏇存柊浠诲姟鏃跺彂鐢熼敊璇�: {ex.Message}");
- }
- }
- catch (Exception)
- {
- throw;
- }
- finally { _semaphoreUpdate.Release(); }
- }
-
- private void MapTaskProperties(Dt_Task task, RequestTaskDto input, string toAddress, int taskState)
- {
- task.CurrentAddress = input.Position;
- task.TargetAddress = toAddress;
- task.NextAddress = toAddress;
- task.TaskState = taskState;
- }
-
// 淇敼浠诲姟
private async Task<bool> UpdateTaskAsync(Dt_Task task, DtLocationInfo location, int beforeStatus)
{
bool isResult = await BaseDal.UpdateDataAsync(task);
- bool isTaskDetail = await _taskExecuteDetailRepository.AddDetailAsync(task, false, TaskDescription.GetTaskUpdateDescription(task.PalletCode, task.CurrentAddress, task.TargetAddress, TaskInStatusEnum.Line_InFinish.GetIntegralRuleTypeEnumDesc()));
-
LocationChangeRecordDto changeRecordDto = new LocationChangeRecordDto()
{
AfterStatus = location.LocationStatus,
@@ -906,8 +1041,73 @@
bool isUpdateChange = _locationStatusChangeRecordRepository.AddStatusChangeRecord(changeRecordDto);
bool isUpdateLo = await _locationRepository.UpdateDataAsync(location);
- return isResult && isUpdateLo && isTaskDetail;
+ return isResult && isUpdateLo;
}
+
+ private async Task<bool> AddTaskAsync(Dt_Task task, DtLocationInfo Sourcelocation, DtLocationInfo Targetlocation)
+ {
+ bool isResult = await BaseDal.AddDataAsync(task) > 0;
+ int SourcebeforeStatus = Sourcelocation.LocationStatus;
+
+ int TargetbeforeStatus = Targetlocation.LocationStatus;
+
+ Sourcelocation.LocationStatus = (int)LocationEnum.InStockDisable;
+
+ Targetlocation.LocationStatus = (int)LocationEnum.Lock;
+
+ List<LocationChangeRecordDto> changeRecordDto = new List<LocationChangeRecordDto>()
+ {
+ new LocationChangeRecordDto()
+ {
+ AfterStatus = Sourcelocation.LocationStatus,
+ BeforeStatus = SourcebeforeStatus,
+ TaskNum = task.TaskNum.Value,
+ LocationId = Sourcelocation.Id,
+ LocationCode = Sourcelocation.LocationCode,
+ ChangeType = (int)StatusChangeTypeEnum.AutomaticDelivery,
+ },
+ new LocationChangeRecordDto()
+ {
+ AfterStatus = Targetlocation.LocationStatus,
+ BeforeStatus = TargetbeforeStatus,
+ TaskNum = task.TaskNum.Value,
+ LocationId = Targetlocation.Id,
+ LocationCode = Targetlocation.LocationCode,
+ ChangeType = (int)StatusChangeTypeEnum.AutomaticDelivery,
+ },
+ };
+
+ bool isUpdateChange = _locationStatusChangeRecordRepository.AddStatusChangeRecord(changeRecordDto);
+ bool Source = await _locationRepository.UpdateDataAsync(Sourcelocation);
+ bool Target = await _locationRepository.UpdateDataAsync(Targetlocation);
+
+ return isResult && Source && Target;
+ }
+
+ private async Task<bool> AddInBoundTaskAsync(Dt_Task task, DtLocationInfo location)
+ {
+ bool isResult = await BaseDal.AddDataAsync(task) > 0;
+ int beforeStatus = location.LocationStatus;
+
+ location.LocationStatus = (int)LocationEnum.InStockDisable;
+
+ LocationChangeRecordDto changeRecordDto = new LocationChangeRecordDto()
+ {
+ AfterStatus = location.LocationStatus,
+ BeforeStatus = beforeStatus,
+ TaskNum = task.TaskNum.Value,
+ LocationId = location.Id,
+ LocationCode = location.LocationCode,
+ ChangeType = (int)StatusChangeTypeEnum.AutomaticStorage,
+
+ };
+
+ bool isUpdateChange = _locationStatusChangeRecordRepository.AddStatusChangeRecord(changeRecordDto);
+ bool loc = await _locationRepository.UpdateDataAsync(location);
+
+ return isResult && loc;
+ }
+
/// <summary>
/// 鑾峰彇璐т綅鍙�
/// </summary>
@@ -916,36 +1116,103 @@
{
try
{
- List<DtLocationInfo> LocationInfoList = await _locationRepository.QueryDataAsync(x => x.RoadwayNo == roadWay && x.LocationStatus == (int)LocationEnum.Free && x.EnalbeStatus == EnableEnum.Enable.ObjToInt());
+ List<DtLocationInfo> locations = await _locationRepository.QueryDataAsync(x => x.RoadwayNo == "SC1" && x.LocationStatus == 0 && x.EnalbeStatus == 1);
- List<DtLocationInfo> LocationInfoResult = new List<DtLocationInfo>();
- foreach (DtLocationInfo item in LocationInfoList)
+ if (locations.Where(x => x.Row == 2).ToList().OrderBy(x => x.Layer).ThenBy(x => x.Column).FirstOrDefault() != null)
{
- DtLocationInfo locationItem = new DtLocationInfo();
-
- if (item.Depth == 2)
- {
- locationItem = _locationRepository.QueryFirst(x => x.Column == item.Column && x.RoadwayNo == item.RoadwayNo && x.Layer == item.Layer && x.Depth != item.Depth && x.Row != item.Row && (SqlFunc.Abs(x.Row - item.Row) == 1) && x.LocationStatus == (int)LocationEnum.Free && x.EnalbeStatus == EnableEnum.Enable.ObjToInt());
- if (locationItem != null)
- {
- LocationInfoResult.Add(item);
- }
- }
- else
- {
- locationItem = _locationRepository.QueryFirst(x => x.Column == item.Column && x.RoadwayNo == item.RoadwayNo && x.Layer == item.Layer && x.Depth != item.Depth && x.Row != item.Row && (SqlFunc.Abs(x.Row - item.Row) == 1) && x.LocationStatus == (int)LocationEnum.InStock && x.EnalbeStatus == EnableEnum.Enable.ObjToInt());
- if (locationItem != null)
- {
- LocationInfoResult.Add(item);
- }
- }
+ return locations.Where(x => x.Row == 2).ToList().OrderBy(x => x.Layer).ThenBy(x => x.Column).FirstOrDefault();
}
- if (LocationInfoResult.Count < 2)
+ else if (locations.Where(x => x.Row == 3).ToList().OrderBy(x => x.Layer).ThenBy(x => x.Column).FirstOrDefault() != null)
{
- throw new Exception("褰撳墠绌洪棽璐т綅涓嶈冻锛�");
+ return locations.Where(x => x.Row == 3).ToList().OrderBy(x => x.Layer).ThenBy(x => x.Column).FirstOrDefault();
+ }
+ else
+ {
+ return locations.Where(x => x.Row == 1).ToList().OrderBy(x => x.Layer).ThenBy(x => x.Column).FirstOrDefault();
+ }
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+ }
+
+ public async Task<DtLocationInfo> GetAGVEmptyCacheLocation(int AreaId)
+ {
+ try
+ {
+ DtLocationInfo location = null;
+ switch (AreaId)
+ {
+ case 2:
+ location = await FromShallowToDeep(AreaId);
+ break;
+ case 3:
+ location = await AGVLIKU(AreaId);
+ break;
+ case 5:
+ case 6:
+ location = await FromDeepToShallow(AreaId);
+ break;
+ default:
+ break;
}
- return LocationInfoResult.OrderByDescending(x => x.Depth).ThenBy(x => x.Column).ThenBy(x => x.Layer).FirstOrDefault();
+ return location;
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message) ;
+ }
+ }
+
+ /// <summary>
+ /// 鐢辨繁鍒版祬
+ /// </summary>
+ /// <param name="AreaId"></param>
+ /// <returns></returns>
+ public async Task<DtLocationInfo> FromDeepToShallow(int AreaId)
+ {
+ try
+ {
+ List<DtLocationInfo> locations = await _locationRepository.QueryDataAsync(x => x.AreaId == AreaId && x.LocationStatus == 0 && x.EnalbeStatus == 1);
+
+ var location = locations.OrderByDescending(x => x.Column).ThenBy(x => x.Row).FirstOrDefault();
+
+ return location;
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+ }
+
+ /// <summary>
+ /// 鐢辨祬鍒版繁
+ /// </summary>
+ /// <param name="AreaId"></param>
+ /// <returns></returns>
+ public async Task<DtLocationInfo> FromShallowToDeep(int AreaId)
+ {
+ try
+ {
+ List<DtLocationInfo> locations = await _locationRepository.QueryDataAsync(x => x.AreaId == AreaId && x.LocationStatus == 0 && x.EnalbeStatus == 1);
+ var location = locations.OrderBy(x => x.Column).ThenBy(x => x.Row).FirstOrDefault();
+ return location;
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+ }
+ public async Task<DtLocationInfo> AGVLIKU(int AreaId)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ List<DtLocationInfo> locations = await _locationRepository.QueryDataAsync(x => x.AreaId == AreaId && x.LocationStatus == 0 && x.EnalbeStatus == 1);
+ var location = locations.OrderBy(x => x.Layer).ThenBy(x => x.Column).FirstOrDefault();
+ return location;
}
catch (Exception ex)
{
--
Gitblit v1.9.3