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 |   35 +++++++++++++++++++++++++++++++++--
 1 files changed, 33 insertions(+), 2 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 2292796..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"
@@ -34,9 +34,39 @@
         {
             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");
                 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)
                     {
@@ -46,7 +76,7 @@
                     {
                         getStackerObject.CheckStackerCraneTaskCompleted();//妫�娴嬪爢鍨涙満浠诲姟瀹屾垚浜嬩欢
 
-                        if(getStackerObject.StackerCraneWorkStatusValue == StackerCraneWorkStatus.Standby)
+                        if (getStackerObject.StackerCraneWorkStatusValue == StackerCraneWorkStatus.Standby)
                         {
                             Dt_Task? task = GetTask(speStackerCrane);
                             if (task != null)
@@ -57,6 +87,7 @@
                                     bool sendFlag = getStackerObject.SendCommand(stackerCraneTaskCommand);
                                     if (sendFlag)
                                     {
+                                        speStackerCrane.SetValue(StackerCraneDBName.CommandSend, 1);//鍚姩鍛戒护
                                         speStackerCrane.LastTaskType = task.TaskType;
                                         _taskService.UpdateTaskStatusToNext(task.TaskNum);
                                     }
@@ -117,7 +148,7 @@
                 else
                 {
                     task = _taskService.QueryStackerCraneOutTask(speStackerCrane.DeviceCode);
-                    if(task == null)
+                    if (task == null)
                     {
                         task = _taskService.QueryStackerCraneInTask(speStackerCrane.DeviceCode);
                     }

--
Gitblit v1.9.3