From 0875bfa35d389e238ae82142ce45b71c9715133b Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期五, 17 四月 2026 17:37:39 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/RuiShengZhiNeng/GaoPuLiTiKu
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/RGVTaskExtend.cs | 64 +++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 14 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 aff1ab6..9c6fff4 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"
@@ -4,6 +4,7 @@
using System.Collections;
using System.Collections.Generic;
using System.Linq;
+using System.Net.NetworkInformation;
using System.Text;
using System.Threading.Tasks;
using WIDESEAWCS_Common;
@@ -164,7 +165,7 @@
WebResponseContent content = new WebResponseContent();
try
{
- List<Dt_Task> dt_Tasks = new List<Dt_Task>();
+ //List<Dt_Task> dt_Tasks = new List<Dt_Task>();
var PalletCodes = tasks.Select(x => x.PalletCode).ToList();
var request = new GetBlockPodContentListDto
{
@@ -221,34 +222,69 @@
_taskService.UpdateData(tasks);
return;
}
- foreach (var Result in getBlockPod.Result)
+ #region 鍒ゆ柇鏄惁闇�瑕佺Щ搴�
+ foreach (var task in tasks)
{
- foreach (var item in Result.outPods)
+ var item = getBlockPod.Result[0].outPods.FirstOrDefault(x => x.outPod == task.PalletCode);
+ if (item != null)
{
- var task = tasks.First(x => x.PalletCode == item.outPod);
if (item.blockPods != null && item.blockPods.Count > 0)
item.blockPods = item.blockPods.Except(PalletCodes).ToList();
if (item.blockPods != null && item.blockPods.Count > 0)
{
- #region 鍒ゆ柇闃荤鎵樻槸鍚︿负鍑哄簱浠诲姟
- //var except = item.blockPods.Except(PalletCodes).ToList();
- #endregion
var responseContent = AddMoveTask(item.blockPods, task);//娣诲姞绉诲簱浠诲姟
if (!responseContent.Status) task.ExceptionMessage = responseContent.Message;
- else
- {
- task.TaskState = (int)TaskStatusEnum.RGV_WaitMoveToExecute;
- }
- dt_Tasks.Add(task);
+ else task.TaskState = (int)TaskStatusEnum.RGV_WaitMoveToExecute;
+ #region 绉诲簱鐘舵�佸弽棣堢粰WMS
+ WMSInOutBoundCompleteFeedback boundCompleteFeedback = new WMSInOutBoundCompleteFeedback();
+ boundCompleteFeedback.taskCode = task.WMSTaskNum;
+ boundCompleteFeedback.containerCode = task.PalletCode;
+ boundCompleteFeedback.fromStationCode = task.SourceAddress;
+ boundCompleteFeedback.toLocationCode = task.TargetAddress;
+ boundCompleteFeedback.status = 5;
+ boundCompleteFeedback.custStatus = "";
+ _apiInfoService.PostInterfaceRequest(nameof(WMSInOutBoundCompleteFeedback), boundCompleteFeedback.Serialize(), "鎴愬搧鍑哄簱浠诲姟绛夊緟绉诲簱涓婃姤WMS");
+ #endregion
}
else
{
task.TaskState = (int)TaskStatusEnum.RGV_WaitSend;
- dt_Tasks.Add(task);
}
}
+ else task.ExceptionMessage = $"RCS鏈弽棣堛�恵task.PalletCode}銆戝彲鍑哄簱鎵樼洏淇℃伅,璇︽儏璇锋煡鐪嬫壒閲忚幏鍙栭樆纰嶆墭鐩樺叧绯绘帴鍙ｆ棩蹇楋紒";
}
- _taskService.UpdateData(dt_Tasks);
+ _taskService.Repository.UpdateData(tasks);
+ #endregion
+ #region MyRegion
+ //foreach (var Result in getBlockPod.Result)
+ //{
+ // foreach (var item in Result.outPods)
+ // {
+ // var task = tasks.First(x => x.PalletCode == item.outPod);
+ // if (item.blockPods != null && item.blockPods.Count > 0)
+ // item.blockPods = item.blockPods.Except(PalletCodes).ToList();
+ // if (item.blockPods != null && item.blockPods.Count > 0)
+ // {
+ // #region 鍒ゆ柇闃荤鎵樻槸鍚︿负鍑哄簱浠诲姟
+ // //var except = item.blockPods.Except(PalletCodes).ToList();
+ // #endregion
+ // var responseContent = AddMoveTask(item.blockPods, task);//娣诲姞绉诲簱浠诲姟
+ // if (!responseContent.Status) task.ExceptionMessage = responseContent.Message;
+ // else
+ // {
+ // task.TaskState = (int)TaskStatusEnum.RGV_WaitMoveToExecute;
+ // }
+ // dt_Tasks.Add(task);
+ // }
+ // else
+ // {
+ // task.TaskState = (int)TaskStatusEnum.RGV_WaitSend;
+ // dt_Tasks.Add(task);
+ // }
+ // }
+ //}
+ //_taskService.UpdateData(dt_Tasks);
+ #endregion
content.OK();
}
}
--
Gitblit v1.9.3