From bf1419409cdeeb2554caed0187955a801d28389b Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期三, 01 四月 2026 20:53:32 +0800
Subject: [PATCH] 优化WMS下发成品入库任务时，判断终点区域是否有空货位
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/HKTaskMethods.cs | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/HKTaskMethods.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/HKTaskMethods.cs"
index b87085b..6aec781 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/HKTaskMethods.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/HKTaskMethods.cs"
@@ -181,7 +181,7 @@
// 鍒涘缓Headers瀛楀吀
var headers = new Dictionary<string, string>
{
- { "X-lr-request-id", DateTimeOffset.Now.ToUnixTimeSeconds().ToString() }
+ { "X-lr-request-id", DateTimeOffset.Now.ToUnixTimeSeconds().ToString()+task.TaskNum }
// 濡傛灉闇�瑕佸叾浠朒eader锛屽彲浠ョ户缁坊鍔�
// { "Content-Type", "application/json" }
};
@@ -221,7 +221,7 @@
HIKROBOTTaskSubmit hIKROBOTTaskSubmit = new HIKROBOTTaskSubmit();
try
{
- var tasktype = (TaskTypeEnum)Enum.GetValues(typeof(TaskTypeEnum)).GetValue(task.TaskType-1);
+ var tasktype = (TaskTypeEnum)Enum.GetValues(typeof(TaskTypeEnum)).GetValue(task.TaskType - 1);
hIKROBOTTaskSubmit.initPriority = task.Grade;
hIKROBOTTaskSubmit.robotTaskCode = task.WMSTaskNum;
@@ -245,6 +245,8 @@
case TaskTypeEnum.RK3F:
case TaskTypeEnum.CK3F:
case TaskTypeEnum.F02:
+ case TaskTypeEnum.F03:
+ case TaskTypeEnum.F04:
{
TargetRouteDto target = new TargetRouteDto()
{
@@ -306,10 +308,26 @@
}
break;
case TaskTypeEnum.Q3RK:
- break;
case TaskTypeEnum.Q3CK:
- break;
case TaskTypeEnum.Move:
+ {
+ TargetRouteDto target = new TargetRouteDto()
+ {
+ code = task.CurrentAddress,
+ operation = "DELIVERY",//鍙栬揣
+ seq = 0,
+ type = "SITE",
+ };
+ TargetRouteDto targetRoute = new TargetRouteDto()
+ {
+ code = task.NextAddress,
+ operation = "DELIVERY",//閫佽揣
+ seq = 1,
+ type = "SITE",
+ };
+ hIKROBOTTaskSubmit.targetRoute.Add(target);
+ hIKROBOTTaskSubmit.targetRoute.Add(targetRoute);
+ }
break;
case TaskTypeEnum.CPMoveInventory:
break;
@@ -330,11 +348,11 @@
/// </summary>
/// <param name="TaskCode">浠诲姟鍙�</param>
/// <returns></returns>
- public WebResponseContent Hikvisiontaskscontinue(string TaskCode,string Address=null)
+ public WebResponseContent Hikvisiontaskscontinue(string TaskCode, string Address = null)
{
WebResponseContent content = new WebResponseContent();
HIKROBOTReturn hIKROBOTReturn = null;
- HIKROBOTTaskContinue hIKROBOTTaskContinue =null;
+ HIKROBOTTaskContinue hIKROBOTTaskContinue = null;
try
{
// 1. 鍙傛暟楠岃瘉
@@ -346,8 +364,8 @@
hIKROBOTTaskContinue = new HIKROBOTTaskContinue()
{
triggerCode = TaskCode,
- triggerType="TASK",//鍥哄畾鍊�
- targetRoute=string.IsNullOrEmpty(Address)?null:
+ triggerType = "TASK",//鍥哄畾鍊�
+ targetRoute = string.IsNullOrEmpty(Address) ? null :
new TargetRouteDto()
{
code = Address,
@@ -356,11 +374,11 @@
};
var headers = new Dictionary<string, string>
{
- { "X-lr-request-id", DateTimeOffset.Now.ToUnixTimeSeconds().ToString() }
+ { "X-lr-request-id", DateTimeOffset.Now.ToUnixTimeSeconds().ToString()+TaskCode }
};
- string response = HttpHelper.Post(apiInfo.ApiAddress, hIKROBOTTaskContinue.Serialize(),headers: headers);
+ string response = HttpHelper.Post(apiInfo.ApiAddress, hIKROBOTTaskContinue.Serialize(), headers: headers);
hIKROBOTReturn = response.DeserializeObject<HIKROBOTReturn>();
-
+
if (hIKROBOTReturn.code == "SUCCESS")
{
var data = hIKROBOTReturn.data.ToString().DeserializeObject<HIKROBOTReturnData>();
--
Gitblit v1.9.3