From 2ae5aa151f7b40a082e34aa7ed22b4b64edd1d3c Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期三, 11 六月 2025 17:13:56 +0800
Subject: [PATCH] 修改堆垛机通讯协议及交互逻辑
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 66 ++++++++++++++++++++++-----------
1 files changed, 44 insertions(+), 22 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
index e050312..766dbe2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
@@ -1,27 +1,15 @@
-锘縰sing HslCommunication;
-using Microsoft.AspNetCore.Components.Routing;
-using Newtonsoft.Json;
-using Quartz;
+锘縰sing Quartz;
using SqlSugar.Extensions;
-using System;
-using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Net;
-using System.Reflection.Metadata;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Common.Log;
using WIDESEA_Core.Enums;
-using WIDESEAWCS_Core.Enums;
using WIDESEAWCS_ITaskInfoRepository;
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob;
using WIDESEAWCS_QuartzJob.DeviceBase;
-using WIDESEAWCS_QuartzJob.DTO;
using WIDESEAWCS_QuartzJob.Models;
using WIDESEAWCS_QuartzJob.Service;
+using WIDESEAWCS_QuartzJob.StackerCrane;
using WIDESEAWCS_Tasks.StackerCraneJob;
namespace WIDESEAWCS_Tasks
@@ -34,11 +22,11 @@
private readonly ITaskRepository _taskRepository;
private readonly IRouterService _routerService;
- public CommonStackerCraneJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, ITaskRepository taskRepository, IRouterService routerService)
+ public CommonStackerCraneJob(ITaskService taskService, ITaskRepository taskRepository, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService)
{
_taskService = taskService;
- _taskExecuteDetailService = taskExecuteDetailService;
_taskRepository = taskRepository;
+ _taskExecuteDetailService = taskExecuteDetailService;
_routerService = routerService;
}
@@ -46,19 +34,49 @@
{
try
{
+ #region MyRegion
+ OtherDevice StackerCrane = (OtherDevice)context.JobDetail.JobDataMap.Get("JobParams");
+ if (StackerCrane != null)
+ {
+ //var CurrentTaskNum = StackerCrane.Communicator.Read<short>("MD755");
+ var DeviceStatu = StackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.DeviceStatus);
+ var StackerCraneStatu = StackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.StackerCraneStatus);
+ var RunStatus = StackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.RunStatus);
+ StackerCrane.SetValue(StackerCraneDBName.StartRow, 1);
+ StackerCrane.SetValue(StackerCraneDBName.StartColumn, 2);
+ StackerCrane.SetValue(StackerCraneDBName.StartLayer, 3);
+ StackerCrane.SetValue(StackerCraneDBName.EndRow, 4);
+ StackerCrane.SetValue(StackerCraneDBName.EndColumn, 5);
+ StackerCrane.SetValue(StackerCraneDBName.EndLayer, 2);
+ StackerCrane.SetValue(StackerCraneDBName.TaskNum, 216);
+ StackerCrane.SetValue(StackerCraneDBName.WorkType, 1);
+ }
+
+ #endregion
+
SpeStackerCrane speStackerCrane = (SpeStackerCrane)context.JobDetail.JobDataMap.Get("JobParams");
- GetStackerObject getStackerObject = new GetStackerObject(speStackerCrane);
if (speStackerCrane != null)
{
+ var CurrentTaskNum = speStackerCrane.Communicator.Read<short>("MD755");
+ var DeviceStatu = speStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.DeviceStatus);
+ var StackerCraneStatu = speStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.StackerCraneStatus);
+ speStackerCrane.SetValue(StackerCraneDBName.StartRow, 1);
+ speStackerCrane.SetValue(StackerCraneDBName.StartColumn, 2);
+ speStackerCrane.SetValue(StackerCraneDBName.StartLayer, 3);
+ speStackerCrane.SetValue(StackerCraneDBName.EndRow, 4);
+ speStackerCrane.SetValue(StackerCraneDBName.EndColumn, 5);
+ speStackerCrane.SetValue(StackerCraneDBName.EndLayer, 2);
+
+ GetStackerObject getStackerObject = new GetStackerObject(speStackerCrane);
if (!getStackerObject.IsEventSubscribed)
{
getStackerObject.StackerCraneTaskCompletedEventHandler += CommonStackerCrane_StackerCraneTaskCompletedEventHandler;//璁㈤槄浠诲姟瀹屾垚浜嬩欢
}
if (getStackerObject.StackerCraneAutoStatusValue == StackerCraneAutoStatus.Automatic && getStackerObject.StackerCraneStatusValue == StackerCraneStatus.Ready)
{
- getStackerObject.CheckStackerCraneTaskCompleted();//妫�娴嬪畬鎴愪簨浠�
+ getStackerObject.CheckStackerCraneTaskCompleted();//妫�娴嬪爢鍨涙満浠诲姟瀹屾垚浜嬩欢
- if(getStackerObject.StackerCraneWorkStatusValue == StackerCraneWorkStatus.Standby)
+ if (getStackerObject.StackerCraneWorkStatusValue == StackerCraneWorkStatus.Standby)
{
Dt_Task? task = GetTask(speStackerCrane);
if (task != null)
@@ -69,6 +87,7 @@
bool sendFlag = getStackerObject.SendCommand(stackerCraneTaskCommand);
if (sendFlag)
{
+ speStackerCrane.SetValue(StackerCraneDBName.CommandSend, 1);//鍚姩鍛戒护
speStackerCrane.LastTaskType = task.TaskType;
_taskService.UpdateTaskStatusToNext(task.TaskNum);
}
@@ -80,7 +99,7 @@
}
catch (Exception ex)
{
- WriteLog.GetLog($"鍫嗗灈鏈哄紓甯�").Write($"{nameof(CommonStackerCraneJob)}:{ex.Message}", "鍫嗗灈鏈哄紓甯�");
+ //WriteLog.GetLog($"鍫嗗灈鏈哄紓甯�").Write($"{nameof(CommonStackerCraneJob)}:{ex.Message}", "鍫嗗灈鏈哄紓甯�");
}
return Task.CompletedTask;
}
@@ -90,14 +109,13 @@
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- private void CommonStackerCrane_StackerCraneTaskCompletedEventHandler(object? sender, WIDESEAWCS_QuartzJob.StackerCrane.StackerCraneTaskCompletedEventArgs e)
+ private void CommonStackerCrane_StackerCraneTaskCompletedEventHandler(object? sender, StackerCraneTaskCompletedEventArgs e)
{
SpeStackerCrane? speStackerCrane = sender as SpeStackerCrane;
if (speStackerCrane != null)
{
if (speStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.WorkType) != 5)
{
- Console.Out.WriteLine("TaskCompleted" + e.TaskNum);
_taskService.StackCraneTaskCompleted(e.TaskNum);
speStackerCrane.SetValue(StackerCraneDBName.WorkType, 5);
}
@@ -130,6 +148,10 @@
else
{
task = _taskService.QueryStackerCraneOutTask(speStackerCrane.DeviceCode);
+ if (task == null)
+ {
+ task = _taskService.QueryStackerCraneInTask(speStackerCrane.DeviceCode);
+ }
}
}
return task;
--
Gitblit v1.9.3