From e98b07c84a2a496da895ef6b523b29ccc75e004d Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期五, 23 八月 2024 11:27:01 +0800
Subject: [PATCH] 更新QuartzJob种子数据插入

---
 WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs |   73 ++++++++++++------------------------
 1 files changed, 24 insertions(+), 49 deletions(-)

diff --git a/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs b/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
index 1e28b0a..994d1dc 100644
--- a/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
+++ b/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
@@ -15,6 +15,7 @@
  *----------------------------------------------------------------*/
 #endregion << 鐗� 鏈� 娉� 閲� >>
 
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
 using Quartz;
 using System;
 using System.Collections.Generic;
@@ -22,6 +23,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using WIDESEAWCS_Core.Helper;
+using WIDESEAWCS_IBasicInfoService;
 using WIDESEAWCS_ITaskInfoService;
 using WIDESEAWCS_Model.Models;
 using WIDESEAWCS_QuartzJob;
@@ -35,11 +37,13 @@
     {
         private readonly ITaskService _taskService;
         private readonly ITaskExecuteDetailService _taskExecuteDetailService;
+        private readonly IRouterService _routerService;
 
-        public CommonConveyorLineJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService)
+        public CommonConveyorLineJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService)
         {
             _taskService = taskService;
             _taskExecuteDetailService = taskExecuteDetailService;
+            _routerService = routerService;
         }
 
         public Task Execute(IJobExecutionContext context)
@@ -47,83 +51,54 @@
             try
             {
                 CommonConveyorLine conveyorLine = (CommonConveyorLine)context.JobDetail.JobDataMap.Get("JobParams");
-                //    List<Dt_StationManager> stationManagers = _stationManagerService.GetStationManagers();
-                //    foreach (var item in stationManagers)
+                //if (conveyorLine != null)
+                //{
+                //    List<string> childDeviceCodes = _routerService.QueryAllPositions(conveyorLine.DeviceCode);
+
+                //    foreach (string childDeviceCode in childDeviceCodes)
                 //    {
-                //        try
+                //        ConveyorLineTaskCommand command = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(childDeviceCode);
+                //        if (command != null)
                 //        {
-                //            ushort value = conveyorLine.GetValue<ConveyorLineDBName, ushort>(ConveyorLineDBName.InteractiveSignal, item.StationCode);
-
-                //            DeviceProtocolDetailDTO? deviceProtocolDetail = conveyorLine.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.ProtocalDetailValue == value.ToString());
-
+                //            DeviceProtocolDetailDTO? deviceProtocolDetail = conveyorLine.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.ProtocalDetailValue == command.InteractiveSignal.ToString());
                 //            if (deviceProtocolDetail != null)
                 //            {
-                //                ConveyorLineTaskCommand? command = new ConveyorLineTaskCommand()
-                //                {
-                //                    InteractiveSignal = 0,
-                //                    Barcode = "",
-                //                    TargetAddress = Convert.ToInt32(item.DeviceCode),
-                //                    TaskNum = 9988,
-                //                    TrayType = 3
-                //                };
-
                 //                SignalType signalType = Enum.Parse<SignalType>(deviceProtocolDetail.ProtocolDetailType);
                 //                switch (signalType)
                 //                {
                 //                    case SignalType.InEntranceRequest:
-                //                        command.Barcode = "InEntranceRequest";
-                //                        break;
-                //                    case SignalType.InEntranceResponse:
-                //                        command.Barcode = "InEntranceResponse";
+
                 //                        break;
                 //                    case SignalType.InEntranceRequestReset:
-                //                        command.Barcode = "InEntranceRequestReset";
+
                 //                        break;
                 //                    case SignalType.OutEntranceRequest:
-                //                        command.Barcode = "OutEntranceRequest";
-                //                        break;
-                //                    case SignalType.OutEntranceResponse:
-                //                        command.Barcode = "OutEntranceResponse";
+
                 //                        break;
                 //                    case SignalType.OutEntranceRequestReset:
-                //                        command.Barcode = "OutEntranceRequestReset";
+
                 //                        break;
                 //                    case SignalType.InStationRequest:
-                //                        command.Barcode = "InStationRequest";
-                //                        break;
-                //                    case SignalType.InStationResponse:
-                //                        command.Barcode = "InStationResponse";
+
                 //                        break;
                 //                    case SignalType.InStationRequestReset:
-                //                        command.Barcode = "InStationRequestReset";
+
                 //                        break;
                 //                    case SignalType.OutStationRequest:
-                //                        command.Barcode = "OutStationRequest";
-                //                        break;
-                //                    case SignalType.OutStationResponse:
-                //                        command.Barcode = "OutStationResponse";
+
                 //                        break;
                 //                    case SignalType.OutStationRequestReset:
-                //                        command.Barcode = "OutStationRequestReset";
+
                 //                        break;
                 //                    default:
-                //                        command = null;
+
                 //                        break;
                 //                }
-                //                if (command != null)
-                //                {
-                //                    conveyorLine.SendCommand(command, item.StationCode);
-                //                    Console.Out.WriteLine(command.Serialize());
-                //                }
-
                 //            }
-
-                //        }
-                //        catch (Exception ex)
-                //        {
-                //            Console.Out.WriteLine(item.StationCode + ":" + ex.ToString());
                 //        }
                 //    }
+                //}
+
             }
             catch (Exception ex)
             {

--
Gitblit v1.9.3