From aa75f3cbdcfce80d7ebd3c4f2bcfeea850949209 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 10 三月 2026 20:22:01 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs | 115 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 68 insertions(+), 47 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs"
index 7d10a8f..ca5fdbb 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs"
@@ -59,7 +59,8 @@
break;
default:
task.TaskState = ReturnTaskStatus(gALAXIS.taskStatus, deviceTypeEnum);
- BaseDal.UpdateData(task);
+ if (gALAXIS.taskStatus == 10) TaskFeedback(task, 1);
+ else BaseDal.UpdateData(task);
break;
}
}
@@ -71,10 +72,10 @@
if (task == null) throw new Exception($"鏈壘鍒颁换鍔�,浠诲姟缂栧彿銆恵hIKROBOT.robotTaskCode}銆�");
switch (hIKROBOT.extra.values.method)
{
- case "start":
+ case "end":
TaskCompleted(task, deviceTypeEnum);
break;
- case "end":
+ case "outbin":
TaskFromCompleted(task, deviceTypeEnum);
break;
default:
@@ -106,14 +107,21 @@
}
else if (Rgv.messageType == 10)
{
- if (task.TaskState == (int)TaskStatusEnum.TakeFinish && Rgv.content.status == 4)
+ if (Rgv.content.status == 4)
{
- task.TaskState = (int)TaskStatusEnum.CheckShapeing;
- BaseDal.UpdateData(task);
- }
- else if (task.TaskState == (int)TaskStatusEnum.Puting && Rgv.content.status == 4)
- {
- TaskCompleted(task, deviceTypeEnum);
+ if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.TakeFinish)
+ {
+ task.TaskState = (int)TaskStatusEnum.CheckShapeing;
+ BaseDal.UpdateData(task);
+ }
+ else if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.Puting)
+ {
+ TaskCompleted(task, deviceTypeEnum);
+ }
+ else if (task.TaskType == (int)TaskTypeEnum.CPOutbound || task.TaskType == (int)TaskTypeEnum.CPMoveInventory)//鍑哄簱銆佺Щ搴撳畬鎴�
+ {
+ TaskCompleted(task, deviceTypeEnum);
+ }
}
}
}
@@ -121,7 +129,7 @@
}
catch (Exception ex)
{
- content.Error(ex.Message);
+ content.Error(ex.Message);
}
finally
{
@@ -208,10 +216,11 @@
try
{
dt_Task.TaskState = TaskStatusEnum.TakeFinish.ObjToInt();
- Db.Ado.BeginTran();
+ TaskFeedback(dt_Task, 4);
+ //Db.Ado.BeginTran();
UpdateLocationStatus(dt_Task.SourceAddress, dt_Task.PalletCode, deviceTypeEnum, LocationStatusEnum.Free);
- BaseDal.UpdateData(dt_Task);
- Db.Ado.CommitTran();
+ //BaseDal.UpdateData(dt_Task);
+ //Db.Ado.CommitTran();
return WebResponseContent.Instance.OK();
}
catch (Exception ex)
@@ -233,45 +242,17 @@
{
try
{
- WMSInOutBoundCompleteFeedback boundCompleteFeedback = new WMSInOutBoundCompleteFeedback();
- WMSReturn agvContent = null;
dt_Task.TaskState = TaskStatusEnum.Finish.ObjToInt();
-
- Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(WMSInOutBoundCompleteFeedback));
- if (apiInfo == null) dt_Task.ExceptionMessage = "鏈壘鍒板嚭鍏ュ簱瀹屾垚鍙嶉WMS鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�";
- else
- {
- boundCompleteFeedback.taskCode = dt_Task.WMSTaskNum;
- boundCompleteFeedback.containerCode = dt_Task.PalletCode;
- boundCompleteFeedback.fromStationCode = dt_Task.SourceAddress;
- boundCompleteFeedback.toLocationCode = dt_Task.TargetAddress;
- switch (deviceTypeEnum)
- {
- case DeviceTypeEnum.GALAXIS:
- boundCompleteFeedback.businessType = 1;
- break;
- case DeviceTypeEnum.YuanLiJuHe:
- boundCompleteFeedback.businessType = 2;
- break;
- }
-
- boundCompleteFeedback.completeType = 1;
- string response = HttpHelper.Post(apiInfo.ApiAddress, boundCompleteFeedback.Serialize());
- agvContent = response.DeserializeObject<WMSReturn>();
- if (agvContent.code != 0) dt_Task.ExceptionMessage = agvContent.msg;
- }
- Db.Ado.BeginTran();
+ TaskFeedback(dt_Task, 2);
+ //Db.Ado.BeginTran();
UpdateLocationStatus(dt_Task.TargetAddress, dt_Task.PalletCode, deviceTypeEnum, LocationStatusEnum.InStock);
- if (agvContent != null && agvContent.code == 0)
- BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩瀹屾垚);
- else
- BaseDal.UpdateData(dt_Task);
- Db.Ado.CommitTran();
+
+ //Db.Ado.CommitTran();
return WebResponseContent.Instance.OK();
}
catch (Exception ex)
{
- Db.Ado.RollbackTran();
+ //Db.Ado.RollbackTran();
throw new Exception(ex.Message);
}
}
@@ -354,5 +335,45 @@
}
}
#endregion
+
+ #region 涓婃姤WMS
+ public WebResponseContent TaskFeedback(Dt_Task dt_Task, int Status)
+ {
+ WebResponseContent content = new WebResponseContent();
+ WMSInOutBoundCompleteFeedback boundCompleteFeedback = new WMSInOutBoundCompleteFeedback();
+ WMSReturn agvContent = null;
+ try
+ {
+ Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(WMSInOutBoundCompleteFeedback));
+ if (apiInfo == null) dt_Task.ExceptionMessage = "鏈壘鍒板嚭鍏ュ簱瀹屾垚鍙嶉WMS鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�";
+ else
+ {
+ boundCompleteFeedback.taskCode = dt_Task.WMSTaskNum;
+ boundCompleteFeedback.containerCode = dt_Task.PalletCode;
+ boundCompleteFeedback.fromStationCode = dt_Task.SourceAddress;
+ boundCompleteFeedback.toLocationCode = dt_Task.TargetAddress;
+ boundCompleteFeedback.status = Status;
+ boundCompleteFeedback.custStatus = "";
+ string response = HttpHelper.Post(apiInfo.ApiAddress, boundCompleteFeedback.Serialize());
+ agvContent = response.DeserializeObject<WMSReturn>();
+ content.Data = agvContent;
+ if (agvContent.code != 0) dt_Task.ExceptionMessage = agvContent.msg;
+ }
+ }
+ catch (Exception ex)
+ {
+ dt_Task.ExceptionMessage = ex.Message;
+ }
+ finally
+ {
+ _trackloginfoService.AddTrackLog(boundCompleteFeedback, content, "鍑哄叆搴撲换鍔＄姸鎬佸弽棣圵MS", "", "");
+ if (agvContent != null && agvContent.code == 0 && Status == 2)
+ BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩瀹屾垚);
+ else
+ BaseDal.UpdateData(dt_Task);
+ }
+ return WebResponseContent.Instance.OK();
+ }
+ #endregion
}
}
--
Gitblit v1.9.3