From b6a82cb656a6cd045d772274ae927c8ca2c22b06 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 27 二月 2026 14:26:03 +0800
Subject: [PATCH] 优化四向车入库任务
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 307 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 297 insertions(+), 10 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 9e30867..f8c8baf 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -16,14 +16,21 @@
#endregion << 鐗� 鏈� 娉� 閲� >>
using AutoMapper;
+using Dm;
using SqlSugar;
using System.Diagnostics.CodeAnalysis;
+using System.Threading.Tasks;
+using WIDESEAWCS_BasicInfoService;
+using WIDESEAWCS_Common;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.BaseServices;
+using WIDESEAWCS_Core.Enums;
using WIDESEAWCS_Core.Helper;
+using WIDESEAWCS_DTO;
using WIDESEAWCS_DTO.TaskInfo;
+using WIDESEAWCS_DTO.WMS;
using WIDESEAWCS_IBasicInfoService;
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
@@ -40,6 +47,8 @@
private readonly IKLSLocationInfoService _kLSLocationInfoService;
private readonly IRGVLocationInfoService _rGVLocationInfoService;
private readonly IRepository<Dt_TaskExecuteDetail> _taskExecuteDetailRepository;
+ private readonly IApiInfoService _apiInfoService;
+ private readonly IStationMangerService _stationMangerService;
private readonly IMapper _mapper;
private Dictionary<string, OrderByType> _taskOrderBy = new()
@@ -59,7 +68,7 @@
/// </summary>
public IRepository<Dt_Task> Repository => BaseDal;
- public TaskService(IRepository<Dt_Task> BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, IRepository<Dt_TaskExecuteDetail> taskExecuteDetailRepository, IMapper mapper, IKLSLocationInfoService kLSLocationInfoService, IRGVLocationInfoService rGVLocationInfoService, IHKLocationInfoService hKLocationInfoService) : base(BaseDal)
+ public TaskService(IRepository<Dt_Task> BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, IRepository<Dt_TaskExecuteDetail> taskExecuteDetailRepository, IMapper mapper, IKLSLocationInfoService kLSLocationInfoService, IRGVLocationInfoService rGVLocationInfoService, IHKLocationInfoService hKLocationInfoService, IApiInfoService apiInfoService) : base(BaseDal)
{
_routerService = routerService;
_taskExecuteDetailService = taskExecuteDetailService;
@@ -68,6 +77,7 @@
_kLSLocationInfoService = kLSLocationInfoService;
_rGVLocationInfoService = rGVLocationInfoService;
_hKLocationInfoService = hKLocationInfoService;
+ _apiInfoService = apiInfoService;
}
public WebResponseContent ReceiveWMSTask([NotNull] List<WMSTasksDTO> taskDTOs)
{
@@ -76,17 +86,42 @@
{
foreach (var item in taskDTOs)
{
- if (item.taskType == TaskTypeEnum.MLInbound.ObjToInt())
+ foreach (var task in item.tasks)
{
- foreach (var task in item.tasks)
+ content = TaskHelpMethods.isOkTaskInfo(task, true, true);
+ if (!content.Status) throw new Exception(content.Message);
+ if (BaseDal.QueryFirst(x => x.WMSTaskNum == task.taskCode || x.PalletCode == task.containerCode) != null)
{
- content = TaskHelpMethods.isOkTaskInfo(task, true, true);
- if (!content.Status) throw new Exception(content.Message);
- if (BaseDal.QueryFirst(x => x.WMSTaskNum == task.taskCode || x.PalletCode == task.containerCode) != null)
- {
- continue;
- }
- CreateNewInTask(task);
+ continue;
+ }
+ switch (item.taskType)
+ {
+ case (int)TaskTypeEnum.MLInbound:
+ CreateKLSNewInTask(task, item.taskType);
+ break;
+ case (int)TaskTypeEnum.MLOutbound:
+ CreateKLSNewOutTask(task, item.taskType);
+ break;
+ case (int)TaskTypeEnum.CPInbound:
+ CreateRGVNewInTask(task, item.taskType);
+ break;
+ case (int)TaskTypeEnum.CPOutbound:
+ CreateRGVNewOutTask(task, item.taskType);
+ break;
+ case (int)TaskTypeEnum.CJInbound:
+ CreateHKNewInTask(task, item.taskType);
+ break;
+ case (int)TaskTypeEnum.CJOutbound:
+ CreateHKNewOutTask(task, item.taskType);
+ break;
+ case (int)TaskTypeEnum.Carry:
+ CarryTask(task, item.taskType);
+ break;
+ case (int)TaskTypeEnum.CJCarry:
+ CJCarryTaske(task, item.taskType);
+ break;
+ default:
+ break;
}
}
}
@@ -97,6 +132,179 @@
}
return content;
}
+
+ /// <summary>
+ /// 鍙栨秷浠诲姟
+ /// </summary>
+ /// <param name="taskCode">浠诲姟鍙�</param>
+ /// <param name="containerCode">鏂欑鏉＄爜</param>
+ /// <returns></returns>
+ public WebResponseContent CancelWMSTask(WMSCancelTask wMSCancelTask)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Dt_Task dt_Task = BaseDal.QueryFirst(x => x.WMSTaskNum == wMSCancelTask.TaskCode);
+ if (dt_Task == null) throw new Exception("鏈煡璇㈠埌浠诲姟鍙风浉鍏充换鍔�");
+
+ // 鍒ゆ柇褰撳墠浠诲姟鏄惁涓哄嚡涔愬＋浠诲姟
+ bool isGALAXISTask = dt_Task.TaskType == (int)TaskTypeEnum.MLInbound ||
+ dt_Task.TaskType == (int)TaskTypeEnum.MLOutbound;
+ //鍥涘悜杞�
+ bool isAGV = dt_Task.TaskType == (int)TaskTypeEnum.CPInbound || dt_Task.TaskType == (int)TaskTypeEnum.CPOutbound;
+ //娴峰悍
+ bool isHK = dt_Task.TaskType == (int)TaskTypeEnum.Carry || dt_Task.TaskType == (int)TaskTypeEnum.CJInbound || dt_Task.TaskType == (int)TaskTypeEnum.CJInbound || dt_Task.TaskType == (int)TaskTypeEnum.CJOutbound;
+ //杩欓噷灏嗙姸鎬佹敼鍙樹簡198鍙栨秷浠诲姟
+ dt_Task.TaskType = TaskStatusEnum.WMSCancel.ObjToInt();
+ if (isGALAXISTask)
+ {
+ var KLS = new CancelGALAXISTask
+ {
+ taskId = dt_Task.WMSTaskNum,
+ reportTime = DateTime.Now.ToString()
+ };
+ Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(CancelGALAXISTask));
+ if (apiInfo == null) throw new Exception("鏈壘鍒板嚡涔愬＋AGV浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
+ string response = HttpHelper.Post(apiInfo.ApiAddress, KLS.Serialize());
+ GALAXISReturn agvContent = response.DeserializeObject<GALAXISReturn>();
+ if (agvContent.success == true && agvContent.code == 0)
+ {
+ //鐩存帴绉诲叆鍘嗗彶
+ BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩瀹屾垚);
+ return content.OK("鍙栨秷浠诲姟鎴愬姛", dt_Task);
+ }
+ else
+ {
+ return content.Error($"浠诲姟澶辫触{agvContent.data.returnInfo}");
+
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
+ }
+
+
+ /// <summary>
+ /// 淇敼浠诲姟浼樺厛绾�
+ /// </summary>
+ /// <param name="updateTaskPriority"></param>
+ /// <returns></returns>
+ public WebResponseContent UpdateWMSTaskPriority(WMSUpdateTaskPriority updateTaskPriority)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Dt_Task dt_Task = BaseDal.QueryFirst(x => x.WMSTaskNum == updateTaskPriority.taskCode);
+ if (dt_Task == null) throw new Exception("鏈煡璇㈠埌浠诲姟鍙风浉鍏充换鍔�");
+
+ // 鍒ゆ柇褰撳墠浠诲姟鏄惁涓哄嚡涔愬＋浠诲姟
+ bool isGALAXISTask = dt_Task.TaskType == (int)TaskTypeEnum.MLInbound ||
+ dt_Task.TaskType == (int)TaskTypeEnum.MLOutbound;
+
+ //鍥涘悜杞�
+ bool isAGV = dt_Task.TaskType == (int)TaskTypeEnum.CPInbound || dt_Task.TaskType == (int)TaskTypeEnum.CPOutbound;
+
+ //娴峰悍
+ bool isHK = dt_Task.TaskType == (int)TaskTypeEnum.Carry || dt_Task.TaskType == (int)TaskTypeEnum.CJInbound || dt_Task.TaskType == (int)TaskTypeEnum.CJInbound || dt_Task.TaskType == (int)TaskTypeEnum.CJOutbound;
+ //淇敼鍘熸湰浠诲姟浼樺厛绾�
+ dt_Task.Grade = updateTaskPriority.taskPriority;
+ #region 鍑箰澹�
+ if (isGALAXISTask)
+ {
+ var updateGALAXISTaskGrade = new UpdateGALAXISTaskGrade
+ {
+ taskId = dt_Task.TaskNum.ToString(),
+ reportTime = DateTime.Now.ToString(),
+ district = dt_Task.Roadway,//浠诲姟搴撳尯
+ priorityCode = updateTaskPriority.taskPriority,
+ };
+ Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(UpdateGALAXISTaskGrade));
+ if (apiInfo == null) throw new Exception("鏈壘鍒板嚡涔愬＋AGV浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
+ string response = HttpHelper.Post(apiInfo.ApiAddress, updateGALAXISTaskGrade.Serialize());
+ GALAXISReturn agvContent = response.DeserializeObject<GALAXISReturn>();
+ if (agvContent.success == true && agvContent.code == 0)
+ {
+
+ return content.OK("淇敼浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
+ }
+ else {
+ return content.Error($"浠诲姟澶辫触{agvContent.data.returnInfo}");
+ }
+ }
+ #endregion
+
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
+ }
+
+ /// <summary>
+ /// 淇敼搴撲綅鍒嗗尯
+ /// </summary>
+ /// <returns></returns>
+ public WebResponseContent ModifyWMSLayoutZone(WMSUpdateLocationArea wMSUpdateLocationArea)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var rgv = new List<Dt_RGVLocationInfo>();
+ var kls=new List<Dt_KLSLocationInfo>();
+ var hk=new List<Dt_HKLocationInfo>();
+ if(wMSUpdateLocationArea.WarehouseId == 1)
+ {
+ var rgvList = _rGVLocationInfoService.Repository.QueryData(x =>wMSUpdateLocationArea.LocationCodes.Contains(x.LocationCode)).ToList();
+ foreach (var item in rgvList)
+ {
+ item.WarehouseId = wMSUpdateLocationArea.UpdateAreaCode.ObjToInt();
+ }
+ rgv.AddRange(rgvList);
+ }
+ if (wMSUpdateLocationArea.WarehouseId == 2)
+ {
+
+ var KLSLocationInfoList = _kLSLocationInfoService.Repository.QueryData(x => wMSUpdateLocationArea.LocationCodes.Contains(x.LocationCode)).ToList();
+ foreach (var item in KLSLocationInfoList)
+ {
+ item.WarehouseId = wMSUpdateLocationArea.UpdateAreaCode.ObjToInt();
+ }
+ kls.AddRange(KLSLocationInfoList);
+ }
+ if (wMSUpdateLocationArea.WarehouseId == 3)
+ {
+ var hkList = _hKLocationInfoService.Repository.QueryData(x => wMSUpdateLocationArea.LocationCodes.Contains(x.LocationCode)).ToList();
+ foreach (var item in hkList)
+ {
+ item.WarehouseId = wMSUpdateLocationArea.UpdateAreaCode.ObjToInt();
+ }
+ hk.AddRange(hkList);
+ }
+ Db.Ado.BeginTran();
+ _rGVLocationInfoService.UpdateData(rgv);
+ _kLSLocationInfoService.UpdateData(kls);
+ _hKLocationInfoService.UpdateData(hk);
+ Db.Ado.CommitTran();
+ content.OK();
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
+ }
+
+ private void UpdateLocationCode(object LocationInfo, string updateAreaCode)
+ {
+
+ }
+
+
/// <summary>
/// 鎺ユ敹WMS浠诲姟淇℃伅
/// </summary>
@@ -625,5 +833,84 @@
}
return content;
}
+
+ static object lock_taskNum = new object();
+ public int GetTaskNum(string sequenceName)
+ {
+ lock (lock_taskNum)
+ {
+ return Db.Ado.GetScalar($"SELECT NEXT VALUE FOR {sequenceName}").ObjToInt();
+ }
+ }
+
+ /// <summary>
+ /// 瀹瑰櫒娴佸姩璇锋眰
+ /// </summary>
+ /// <param name="wMSContainerFlow"></param>
+ /// <returns></returns>
+ /// <exception cref="NotImplementedException"></exception>
+ public WebResponseContent ContainerFlow(WMSContainerFlow wMSContainerFlow)
+ {
+ return WebResponseContent.Instance.Error("璇ユ帴鍙ｆ殏鏈疄鐜�");
+ }
+
+
+ /// <summary>
+ /// 鍖哄煙搴撲綅淇℃伅鏌ヨ
+ /// </summary>
+ /// <param name="AreaCode"></param>
+ /// <returns></returns>
+ /// <exception cref="NotImplementedException">鍖哄煙鍙�</exception>
+ public WebResponseContent LocationInquiry(string AreaCode)
+ {
+ if (AreaCode == null)
+ {
+ //鏌ヨ杈撻�佺嚎绌烘墭缂撳瓨淇℃伅鏃惰繑鍥炵┖浣嶆暟閲�
+ }
+ return WebResponseContent.Instance.OK();
+
+ }
+
+
+ /// <summary>
+ /// 鍦板浘鍚屾
+ /// </summary>
+ /// <param name="mapSynchronizationDto"></param>
+ /// <returns></returns>
+ public WebResponseContent MapSynchronize(MapSynchronizationDto mapSynchronizationDto)
+ {
+ return WebResponseContent.Instance;
+ }
+
+ /// <summary>
+ /// 鍑哄叆搴撳畬鎴�
+ /// </summary>
+ /// <param name=""></param>
+ /// <returns></returns>
+ /// <exception cref="NotImplementedException"></exception>
+ public WebResponseContent InandoutCompleted(WMSInOutBoundCompleteFeedback wMSInOutBoundCompleteFeedback)
+ {
+ throw new NotImplementedException();
+ }
+
+ /// <summary>
+ /// 鏂欑楠岃瘉
+ /// </summary>
+ /// <param name="taskCode">浠诲姟鍙�</param>
+ /// <param name="containerCode">瀹瑰櫒缂栫爜</param>
+ /// <returns></returns>
+ public WebResponseContent MaterialBoxInspection(string taskCode, string containerCode)
+ {
+ throw new NotImplementedException();
+ }
+
+ /// <summary>
+ /// wcs绉诲簱鏁版嵁鍥炰紶
+ /// </summary>
+ /// <param name="wMSMoveLocationFeedback"></param>
+ public WebResponseContent WcsMovingDataBack(WMSMoveLocationFeedback wMSMoveLocationFeedback)
+ {
+ throw new NotImplementedException();
+ }
}
}
--
Gitblit v1.9.3