From 375bad8fd1e5650859456f4b31486d43e4c49371 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期六, 21 三月 2026 11:47:56 +0800
Subject: [PATCH] 添加job
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs | 10 +
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs | 24 +++
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/TSJJob.cs | 201 ++++++++++++++++++++++++++++
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/HoistEnum.cs | 78 +++++++++++
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/HKTaskMethods.cs | 61 ++++++++
5 files changed, 374 insertions(+), 0 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/HoistEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/HoistEnum.cs"
new file mode 100644
index 0000000..453d944
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/HoistEnum.cs"
@@ -0,0 +1,78 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEAWCS_Common
+{
+ public enum HoistEnum
+ {
+ /// <summary>
+ /// 3妤煎叆搴撶鍙�
+ /// </summary>
+ Inboxnumber,
+
+ /// <summary>
+ /// 3妤煎叆搴撶偣鏂欑鏈�/鏃�
+ /// </summary>
+ OutboundInplace,
+
+ /// <summary>
+ /// 3妤煎嚭搴撴枡绠卞埌浣�
+ /// </summary>
+ SOutboundmaterialbox,
+
+ /// <summary>
+ /// 3妤煎嚭搴撴枡绠辩紦瀛樻暟閲�
+ /// </summary>
+ Outboundmaterialbox,
+
+ /// <summary>
+ /// 4妤肩┖绠辩鍙�
+ /// </summary>
+ Emptycontainernumber,
+
+ /// <summary>
+ /// 4妤煎洖绠辨枡绠辨湁/鏃�
+ /// </summary>
+ ReturnbinAvailable,
+
+ /// <summary>
+ /// 4妤煎嚭搴撴枡绠卞埌浣�
+ /// </summary>
+ FOutboundmaterialbox,
+
+ /// <summary>
+ /// 璁惧鐘舵��
+ /// </summary>
+ EquipmentStatus,
+
+
+ /// <summary>
+ /// 3妤艰鐮佽Е鍙�
+ /// </summary>
+ Codereadingtriggered,
+
+ /// <summary>
+ /// 3妤煎叆搴撶鏀惧埌浣�
+ /// </summary>
+ Inboundboxon,
+
+ /// <summary>
+ /// 3妤煎嚭搴撶鍙栧畬鎴�
+ /// </summary>
+ Outboundboxon,
+
+ /// <summary>
+ /// 4妤肩┖绠辨斁鍒颁綅
+ /// </summary>
+ Emptyboxplacedinposition,
+
+
+ /// <summary>
+ /// 4妤煎嚭搴撳彇绠卞畬鎴�
+ /// </summary>
+ Outboundboxretrievalcompleted,
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
index 60494fd..dd34def 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
@@ -36,6 +36,7 @@
using Microsoft.VisualBasic;
using System.Web;
using WIDESEAWCS_DTO.RGV.FOURBOT;
+using WIDESEAWCS_DTO.AGV.HIKROBOT;
namespace WIDESEAWCS_ITaskInfoService
{
@@ -296,5 +297,14 @@
/// </summary>
/// <returns></returns>
WebResponseContent multiSetNodeStatus(FOURBOTStorageStatusNotify fOURBOTStorageStatusNotify);
+
+
+ /// <summary>
+ /// 娴峰悍AGV浠诲姟缁х画鎵ц
+ /// </summary>
+ /// <param name="TaskCode">浠诲姟鍙�</param>
+ /// <returns></returns>
+ WebResponseContent Hikvisiontaskscontinue(string TaskCode, string Address=null);
+
}
}
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 2eabbce..b87085b 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"
@@ -13,6 +13,7 @@
using WIDESEAWCS_DTO;
using WIDESEAWCS_DTO.AGV.HIKROBOT;
using System.Diagnostics.CodeAnalysis;
+using System.Reflection.PortableExecutable;
namespace WIDESEAWCS_TaskInfoService
{
@@ -322,5 +323,65 @@
}
return hIKROBOTTaskSubmit;
}
+
+
+ /// <summary>
+ /// 娴峰悍AGV浠诲姟缁х画鎵ц
+ /// </summary>
+ /// <param name="TaskCode">浠诲姟鍙�</param>
+ /// <returns></returns>
+ public WebResponseContent Hikvisiontaskscontinue(string TaskCode,string Address=null)
+ {
+ WebResponseContent content = new WebResponseContent();
+ HIKROBOTReturn hIKROBOTReturn = null;
+ HIKROBOTTaskContinue hIKROBOTTaskContinue =null;
+ try
+ {
+ // 1. 鍙傛暟楠岃瘉
+ if (string.IsNullOrWhiteSpace(TaskCode))
+ {
+ throw new Exception("浠诲姟缂栫爜涓嶈兘涓虹┖");
+ }
+ Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(HIKROBOTTaskContinue)) ?? throw new Exception("鏈壘鍒版捣搴稟GV缁х画鎵ц鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
+ hIKROBOTTaskContinue = new HIKROBOTTaskContinue()
+ {
+ triggerCode = TaskCode,
+ triggerType="TASK",//鍥哄畾鍊�
+ targetRoute=string.IsNullOrEmpty(Address)?null:
+ new TargetRouteDto()
+ {
+ code = Address,
+ type = "SITE",
+ }
+ };
+ var headers = new Dictionary<string, string>
+ {
+ { "X-lr-request-id", DateTimeOffset.Now.ToUnixTimeSeconds().ToString() }
+ };
+ 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>();
+ content.OK(data: data);
+ }
+ else
+ {
+ throw new Exception(hIKROBOTReturn.message);
+ }
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ finally
+ {
+ _trackloginfoService.AddTrackLog(hIKROBOTTaskContinue, content, "娴峰悍AGV缁х画鎵ц浠诲姟", "", hIKROBOTReturn.message);
+
+ }
+ return content;
+ }
+
}
}
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 ff08f05..02ae60f 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"
@@ -87,12 +87,32 @@
}
break;
case "into"://鐢宠杩涘叆鎻愬崌鏈�
+ {
+ task.TaskState = (int)TaskStatusEnum.AGV_WaitToExecute;
+ BaseDal.UpdateData(task);
+ }
break;
case "wait"://鎵爜绛夊緟
+ {
+ task.TaskState = (int)TaskStatusEnum.CheckPalletCodeing;
+ BaseDal.UpdateData(task);
+ }
break;
case "end":
{
///鍒ゆ柇浠诲姟鏄惁璺熻澶囨湁鍏�
+ if(task.TaskType== TaskTypeEnum.RK3F.ObjToInt()&& task.TaskState == (int)TaskStatusEnum.CheckPalletCodeFinish)
+ {
+ var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
+ if (device == null) task.ExceptionMessage = "鏈壘鍒版彁鍗囨満淇℃伅";
+ else
+ {
+ if (device.IsConnected)
+ device.SetValue(HoistEnum.Inboundboxon,1);
+ else
+ task.ExceptionMessage = "鎻愬崌鏈轰俊鎭澶囪繛鎺ュけ璐�";
+ }
+ }
TaskCompleted(task, deviceTypeEnum);
}
break;
@@ -465,5 +485,9 @@
return content;
}
#endregion
+
+
+
+
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/TSJJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/TSJJob.cs"
new file mode 100644
index 0000000..870675c
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/TSJJob.cs"
@@ -0,0 +1,201 @@
+锘縰sing Autofac.Core;
+using HslCommunication;
+using HslCommunication.Core;
+using Microsoft.VisualBasic.FileIO;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Information;
+using Quartz;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.PixelFormats;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEAWCS_Common;
+using WIDESEAWCS_Common.TaskEnum;
+using WIDESEAWCS_Communicator;
+using WIDESEAWCS_Core.Helper;
+using WIDESEAWCS_IBasicInfoService;
+using WIDESEAWCS_ITaskInfoService;
+using WIDESEAWCS_Model.Models;
+using WIDESEAWCS_QuartzJob;
+using WIDESEAWCS_QuartzJob.DeviceBase;
+using WIDESEAWCS_QuartzJob.DTO;
+using WIDESEAWCS_QuartzJob.StackerCrane.Enum;
+using WIDESEAWCS_TaskInfoService;
+
+namespace WIDESEAWCS_Tasks
+{
+ [DisallowConcurrentExecution]
+ public class TSJJob : JobBase, IJob
+ {
+ private readonly ITaskService _taskService;
+ private readonly IStationMangerService _stationMangerService;
+ public TSJJob(ITaskService taskService, IStationMangerService stationMangerService)
+ {
+ _taskService = taskService;//娉ㄥ叆
+ _stationMangerService = stationMangerService;
+ }
+
+ public Task Execute(IJobExecutionContext context)
+ {
+
+ bool flag = context.JobDetail.JobDataMap.TryGetValue("JobParams", out object? value);
+ if (flag && value != null)
+ {
+ OtherDevice device = (OtherDevice)value;
+ //Example
+ //device.GetValue 璇诲彇
+ //device.SetValue 鍐欏叆
+ // _taskService.Repository 浠撳偍灞傦紝杩涜鏁版嵁搴撹闂�-
+ try
+ {
+ List<Dt_Task> Uptasks = new List<Dt_Task>();
+ //鏌ヨ鎵�鏈変换鍔＄被鍨嬩负3,4妤肩殑鍏ュ簱浠诲姟绫诲瀷涓斾换鍔＄姸鎬佷负AGV_WaitToExecute鐨勪换鍔�
+ var taskList = _taskService.Repository.QueryData(x => x.TaskState == TaskStatusEnum.AGV_WaitToExecute.ObjToInt());
+ //浠诲姟鐨勭洰鏍囧湴鍧�瀵逛簬绔欏彴鍙凤紱
+ foreach (var task in taskList)
+ {
+ //鍏堟鏌ヨ澶囩姸鎬�
+ if (device.GetValue<HoistEnum, short>(HoistEnum.EquipmentStatus, "TSJ") == 2)
+ {
+ if (task.ExceptionMessage == "鎻愬崌鏈鸿澶囨晠闅�")
+ {
+ continue;
+ }
+ task.ExceptionMessage = "鎻愬崌鏈鸿澶囨晠闅�";
+ Uptasks.Add(task);
+ continue;
+ //throw new Exception("璁惧鏁呴殰");
+ }
+ if (task.TaskType == TaskTypeEnum.RK3F.ObjToInt())
+ {
+ //鍒ゆ柇3妤煎叆搴撶鍙锋湁鏃�
+ if (device.GetValue<HoistEnum, string>(HoistEnum.OutboundInplace, "TSJ") == "1")
+ {
+ if (task.ExceptionMessage == "3妤煎叆搴撶鍙锋湁璐э紝璇峰厛澶勭悊")
+ {
+ continue;
+ }
+ task.ExceptionMessage = "3妤煎叆搴撶鍙锋湁璐э紝璇峰厛澶勭悊";
+ Uptasks.Add(task);
+ continue;
+ }
+
+ //鐒跺悗璋冪敤杈撻�佺嚎鎺ュ彛锛岄�氱煡杈撻�佺嚎鏈夋枡绠遍渶瑕佸叆搴擄紝浠诲姟涓捐鎵ц
+ var result = _taskService.Hikvisiontaskscontinue(task.WMSTaskNum);
+ if (result.Status == false)
+ {
+ if (task.ExceptionMessage!= result.Message)
+ {
+ task.ExceptionMessage = result.Message;
+ Uptasks.Add(task);
+ }
+ continue;
+ }
+ task.TaskState = (int)TaskStatusEnum.AGV_ToExecute;
+ task.ExceptionMessage = "";
+ Uptasks.Add(task);
+ //杩欓噷浠诲姟鍙樻垚浜咰heckPalletCodeing
+
+ }
+ else if(task.TaskType == TaskTypeEnum.CK3F.ObjToInt()) //鍑哄簱
+ {
+ ////鍑哄簱鏂欑缂撳瓨鏁伴噺
+ //if (device.GetValue<HoistEnum, short>(HoistEnum.Outboundmaterialbox, "TSJ") == 0) throw new Exception("娌℃湁鍑哄簱鏂欑缂撳瓨鏁伴噺涓虹┖");
+ //璇诲彇3妤煎嚭搴撴枡绠卞埌浣�
+ if (device.GetValue<HoistEnum, short>(HoistEnum.SOutboundmaterialbox, "TSJ") != 1) throw new Exception("3妤煎嚭搴撴枡绠辨病鏈夊埌浣�");
+ //鐒跺悗璋冪敤杈撻�佺嚎鎺ュ彛锛岄�氱煡杈撻�佺嚎鏈夋枡绠遍渶瑕佸叆搴擄紝浠诲姟涓捐鎵ц
+ if (_taskService.Hikvisiontaskscontinue(task.WMSTaskNum).Status == false) throw new Exception($"3妤煎嚭搴撲换鍔′妇琛屾墽琛屽け璐ワ紝閿欒淇℃伅{_taskService.Hikvisiontaskscontinue(task.WMSTaskNum).Message}");//缁欎换鍔″彿
+
+ //鍘绘洿鏂颁换鍔￠噷鍐欏��
+ //鍐�3妤煎嚭搴撶鍙栬揣瀹屾垚
+ device.SetValue<HoistEnum, short>(HoistEnum.Outboundboxon, 1);
+ }
+ else if (task.TaskType == TaskTypeEnum.Q1TSJ4.ObjToInt())//4妤煎叆搴�
+ {
+ //鍥炵┖绠辩殑鏃跺�欒璇讳竴涓悧
+ if (device.GetValue<HoistEnum, short>(HoistEnum.Emptycontainernumber, "TSJ") == null) throw new Exception($"4妤肩┖绠�,璇荤爜鍣ㄦ病鏈夎鍒板��");
+
+ //鍒ゆ柇4妤肩┖绠卞埌浣�
+ if (device.GetValue<HoistEnum, short>(HoistEnum.ReturnbinAvailable, "TSJ") == 2) throw new Exception("4妤煎洖鏂欑涓虹┖");
+ if (_taskService.Hikvisiontaskscontinue(task.WMSTaskNum).Status == false) throw new Exception($"3妤煎嚭搴撲换鍔′妇琛屾墽琛屽け璐ワ紝閿欒淇℃伅{_taskService.Hikvisiontaskscontinue(task.WMSTaskNum).Message}");//缁欎换鍔″彿
+ //鍐欏叆绌虹鏀惧埌浣嶄俊鍙�
+ device.SetValue(HoistEnum.Emptyboxplacedinposition, "TSJ", "1");
+ }
+ else if (task.TaskType == TaskTypeEnum.CHUKU1.ObjToInt()) //鍥涙ゼ搴撳唴鍒版彁鍗囨満
+ {
+
+ //4妤煎嚭搴撴枡绠卞埌浣�
+ if (device.GetValue<HoistEnum, short>(HoistEnum.FOutboundmaterialbox, "TSJ") == 2) throw new Exception("4妤煎嚭搴撴枡绠辨病鏈夊埌浣�");
+ //鍐欎互涓�涓嚭搴撳畬鎴愪俊鍙�
+ device.SetValue(HoistEnum.Outboundboxretrievalcompleted, "TSJ", "1");
+ }
+
+
+ }
+
+
+ //鏌ユ壘涓夋ゼ鍏ュ簱浠诲姟鐘舵�佷负CheckPalletCodeing鐨勪换鍔℃墭鐩樺彿纭涓�
+ var RK3FTasks = taskList.Where(x => x.TaskType == TaskTypeEnum.RK3F.ObjToInt()&&x.TaskState== (int)TaskStatusEnum.CheckPalletCodeing).ToList();
+ foreach (var item in RK3FTasks)
+ {
+ var Barcode = device.SetValue<HoistEnum, short>(HoistEnum.Codereadingtriggered, 1);
+ //妫�鏌�3妤煎叆搴撶鍙锋槸澶氬皯锛岀劧鍚庝紶缁檞ms
+ var BinNumber = device.GetValue<HoistEnum, string>(HoistEnum.Inboxnumber, "TSJ");
+ //鏍规嵁璇诲埌鐨勭鍙疯繘琛屾枡绠辨楠岋紝妫�楠岄�氳繃灏辫Е鍙戣鐮佸櫒璇诲彇锛屽鏋滀笉閫氳繃灏辨姏鍑哄紓甯�
+ var Verification = _taskService.MaterialBoxInspection(item.WMSTaskNum, BinNumber.ToString());
+ if (!Verification.Status)
+ {
+ if (!(item.ExceptionMessage == Verification.Message))
+ {
+ item.ExceptionMessage = Verification.Message;
+ Uptasks.Add(item);
+ }
+ //鏂欑楠岃瘉鍐欏ソ鍚庯紝闇�瑕佹洿鏀�
+ item.TargetAddress = Verification.Data.ToString();
+ }
+
+ //濡傛灉鏂欑妫�楠屾垚鍔熷氨鍐欏叆璇荤爜鍣ㄧ殑鍊�
+ var result = _taskService.Hikvisiontaskscontinue(item.WMSTaskNum, item.TargetAddress);
+ if (result.Status == false)
+ {
+ if (item.ExceptionMessage != result.Message)
+ {
+ item.ExceptionMessage = result.Message;
+ Uptasks.Add(item);
+ }
+ continue;
+ }
+ item.TaskState = (int)TaskStatusEnum.CheckPalletCodeFinish;
+
+
+ Uptasks.Add(item);
+ }
+ if (Uptasks.Count > 0)
+ {
+ _taskService.UpdateData(Uptasks);
+ }
+ WriteInfo(device.DeviceName, "infoLog");
+
+ WriteDebug(device.DeviceName, "debugLog");
+ }
+ catch (Exception ex)
+ {
+ WriteError(device.DeviceName, "閿欒", ex);
+ }
+ }
+ else
+ {
+ WriteError(nameof(TestJob), "鍙傛暟閿欒,鏈紶閫掕澶囧弬鏁版垨璁惧绫诲瀷閿欒");
+ }
+
+
+ return Task.CompletedTask;
+ }
+ }
+
+
+}
--
Gitblit v1.9.3