From 0e450768c357b45701a2e5ed162f4e93b3dd617c Mon Sep 17 00:00:00 2001
From: zhangchengsong <zhangchengsong@hnkhzn.com>
Date: 星期三, 15 四月 2026 20:53:24 +0800
Subject: [PATCH] 最新

---
 项目代码/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs |   49 +------------------------------------------------
 1 files changed, 1 insertions(+), 48 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
index f3f1b06..91bc82b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
@@ -56,7 +56,7 @@
             _DtPlatformStationService= dt_PlatformStationService;
         }
 
-        public Task Execute(IJobExecutionContext context)
+        public  Task Execute(IJobExecutionContext context)
         {
             try
             {
@@ -64,11 +64,6 @@
                 CommonStackerCrane commonStackerCrane = (CommonStackerCrane)context.JobDetail.JobDataMap.Get("JobParams");
                 if (commonStackerCrane != null)
                 {
-                    WriteLog.Write_Log("鍫嗗灈鏈哄綋鍓嶇姸鎬�", $"{commonStackerCrane.DeviceCode}搴撳爢鍨涙満鐘舵�佷俊鎭�",
-                         $"鍫嗗灈鏈鸿澶囧湴鍧�:銆怐B105.2.0銆�,璇诲彇鐨勬暟鎹細銆恵commonStackerCrane.StackerCraneAutoStatusDes}銆慭n" +
-                         $"鍫嗗灈鏈哄伐浣滄ā寮忓湴鍧�:銆怐B105.3.0銆�,璇诲彇鐨勬暟鎹細銆恵commonStackerCrane.StackerCraneStatusDes}銆慭n" +
-                         $"鍫嗗灈鏈轰綔涓氱姸鎬佸湴鍧�:銆怐B105.22.0銆�,璇诲彇鐨勬暟鎹細銆恵commonStackerCrane.StackerCraneWorkStatusDes}銆慭n" +
-                         $"鍫嗗灈鏈哄綋鍓嶄换鍔℃墽琛屼腑鍦板潃:銆怐B105.18.0銆�,璇诲彇鐨勬暟鎹細銆恵commonStackerCrane.CurrentTaskNum}銆慭n");
 
                     UpdateHandShake(commonStackerCrane.CurrentTaskNum, commonStackerCrane.StackerCraneWorkStatusDes);
                     //浠诲姟瀹屾垚StackerCraneWorkStatus
@@ -120,8 +115,6 @@
                                         commonStackerCrane.Communicator.Write("DB105.52", 1);
 
                                         WebResponseContent webResponseContent=_taskService.UpdateTaskStatusToNext(task.TaskNum);
-                                        //寤惰繜1s
-                                        Thread.Sleep(1000);
                                     }
                                 }
                             }
@@ -184,7 +177,6 @@
                         }
                         else if (taskItem.TaskType == (int)TaskTypeEnum.Inbound || taskItem.TaskType == (int)TaskTypeEnum.Inventorybound)
                         {
-                            InTaskStationIsOccupied(taskItem.SourceAddress, taskItem.Roadway);
                             return taskItem;
                         }
                     }
@@ -254,44 +246,7 @@
 
             return false;
         }
-        /// <summary>
-        /// 鍏ュ簱浠诲姟搴撳彛鏈夎揣鏃犺揣鐘舵��
-        /// </summary>
-        private void InTaskStationIsOccupied(string SourceAddress, string Roadway)
-        {
-            try
-            {
-                if (Roadway == "C")
-                {
-                    IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "1004");
-                    CommonConveyorLine conveyorLine = (CommonConveyorLine)device;
-                    DeviceProDTO? deviceProDTO = conveyorLine.DeviceProDTOs.FirstOrDefault(x => x.DeviceChildCode == SourceAddress && x.DeviceProParamName == "StationNum");
-                    DeviceProDTO? HandShakeprodto = conveyorLine.DeviceProDTOs.FirstOrDefault(x => x.DeviceChildCode == SourceAddress && x.DeviceProParamName == "HandShake");
- 
-                    int StationNum = conveyorLine.Communicator.Read<ushort>(deviceProDTO.DeviceProAddress);
-                    int HandShake = conveyorLine.Communicator.Read<ushort>(HandShakeprodto.DeviceProAddress);
-                    WriteLog.Write_Log("鍏ュ簱搴撳彛鐘舵�佷俊鎭�", "鍏ュ簱搴撳彛鐘舵�佷俊鎭�", $"搴撳彛鏄�恵SourceAddress}銆戯紝鐢宠鐘舵�佸湴鍧�锛氥�恵HandShakeprodto.DeviceProAddress}銆�,璇诲彇鐨勬暟鎹細銆恵HandShake}銆慭n" +
-                        $"搴撳彛鏄惁鏈夎揣鐘舵�佸湴鍧�锛氥�恵deviceProDTO.DeviceProAddress}銆戯紝璇诲彇鐨勬暟鎹�恵StationNum}銆�");
-                }
-                else
-                {
-                    IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "1003");
-                    CommonConveyorLine conveyorLine = (CommonConveyorLine)device;
-                    DeviceProDTO? deviceProDTO = conveyorLine.DeviceProDTOs.FirstOrDefault(x => x.DeviceChildCode == SourceAddress && x.DeviceProParamName == "StationNum");
-                    DeviceProDTO? HandShakeprodto = conveyorLine.DeviceProDTOs.FirstOrDefault(x => x.DeviceChildCode == SourceAddress && x.DeviceProParamName == "HandShake");
 
-                    int StationNum = conveyorLine.Communicator.Read<ushort>(deviceProDTO.DeviceProAddress);
-                    int HandShake = conveyorLine.Communicator.Read<ushort>(HandShakeprodto.DeviceProAddress);
-                    WriteLog.Write_Log("鍏ュ簱搴撳彛鐘舵�佷俊鎭�", "鍏ュ簱搴撳彛鐘舵�佷俊鎭�", $"搴撳彛鏄�恵SourceAddress}銆戯紝鐢宠鐘舵�佸湴鍧�锛氥�恵HandShakeprodto.DeviceProAddress}銆�,璇诲彇鐨勬暟鎹細銆恵HandShake}銆慭n" +
-                        $"搴撳彛鏄惁鏈夎揣鐘舵�佸湴鍧�锛氥�恵deviceProDTO.DeviceProAddress}銆戯紝璇诲彇鐨勬暟鎹�恵StationNum}銆�");
-                }
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine("璇诲彇绔欏彴淇℃伅閿欒锛�" + ex.Message);
-            }
-
-        }
 
         /// <summary>
         /// 浠诲姟瀹炰綋杞崲鎴愬懡浠odel
@@ -480,8 +435,6 @@
             catch
             {
             }
-
-
         }
 
     }

--
Gitblit v1.9.3