From 0f1717cbe5c788c294a53cd4df6f819ca0236500 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 09 三月 2026 10:42:27 +0800
Subject: [PATCH] 优化成品仓逻辑
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 138 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 104 insertions(+), 34 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 247e857..4ab35cd 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"
@@ -19,6 +19,7 @@
using SqlSugar;
using System.Diagnostics.CodeAnalysis;
using WIDESEAWCS_BasicInfoService;
+using WIDESEAWCS_Common;
using WIDESEAWCS_Common.LocationEnum;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
@@ -69,7 +70,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, IApiInfoService apiInfoService,ITrackloginfoService trackloginfoService) : 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, ITrackloginfoService trackloginfoService, IStationMangerService stationMangerService) : base(BaseDal)
{
_routerService = routerService;
_taskExecuteDetailService = taskExecuteDetailService;
@@ -80,6 +81,7 @@
_hKLocationInfoService = hKLocationInfoService;
_apiInfoService = apiInfoService;
_trackloginfoService = trackloginfoService;
+ _stationMangerService = stationMangerService;
}
public WebResponseContent ReceiveWMSTask([NotNull] List<WMSTasksDTO> taskDTOs)
{
@@ -94,7 +96,8 @@
if (!content.Status) throw new Exception(content.Message);
if (BaseDal.QueryFirst(x => x.WMSTaskNum == task.taskCode || x.PalletCode == task.containerCode) != null)
{
- continue;
+ throw new Exception($"浠诲姟鍙枫�恵task.taskCode}銆�/鎵樼洏鍙枫�恵task.containerCode}銆戝凡瀛樺湪浠诲姟");
+ //continue;
}
switch (item.taskType)
{
@@ -189,7 +192,8 @@
{
CancelSXCTake cancelSXCTake = new CancelSXCTake
{
- taskID = dt_Task.RGVTaskId
+ taskID = dt_Task.RGVTaskId,
+ withoutRunning = 1
};
Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(CancelSXCTake));
if (apiInfo == null) throw new Exception("鏈壘鍒板洓鍚戣溅AGV浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
@@ -199,11 +203,11 @@
{
//鐩存帴绉诲叆鍘嗗彶
BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩瀹屾垚);
- return content.OK("鍙栨秷浠诲姟鎴愬姛", dt_Task);
+ return content.OK($"鍙栨秷浠诲姟銆恵dt_Task.WMSTaskNum}銆戞垚鍔�", dt_Task);
}
else
{
- return content.Error($"浠诲姟澶辫触{fOURBOTReturn.data}");
+ return content.Error($"浠诲姟鍙栨秷澶辫触銆恵dt_Task.WMSTaskNum}銆憑fOURBOTReturn.returnUserMsg}");
}
}
#endregion
@@ -254,7 +258,7 @@
{
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;
@@ -286,7 +290,8 @@
BaseDal.UpdateData(dt_Task);
return content.OK("淇敼浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
}
- else {
+ else
+ {
return content.Error($"浠诲姟澶辫触{agvContent.data.returnInfo}");
}
}
@@ -301,10 +306,10 @@
priority = updateTaskPriority.taskPriority
};
Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(UpdateAgvSXCTake));
- if (apiInfo == null) throw new Exception("鏈壘鍒板洓鍚戣溅AGV浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
+ if (apiInfo == null) throw new Exception("鏈壘鍒版洿鏂板洓鍚戣溅浠诲姟浼樺厛绾ф帴鍙ｉ厤缃俊鎭紒璇锋鏌ユ帴鍙ｉ厤缃�");
string response = HttpHelper.Post(apiInfo.ApiAddress, request.Serialize());
FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
- if (fOURBOTReturn.returnCode == 0 && fOURBOTReturn .returnUserMsg== "鎴愬姛")
+ if (fOURBOTReturn.returnCode == 0 && fOURBOTReturn.returnUserMsg == "鎴愬姛")
{
BaseDal.UpdateData(dt_Task);
return content.OK("淇敼浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
@@ -327,8 +332,8 @@
Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(HIKROBOTTaskGrade));
if (apiInfo == null) throw new Exception("鏈壘鍒板洓鍚戣溅AGV浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
string response = HttpHelper.Post(apiInfo.ApiAddress, request.Serialize());
- HIKROBOTReturn hIKROBOTReturn=response.DeserializeObject<HIKROBOTReturn>();
- if (hIKROBOTReturn.code == "SUCCESS0"&&hIKROBOTReturn.message=="鎴愬姛")
+ HIKROBOTReturn hIKROBOTReturn = response.DeserializeObject<HIKROBOTReturn>();
+ if (hIKROBOTReturn.code == "SUCCESS0" && hIKROBOTReturn.message == "鎴愬姛")
{
BaseDal.UpdateData(dt_Task);
return content.OK("淇敼浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
@@ -357,11 +362,11 @@
try
{
var rgv = new List<Dt_RGVLocationInfo>();
- var kls=new List<Dt_KLSLocationInfo>();
- var hk=new List<Dt_HKLocationInfo>();
- if(wMSUpdateLocationArea.WarehouseId == 1)
+ 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();
+ var rgvList = _rGVLocationInfoService.Repository.QueryData(x => wMSUpdateLocationArea.LocationCodes.Contains(x.LocationCode)).ToList();
foreach (var item in rgvList)
{
item.WarehouseId = wMSUpdateLocationArea.UpdateAreaCode.ObjToInt();
@@ -403,7 +408,7 @@
private void UpdateLocationCode(object LocationInfo, string updateAreaCode)
{
-
+
}
@@ -946,18 +951,6 @@
}
/// <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>
@@ -1014,15 +1007,92 @@
{
throw new NotImplementedException();
}
-
+ /// <summary>
+ /// 瀹瑰櫒娴佸姩璇锋眰
+ /// </summary>
+ /// <param name="wMSContainerFlow"></param>
+ /// <returns></returns>
+ /// <exception cref="NotImplementedException"></exception>
public WebResponseContent ContainerRequest(WMSContainerFlow wMSContainerFlow)
{
- throw new NotImplementedException();
+ try
+ {
+ Dt_StationManger stationManger = _stationMangerService.Repository.QueryFirst(x => x.StationCode == wMSContainerFlow.slotCode) ?? throw new Exception($"鏈壘鍒扮珯鍙般�恵wMSContainerFlow.slotCode}銆戜俊鎭�");
+ Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == "releaseStation") ?? throw new Exception("鏈壘鍒扮珯鐐瑰鍣ㄩ噴鏀炬帴鍙ｉ厤缃俊鎭紒璇锋鏌ユ帴鍙ｉ厤缃�");
+ if (wMSContainerFlow.direction == "200")
+ {
+ stationManger.IsOccupied = LocationStatusEnum.Free.ObjToInt();
+ FOURBOToccupyStation fOURBOToccupyStation = new FOURBOToccupyStation()
+ {
+ stationCode = wMSContainerFlow.slotCode,
+ };
+ string response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOToccupyStation.Serialize());
+ FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
+ if (fOURBOTReturn.returnCode != 0) throw new Exception(fOURBOTReturn.returnUserMsg);
+ _stationMangerService.UpdateData(stationManger);
+ }
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
}
-
+ /// <summary>
+ /// 璐ㄦ缁撴灉鍙嶉
+ /// </summary>
+ /// <param name="iQC"></param>
+ /// <returns></returns>
+ /// <exception cref="NotImplementedException"></exception>
public WebResponseContent IQCResult(IQCResultDTO iQC)
{
- throw new NotImplementedException();
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ #region 瀹瑰櫒涓婃灦
+ Dt_StationManger stationManger = _stationMangerService.Repository.QueryFirst(x => x.StationCode == iQC.StationCode) ?? throw new Exception($"鏈壘鍒扮珯鍙般�恵iQC.StationCode}銆戜俊鎭�");
+ Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(FOURBOToccupyStation)) ?? throw new Exception("鏈壘鍒扮珯鐐瑰鍣ㄤ笂鏋舵帴鍙ｉ厤缃俊鎭紒璇锋鏌ユ帴鍙ｉ厤缃�");
+ FOURBOToccupyStation fOURBOToccupyStation = new FOURBOToccupyStation()
+ {
+ stationCode = iQC.StationCode,
+ podID = iQC.ContainerCode,
+ };
+ string response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOToccupyStation.Serialize());
+ FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
+ if (fOURBOTReturn.returnCode != 0 && fOURBOTReturn.returnUserMsg != $"绔欑偣宸茶鍗犵敤,(podID={iQC.ContainerCode})")
+ throw new Exception(fOURBOTReturn.returnUserMsg);
+ #endregion
+
+ #region 鍒涘缓鍥涘悜杞︿换鍔�
+ var task = BaseDal.QueryFirst(x => x.PalletCode == iQC.ContainerCode && x.SourceAddress == iQC.StationCode && x.TaskState == (int)TaskStatusEnum.New);
+ #endregion
+ #region 鍛煎彨鍥涘悜杞�
+ apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(FOURBOTnewMovePodTask)) ?? throw new Exception("鏈壘鍒板洓鍚戣溅浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
+ FOURBOTnewMovePodTask fOURBOTnewMovePodTask = new()
+ {
+ priority = task.Grade,
+ podID = task.PalletCode,
+ //desNodeID = task.SourceAddress,
+ desExt = new
+ {
+ unload = 0//鏄惁鏀句笅瀹瑰櫒,0鍚�1鏄�
+ },
+ desStationCodes = task.SourceAddress,
+ desType = 5
+ };
+ response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOTnewMovePodTask.Serialize());
+ fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
+ content.Data = fOURBOTReturn;
+ if (fOURBOTReturn.returnCode != 0) throw new Exception(fOURBOTReturn.returnUserMsg);
+ task.TaskState = (int)TaskStatusEnum.Execut;
+ BaseDal.UpdateData(task);
+ #endregion
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
}
/// <summary>
@@ -1035,10 +1105,10 @@
{
try
{
- var Agvlocation = _rGVLocationInfoService.Repository.QueryData(x=> fOURBOTStorageStatusNotify.storageCode.Contains(x.LocationCode));
+ var Agvlocation = _rGVLocationInfoService.Repository.QueryData(x => fOURBOTStorageStatusNotify.storageCode.Contains(x.LocationCode));
foreach (var item in Agvlocation)
{
- item.LocationStatus = (int)(fOURBOTStorageStatusNotify.disable==0?EnableStatusEnum.Normal:EnableStatusEnum.Disable);
+ item.EnableStatus = (int)(fOURBOTStorageStatusNotify.disable == 0 ? EnableStatusEnum.Normal : EnableStatusEnum.Disable);
}
_rGVLocationInfoService.UpdateData(Agvlocation);
return WebResponseContent.Instance.OK();
--
Gitblit v1.9.3