From 07d83d2d583f96ddd7df98bbb202c98f3b073cd4 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期二, 10 三月 2026 13:41:02 +0800
Subject: [PATCH] 添加前端任务状态枚举，以及历史任务页面
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs | 138 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 123 insertions(+), 15 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 b5f2ecc..d8b1305 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"
@@ -1,4 +1,5 @@
-锘縰sing Magicodes.IE.Core;
+锘縰sing Autofac.Core;
+using Magicodes.IE.Core;
using NetTaste;
using System;
using System.Collections.Generic;
@@ -14,8 +15,11 @@
using WIDESEAWCS_Core.Enums;
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_DTO;
+using WIDESEAWCS_DTO.AGV.HIKROBOT;
+using WIDESEAWCS_DTO.RGV.FOURBOT;
using WIDESEAWCS_DTO.WMS;
using WIDESEAWCS_Model.Models;
+using WIDESEAWCS_QuartzJob;
namespace WIDESEAWCS_TaskInfoService
{
@@ -35,11 +39,13 @@
WebResponseContent content = new WebResponseContent();
GALAXISUpdateTaskStatus gALAXIS = new();
+ RGVReturnInfo Rgv = new();//鍥涘悜杞︿换鍔＄姸鎬侀�氱煡
+ HIKROBOTTaskProcessReport hIKROBOT = new();//娴峰悍鏈哄櫒浜�
try
{
if (deviceTypeEnum == DeviceTypeEnum.GALAXIS)
{
- gALAXIS = TaskDTO.Serialize().DeserializeObject<GALAXISUpdateTaskStatus>();
+ gALAXIS = TaskDTO.Serialize().DeserializeObject<GALAXISUpdateTaskStatus>();
if (gALAXIS == null) throw new Exception("鍙傛暟杞崲澶辫触锛�");
var task = BaseDal.QueryFirst(x => x.WMSTaskNum == gALAXIS.taskId);
if (task == null) throw new Exception($"鏈壘鍒颁换鍔�,浠诲姟缂栧彿銆恵gALAXIS.taskId}銆�");
@@ -59,23 +65,99 @@
}
else if (deviceTypeEnum == DeviceTypeEnum.HIKROBOT)
{
-
+ hIKROBOT = TaskDTO.Serialize().DeserializeObject<HIKROBOTTaskProcessReport>();
+ if (hIKROBOT == null) throw new Exception("鍙傛暟杞崲澶辫触锛�");
+ var task = BaseDal.QueryFirst(x => x.WMSTaskNum == hIKROBOT.robotTaskCode);
+ if (task == null) throw new Exception($"鏈壘鍒颁换鍔�,浠诲姟缂栧彿銆恵hIKROBOT.robotTaskCode}銆�");
+ switch (hIKROBOT.extra.values.method)
+ {
+ case "start":
+ TaskCompleted(task, deviceTypeEnum);
+ break;
+ case "end":
+ TaskFromCompleted(task, deviceTypeEnum);
+ break;
+ default:
+ task.TaskState = ReturnTaskStatus(hIKROBOT.extra.values.method, deviceTypeEnum);
+ BaseDal.UpdateData(task);
+ break;
+ }
}
else //鍥涘悜杞�
{
-
+ Rgv = TaskDTO.Serialize().DeserializeObject<RGVReturnInfo>();
+ if (Rgv == null) throw new Exception("鍙傛暟杞崲澶辫触锛�");
+ //var task = BaseDal.QueryFirst(x => x.RGVTaskId == Rgv.content.taskID);
+ var task = BaseDal.QueryFirst(x => x.PalletCode == Rgv.content.podID);
+ if (task == null) throw new Exception($"鏈壘鍒颁换鍔�,浠诲姟缂栧彿銆恵Rgv.content.taskID}銆�");
+ if (Rgv.messageType == 72)//灏忚溅椤惰捣璐х墿
+ {
+ if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.Execut)
+ {
+ task.TaskState = (int)TaskStatusEnum.WaiCheckShape;
+ BaseDal.UpdateData(task);//缁欒川妫�闂ㄥ啓鍏ュ惎鍔ㄤ俊鍙�
+ var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "F1") as OtherDevice ?? throw new Exception("鏈壘鍒�1妤艰川妫�闂ㄨ澶囦俊鎭�");
+ device.SetValue(QualityInspectionCommandEnum.StartqualityInspection, true, task.SourceAddress);
+ }
+ else
+ {
+ TaskFromCompleted(task, deviceTypeEnum);
+ }
+ }
+ else if (Rgv.messageType == 10)
+ {
+ if(Rgv.content.status == 4)
+ {
+ 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);
+ }
+ }
+ }
}
- //return WebResponseContent.Instance.OK();
- return content.OK();
+ content.OK();
}
catch (Exception ex)
{
- return content.Error(ex.Message);
+ content.Error(ex.Message);
}
finally
{
- _trackloginfoService.AddTrackLog(gALAXIS, content, "涓嬪彂鍑箰澹獳GV浠诲姟", "", "");
+ // 鍦� finally 涓垽鏂摢涓璞¤璧嬪�间簡
+ object logObject = null;
+ string deviceName = "";
+
+ if (gALAXIS != null && gALAXIS.taskId != null)
+ {
+ logObject = gALAXIS;
+ deviceName = "鍑箰澹獳GV";
+ }
+ else if (hIKROBOT != null && hIKROBOT.robotTaskCode != null)
+ {
+ logObject = hIKROBOT;
+ deviceName = "娴峰悍鏈哄櫒浜�";
+ }
+ else if (Rgv != null && Rgv.content.taskID != 0)
+ {
+ logObject = Rgv;
+ deviceName = "鍥涘悜杞�";
+ }
+
+ if (logObject != null)
+ {
+ _trackloginfoService.AddTrackLog(logObject, content, $"涓嬪彂{deviceName}浠诲姟", "", "");
+ }
}
+ return content;
}
#endregion
@@ -134,7 +216,7 @@
{
dt_Task.TaskState = TaskStatusEnum.TakeFinish.ObjToInt();
Db.Ado.BeginTran();
- UpdateLocationStatus(dt_Task.SourceAddress, deviceTypeEnum, LocationStatusEnum.Free);
+ UpdateLocationStatus(dt_Task.SourceAddress, dt_Task.PalletCode, deviceTypeEnum, LocationStatusEnum.Free);
BaseDal.UpdateData(dt_Task);
Db.Ado.CommitTran();
return WebResponseContent.Instance.OK();
@@ -186,7 +268,7 @@
if (agvContent.code != 0) dt_Task.ExceptionMessage = agvContent.msg;
}
Db.Ado.BeginTran();
- UpdateLocationStatus(dt_Task.TargetAddress, deviceTypeEnum, LocationStatusEnum.InStock);
+ UpdateLocationStatus(dt_Task.TargetAddress, dt_Task.PalletCode, deviceTypeEnum, LocationStatusEnum.InStock);
if (agvContent != null && agvContent.code == 0)
BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩瀹屾垚);
else
@@ -210,38 +292,64 @@
/// <param name="deviceTypeEnum"></param>
/// <param name="locationStatusEnum"></param>
/// <returns></returns>
- public WebResponseContent UpdateLocationStatus(string LocationCode, DeviceTypeEnum deviceTypeEnum, LocationStatusEnum locationStatusEnum)
+ public WebResponseContent UpdateLocationStatus(string locationCode, string palletCode, DeviceTypeEnum deviceTypeEnum, LocationStatusEnum locationStatusEnum)
{
try
{
if (deviceTypeEnum == DeviceTypeEnum.GALAXIS)
{
- Dt_KLSLocationInfo? dt_KLSLocationInfo = _kLSLocationInfoService.Repository.QueryFirst(x => x.LocationCode == LocationCode);
+ Dt_KLSLocationInfo? dt_KLSLocationInfo = _kLSLocationInfoService.Repository.QueryFirst(x => x.LocationCode == locationCode);
if (dt_KLSLocationInfo != null)
{
+ if (locationStatusEnum == LocationStatusEnum.Free) //濡傛灉璧风偣瀹屾垚灏辩粰璐т綅璧嬪�兼墭鐩樺彿
+ {
+ dt_KLSLocationInfo.PalletCode = "";
+ }
+ else
+ {
+ dt_KLSLocationInfo.PalletCode = palletCode;
+ }
dt_KLSLocationInfo.LocationStatus = locationStatusEnum.ObjToInt();
_kLSLocationInfoService.Repository.UpdateData(dt_KLSLocationInfo);
}
}
else if (deviceTypeEnum == DeviceTypeEnum.HIKROBOT)
{
- Dt_HKLocationInfo? dt_HKLocationInfo = _hKLocationInfoService.Repository.QueryFirst(x => x.LocationCode == LocationCode);
+ Dt_HKLocationInfo? dt_HKLocationInfo = _hKLocationInfoService.Repository.QueryFirst(x => x.LocationCode == locationCode);
if (dt_HKLocationInfo != null)
{
+ if (locationStatusEnum == LocationStatusEnum.Free) //濡傛灉璧风偣瀹屾垚灏辩粰璐т綅璧嬪�兼墭鐩樺彿
+ {
+ dt_HKLocationInfo.PalletCode = "";
+ }
+ else
+ {
+ dt_HKLocationInfo.PalletCode = palletCode;
+ }
dt_HKLocationInfo.LocationStatus = locationStatusEnum.ObjToInt();
_hKLocationInfoService.Repository.UpdateData(dt_HKLocationInfo);
}
}
else if (deviceTypeEnum == DeviceTypeEnum.YuanLiJuHe)
{
- Dt_RGVLocationInfo dt_RGVLocationInfo = _rGVLocationInfoService.Repository.QueryFirst(x => x.LocationCode == LocationCode);
+ Dt_RGVLocationInfo dt_RGVLocationInfo = _rGVLocationInfoService.Repository.QueryFirst(x => x.LocationCode == locationCode);
+ //杩欓噷灏嗕换鍔＄殑鎵樼洏鍙风粰璐т綅琛ㄤ腑鐨凱alletCode瀛楁銆�
+
if (dt_RGVLocationInfo != null)
{
+ if (locationStatusEnum == LocationStatusEnum.Free) //濡傛灉璧风偣瀹屾垚灏辩粰璐т綅璧嬪�兼墭鐩樺彿
+ {
+ dt_RGVLocationInfo.PalletCode = "";
+ }
+ else
+ {
+ dt_RGVLocationInfo.PalletCode = palletCode;
+ }
dt_RGVLocationInfo.LocationStatus = locationStatusEnum.ObjToInt();
_rGVLocationInfoService.Repository.UpdateData(dt_RGVLocationInfo);
}
}
- else//搴撳绔欏彴
+ else//骞冲簱搴撲綅
{
}
--
Gitblit v1.9.3