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_Tasks/Task/RGVTaskExtend.cs | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/RGVTaskExtend.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/RGVTaskExtend.cs"
index e2377e1..5323c10 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/RGVTaskExtend.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/RGVTaskExtend.cs"
@@ -91,7 +91,7 @@
WebResponseContent content = new WebResponseContent();
try
{
- Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(GetBlockPodContentDto)) ?? throw new Exception("鏈壘鍒板洓鍚戣溅浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
+ Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(GetBlockPodContentDto)) ?? throw new Exception("鏈壘鍒版壒閲忚幏鍙栭樆纰嶆墭鐩樺叧绯绘帴鍙ｉ厤缃俊鎭紒璇锋鏌ユ帴鍙ｉ厤缃�");
List<Dt_Task> dt_Tasks = new List<Dt_Task>();
var PalletCodes = tasks.Select(x => x.PalletCode).ToList();
//GetBlockPodContentDto content = new GetBlockPodContentDto();
@@ -125,7 +125,7 @@
foreach (var item in Result.outPods)
{
var task = tasks.First(x => x.PalletCode == item.outPod);
- if (item.blockPods.Count > 0)
+ if (item.blockPods != null && item.blockPods.Count > 0)
{
task.TaskState = (int)TaskStatusEnum.RGV_WaitMoveToExecute;
dt_Tasks.Add(task);
@@ -175,7 +175,7 @@
try
{
#region 鑾峰彇璐т綅
- var rGVLocationInfo = _rGVLocationInfoService.GetFreeLocationInfo(item.Roadway);
+ var rGVLocationInfo = _rGVLocationInfoService.GetInFreeLocationInfo(item.Roadway);
if (rGVLocationInfo == null)
{
item.ExceptionMessage = $"鏈壘鍒扮粓鐐瑰簱鍖恒�恵item.Roadway}銆戝彲鐢ㄧ┖璐т綅锛�";
@@ -456,21 +456,21 @@
{
WebResponseContent content = new WebResponseContent();
List<Dt_Task> dt_Tasks = new List<Dt_Task>();
- List<MoveBlockPodContentDto> moveBlocks = new List<MoveBlockPodContentDto>();
+ MoveBlockPodContentDto moveBlock = new MoveBlockPodContentDto();
try
{
Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(MoveBlockPodContentDto)) ?? throw new Exception("鏈壘鍒板洓鍚戣溅鎵归噺鎼繍闃荤鎵樹换鍔℃帴鍙ｉ厤缃俊鎭紒璇锋鏌ユ帴鍙ｉ厤缃�");
foreach (var item in tasks)
{
- MoveBlockPodContentDto moveBlock = new MoveBlockPodContentDto()
+ MoveBlockPodContentDtoInfo moveBlockInfo = new MoveBlockPodContentDtoInfo()
{
podID = item.PalletCode,
des = item.TargetAddress
};
- moveBlocks.Add(moveBlock);
+ moveBlock.content.Add(moveBlockInfo);
}
- string response = HttpHelper.Post(apiInfo.ApiAddress, moveBlocks.Serialize());
+ string response = HttpHelper.Post(apiInfo.ApiAddress, moveBlock.Serialize());
FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
content.Data = fOURBOTReturn;
if (fOURBOTReturn.returnCode == 0)
@@ -502,7 +502,7 @@
}
finally
{
- _trackloginfoService.AddTrackLog(moveBlocks, content, "涓嬪彂鍥涘悜杞︽壒閲忕Щ搴撲换鍔�", "", "");
+ _trackloginfoService.AddTrackLog(moveBlock, content, "涓嬪彂鍥涘悜杞︽壒閲忕Щ搴撲换鍔�", "", "");
}
}
#endregion
@@ -537,24 +537,28 @@
try
{
Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(FOURBOTnewMovePodTask)) ?? throw new Exception("鏈壘鍒板洓鍚戣溅浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
+ var i = 0;
foreach (var item in tasks)
{
+ i++;
var stationManger = _stationMangerService.GetOutStationInfo(item.TargetAddress);
item.NextAddress = stationManger.StationCode;
if (stationManger.IsOccupied != LocationStatusEnum.Free.ObjToInt()) continue;
#region 涓嬪彂鍑哄簱浠诲姟
fOURBOTnewMovePodTask.priority = item.Grade;
fOURBOTnewMovePodTask.podID = item.PalletCode;
- fOURBOTnewMovePodTask.desNodeID = item.NextAddress;
+ //fOURBOTnewMovePodTask.desNodeID = item.NextAddress;
+ fOURBOTnewMovePodTask.desStationCodes = item.NextAddress;
fOURBOTnewMovePodTask.desExt = new
{
- unload = 0//鏄惁鏀句笅瀹瑰櫒,0鍚�1鏄�
+ unload = 1//鏄惁鏀句笅瀹瑰櫒,0鍚�1鏄�
};
fOURBOTnewMovePodTask.taskExt = new
{
autoToRest = 1
};
fOURBOTnewMovePodTask.desType = 5;
+ fOURBOTnewMovePodTask.requestID = DateTime.Now.ToString("yyyyMMddHHmmss") + i;
string response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOTnewMovePodTask.Serialize());
FOURBOTReturn fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
content.Data = fOURBOTReturn;
--
Gitblit v1.9.3