From ce3b28cdcdb2b6a912413cd9e744d0ecadcb78a0 Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期二, 13 一月 2026 17:47:30 +0800
Subject: [PATCH] 优化成品出入库流程代码

---
 WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs |  598 +++++++++++++++++++++++++++++------------------------------
 1 files changed, 292 insertions(+), 306 deletions(-)

diff --git a/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs b/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
index 06fabd5..73d7358 100644
--- a/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
+++ b/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
@@ -15,68 +15,311 @@
  *----------------------------------------------------------------*/
 #endregion << 鐗� 鏈� 娉� 閲� >>
 
+using Autofac.Core;
 using AutoMapper;
+using Microsoft.AspNetCore.Routing;
+using Newtonsoft.Json;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
 using Quartz;
-using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
 using System.Threading.Tasks;
-using WIDESEA_Common.Log;
+using WIDESEAWCS_Common;
+using WIDESEAWCS_Common.Helper;
+using WIDESEAWCS_Common.TaskEnum;
 using WIDESEAWCS_Core;
-using WIDESEAWCS_ISystemServices;
+using WIDESEAWCS_Core.Caches;
+using WIDESEAWCS_Core.Helper;
+using WIDESEAWCS_IBasicInfoRepository;
+using WIDESEAWCS_ITaskInfoRepository;
 using WIDESEAWCS_ITaskInfoService;
 using WIDESEAWCS_Model.Models;
-using WIDESEAWCS_Model.Models.System;
 using WIDESEAWCS_QuartzJob;
 using WIDESEAWCS_QuartzJob.DTO;
 using WIDESEAWCS_QuartzJob.Models;
+using WIDESEAWCS_QuartzJob.Repository;
 using WIDESEAWCS_QuartzJob.Service;
 using WIDESEAWCS_Tasks.ConveyorLineJob;
 
 namespace WIDESEAWCS_Tasks
 {
     [DisallowConcurrentExecution]
-    public class CommonConveyorLineJob : IJob
+    public class CommonConveyorLineJob : JobBase, IJob
     {
         private readonly ITaskService _taskService;
         private readonly ITaskExecuteDetailService _taskExecuteDetailService;
         private readonly IRouterService _routerService;
-        private readonly IPlatformStationService _PlatformStationService;
-
+        private readonly IRouterRepository _routerRepository;
+        private readonly ITaskRepository _taskRepository;
         private readonly IMapper _mapper;
+        private readonly IStationMangerRepository _stationMangerRepository;
+        private readonly ICacheService _cacheService;
+        private readonly List<Dt_WarehouseDevice> warehouseDevices;
 
-        public CommonConveyorLineJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper, IPlatformStationService platformStation)
+        public CommonConveyorLineJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IStationMangerRepository stationMangerRepository, IRouterRepository routerRepository, ITaskRepository taskRepository, ICacheService cacheService, IMapper mapper)
         {
             _taskService = taskService;
             _taskExecuteDetailService = taskExecuteDetailService;
             _routerService = routerService;
+            _stationMangerRepository = stationMangerRepository;
+            _taskRepository = taskRepository;
+            _routerRepository = routerRepository;
+            _cacheService = cacheService;
             _mapper = mapper;
-            _PlatformStationService = platformStation;
-        }
 
+            string? warehouseDevicesStr = _cacheService.Get<string>(nameof(Dt_WarehouseDevice));
+            if (!string.IsNullOrEmpty(warehouseDevicesStr))
+            {
+                warehouseDevices = JsonConvert.DeserializeObject<List<Dt_WarehouseDevice>>(warehouseDevicesStr) ?? new List<Dt_WarehouseDevice>();
+            }
+            else
+            {
+                warehouseDevices = new List<Dt_WarehouseDevice>();
+            }
+
+        }
         public Task Execute(IJobExecutionContext context)
         {
             try
             {
                 CommonConveyorLine conveyorLine = (CommonConveyorLine)context.JobDetail.JobDataMap.Get("JobParams");
-
                 if (conveyorLine != null)
                 {
-                    //璇诲彇杈撻�佺嚎鍏ュ簱鐢宠
-                    RequestInbound(conveyorLine);
-                    //璇诲彇鍫嗗灈鏈哄叆搴撶珯鍙颁俊鍙�
-                    RequestInSCLine(conveyorLine);
+                    List<string> deviceStations = conveyorLine.DeviceProDTOs.Select(x => x.DeviceChildCode).ToList();
+                    List<Dt_StationManger> stationMangers = _stationMangerRepository.QueryData(x => x.StationDeviceCode == conveyorLine.DeviceCode);
+                    foreach (var item in stationMangers.Where(x => deviceStations.Contains(x.StationCode)))
+                    {
+                        try
+                        {
+                            DeviceProDTO? deviceProRead = conveyorLine.DeviceProDTOs.Where(x => x.DeviceChildCode == item.StationCode && x.DeviceProParamType == nameof(R_ConveyorLineDB)).OrderBy(x => x.DeviceProOffset).FirstOrDefault();
 
-                    //鍫嗗灈鏈虹珯鍙拌繘琛屼笅鍙戣緭閫佺嚎浠诲姟
-                    RequestOutSCLine(conveyorLine);
-                    //璇诲彇Rgv鍑哄簱鍙d换鍔�
-                    RequestOutbound(conveyorLine);
-                    //璇诲彇鍑哄簱绔欏彴锛岃幏鍙栧嚭搴撳彛鏇存柊鍑哄簱浠诲姟
-                    RequestOutAdd(conveyorLine);
-                    
+                            DeviceProDTO? deviceProWrite = conveyorLine.DeviceProDTOs.Where(x => x.DeviceChildCode == item.StationCode && x.DeviceProParamType == nameof(W_ConveyorLineDBName)).OrderBy(x => x.DeviceProOffset).FirstOrDefault();
+
+                            if (deviceProRead != null && deviceProWrite != null)
+                            {
+                                R_ConveyorLineInfo conveyorLineInfoRead = conveyorLine.Communicator.ReadCustomer<R_ConveyorLineInfo>(deviceProRead.DeviceProAddress);
+
+                                W_ConveyorLineInfo conveyorLineInfoWrite = conveyorLine.Communicator.ReadCustomer<W_ConveyorLineInfo>(deviceProWrite.DeviceProAddress);
+                                if (conveyorLineInfoRead == null || conveyorLineInfoWrite == null)
+                                {
+                                    continue;
+                                }
+
+                                R_ConveyorLineStatus conveyorLineStatus = conveyorLineInfoRead.Status.ByteToBoolObject<R_ConveyorLineStatus>();
+
+                                ConveyorLineSignal conveyorLineSignalRead = conveyorLineInfoRead.Signal.ByteToBoolObject<ConveyorLineSignal>();
+
+
+                                bool ACK = conveyorLine.GetValue<W_ConveyorLineDBName, bool>(W_ConveyorLineDBName.W_ConveyorLine_ACK, item.StationCode);
+
+                                bool STB = conveyorLine.GetValue<W_ConveyorLineDBName, bool>(W_ConveyorLineDBName.W_ConveyorLine_STB, item.StationCode);
+
+                                //bool Return = conveyorLine.GetValue<W_ConveyorLineDB, bool>(W_ConveyorLineDB.Return, item.StationCode);
+                                if (item.StationType == StationTypeEnum.StationType_OnlyInbound.ObjToInt())
+                                {
+
+                                    if (conveyorLineSignalRead.STB && conveyorLineStatus.Online && conveyorLineStatus.Goods && !conveyorLineStatus.Alarm && !ACK)
+                                    {
+                                        if (conveyorLineInfoRead.TaskNo == 0 && !string.IsNullOrEmpty(conveyorLineInfoRead.Barcode))//閲囪喘鍏ュ簱
+                                        {
+                                            WebResponseContent webResponse = _taskService.ApplyLocation(conveyorLineInfoRead.Barcode);
+                                            if (webResponse.Status)
+                                            {
+                                                List<Dt_WarehouseDevice> warehouseDevicesList = warehouseDevices.Where(x => x.WarehouseId == webResponse.Data.ObjToInt()).ToList();
+
+                                                foreach (var list in warehouseDevicesList)
+                                                {
+                                                    Dt_Router routers = _routerRepository.QueryFirst(x => x.StartPosi == item.StationCode && x.ChildPosiDeviceCode == list.DeviceCode);
+                                                    #region 鍏堟壘鍏佽鍏ュ簱鐨勮緭閫佺嚎鍏ュ彛
+                                                    deviceProRead = conveyorLine.DeviceProDTOs.Where(x => x.DeviceChildCode == routers.NextPosi && x.DeviceProParamType == nameof(R_ConveyorLineDB)).OrderBy(x => x.DeviceProOffset).FirstOrDefault();
+                                                    Dt_Task dt_Task = _taskRepository.QueryFirst(x => x.NextAddress == routers.NextPosi);
+                                                    if (dt_Task != null) { continue; }
+                                                    if (deviceProRead != null)
+                                                    {
+                                                        R_ConveyorLineInfo conveyorLineInfoRead1 = conveyorLine.Communicator.ReadCustomer<R_ConveyorLineInfo>(deviceProRead.DeviceProAddress);
+                                                        R_ConveyorLineStatus conveyorLineStatus1 = conveyorLineInfoRead1.Status.ByteToBoolObject<R_ConveyorLineStatus>();
+                                                        if (conveyorLineInfoRead1.Status == 6 && conveyorLineStatus1.Free && conveyorLineStatus1.Online && !conveyorLineStatus1.Goods)
+                                                        {
+
+                                                            #region 璇锋眰WMS鐢熸垚浠诲姟鍚庣粰杈撻�佺嚎鍚姩淇″彿
+                                                            WebResponseContent content = _taskService.CPRequestWMSTaskSimple(conveyorLineInfoRead.Barcode, routers.NextPosi, conveyorLineInfoRead.Spare2, item.StationCode);
+                                                            if (content.Status)
+                                                            {
+                                                                Dt_Task task = _taskRepository.QueryFirst(x => x.PalletCode == conveyorLineInfoRead.Barcode && x.CurrentAddress == item.StationCode && x.DeviceCode == conveyorLine.DeviceCode && x.TaskState == TaskStatusEnum.New.ObjToInt());
+                                                                if (task != null)
+                                                                {
+                                                                    conveyorLine.SetValue(W_ConveyorLineDBName.W_ConveyorLine_ACK, true, item.StationCode);
+                                                                    _taskService.UpdateTask(task, TaskStatusEnum.RGV_NEW, sourceAddress: item.StationCode, RGVCode: item.AGVStationCode);
+                                                                    WebResponseContent responseContent = _taskService.LedShowTask(item.StationCode, task.PalletCode, task.TaskType);
+                                                                }
+
+                                                            }
+                                                            #endregion
+                                                        }
+                                                    }
+                                                    #endregion
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                                if (item.StationType == StationTypeEnum.StationType_InboundAndOutbound.ObjToInt())
+                                {
+                                    if (conveyorLineSignalRead.STB && conveyorLineStatus.Online && conveyorLineStatus.Goods && !conveyorLineStatus.Alarm && !ACK)
+                                    {
+                                        if (conveyorLineInfoRead.TaskNo == 0 && !string.IsNullOrEmpty(conveyorLineInfoRead.Barcode))//閲囪喘鍏ュ簱
+                                        {
+                                            WebResponseContent webResponse = _taskService.ApplyLocation(conveyorLineInfoRead.Barcode);
+                                            if (webResponse.Status)
+                                            {
+                                                List<Dt_WarehouseDevice> warehouseDevicesList = warehouseDevices.Where(x => x.WarehouseId == webResponse.Data.ObjToInt()).ToList();
+
+                                                foreach (var list in warehouseDevicesList)
+                                                {
+                                                    Dt_Router routers = _routerRepository.QueryFirst(x => x.StartPosi == item.StationCode && x.ChildPosiDeviceCode == list.DeviceCode);
+                                                    #region 鍏堟壘鍏佽鍏ュ簱鐨勮緭閫佺嚎鍏ュ彛
+                                                    deviceProRead = conveyorLine.DeviceProDTOs.Where(x => x.DeviceChildCode == routers.NextPosi && x.DeviceProParamType == nameof(R_ConveyorLineDB)).OrderBy(x => x.DeviceProOffset).FirstOrDefault();
+                                                    Dt_Task dt_Task = _taskRepository.QueryFirst(x => x.NextAddress == routers.NextPosi);
+                                                    if (dt_Task != null) { continue; }
+                                                    if (deviceProRead != null)
+                                                    {
+                                                        R_ConveyorLineInfo conveyorLineInfoRead1 = conveyorLine.Communicator.ReadCustomer<R_ConveyorLineInfo>(deviceProRead.DeviceProAddress);
+                                                        R_ConveyorLineStatus conveyorLineStatus1 = conveyorLineInfoRead1.Status.ByteToBoolObject<R_ConveyorLineStatus>();
+                                                        if (conveyorLineInfoRead1.Status == 6 && conveyorLineStatus1.Free && conveyorLineStatus1.Online && !conveyorLineStatus1.Goods)
+                                                        {
+
+                                                            #region 璇锋眰WMS鐢熸垚浠诲姟鍚庣粰杈撻�佺嚎鍚姩淇″彿
+                                                            WebResponseContent content = _taskService.CPRequestWMSTaskSimple(conveyorLineInfoRead.Barcode, routers.NextPosi, conveyorLineInfoRead.Spare2, item.StationCode);
+                                                            if (content.Status)
+                                                            {
+                                                                Dt_Task task = _taskRepository.QueryFirst(x => x.PalletCode == conveyorLineInfoRead.Barcode && x.CurrentAddress == item.StationCode && x.DeviceCode == conveyorLine.DeviceCode && x.TaskState == TaskStatusEnum.New.ObjToInt());
+                                                                if (task != null)
+                                                                {
+                                                                    conveyorLine.SetValue(W_ConveyorLineDBName.W_ConveyorLine_ACK, true, item.StationCode);
+                                                                    _taskService.UpdateTask(task, TaskStatusEnum.RGV_NEW, sourceAddress: item.StationCode, RGVCode: item.AGVStationCode);
+
+                                                                }
+
+                                                            }
+                                                            #endregion
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                            #endregion
+                                        }
+                                    }
+                                }
+                                //鍑哄簱绔欏彴
+                                if (item.StationType == StationTypeEnum.StationType_OnlyOutbound.ObjToInt())
+                                {
+
+                                }
+                                if (item.StationType == StationTypeEnum.SC_In.ObjToInt())
+                                {
+                                    if (conveyorLineSignalRead.STB && conveyorLineStatus.Online && conveyorLineStatus.Goods && !conveyorLineStatus.Alarm && !ACK)
+                                    {
+                                        Dt_Task task = _taskRepository.QueryFirst(x => x.NextAddress == item.StationCode && x.DeviceCode == item.StationDeviceCode && x.TaskState == TaskStatusEnum.RGV_Finish.ObjToInt());
+                                        if (task != null)
+                                        {
+                                            _taskService.UpdateTask(task, TaskStatusEnum.SC_Execute, deviceCode: task.Roadway, currentAddress: task.NextAddress);
+                                            conveyorLine.SetValue(W_ConveyorLineDBName.W_ConveyorLine_ACK, true, item.StationCode);
+                                        }
+                                    }
+                                }
+                                if (item.StationType == StationTypeEnum.SC_Out.ObjToInt())
+                                {
+                                    if (!conveyorLineSignalRead.STB && !conveyorLineSignalRead.ACK && conveyorLineStatus.Online && conveyorLineStatus.Goods && !conveyorLineStatus.Alarm && !STB && !ACK)
+                                    {
+                                        Dt_Task _Task = _taskRepository.QueryFirst(x => x.CurrentAddress == item.StationCode && x.TaskState == TaskStatusEnum.Line_Execute.ObjToInt());
+                                        if (_Task != null)
+                                        {
+                                            Dt_Router routers = _routerRepository.QueryFirst(x => x.StartPosi == _Task.CurrentAddress);
+                                            if (routers != null)
+                                            {
+                                                conveyorLine.SetValue(W_ConveyorLineDBName.W_ConveyorLine_TaskNo, _Task.TaskNum, item.StationCode);
+                                                conveyorLine.SetValue(W_ConveyorLineDBName.W_ConveyorLine_EndPos, routers.NextPosi, item.StationCode);
+                                                conveyorLine.SetValue(W_ConveyorLineDBName.W_ConveyorLine_STB, true, item.StationCode);
+                                                _taskService.UpdateTask(_Task, TaskStatusEnum.Line_Executing, nextAddress: routers.NextPosi);
+                                                WriteDebug($"鍫嗗灈鏈哄嚭搴撳彛{item.StationCode}", $"鍫嗗灈鏈哄嚭搴撳彛浠诲姟鏇存柊,浠诲姟鍙穥_Task.TaskId}锛岀洰鏍囧嚭鍙d綅缃畕_Task.TargetAddress}锛屾墭鐩樺彿锛歿_Task.PalletCode}");
+                                            }
+                                        }
+
+                                    }
+                                    //鍫嗗灈鏈哄嚭搴撳彛澶栭潰涓�娈靛嚭搴撶珯鍙�
+                                    if (conveyorLineSignalRead.STB && !conveyorLineSignalRead.ACK && conveyorLineStatus.Online && conveyorLineStatus.Goods && !conveyorLineStatus.Alarm && !STB && !ACK)
+                                    {
+                                        Dt_Task task = _taskRepository.QueryFirst(x => x.NextAddress == item.StationCode && x.DeviceCode == conveyorLine.DeviceCode && x.TaskState == TaskStatusEnum.Line_Executing.ObjToInt());
+                                        if (task != null)
+                                        {
+                                            List<Dt_Router> routers = _routerRepository.QueryData(x => x.StartPosi == item.StationCode).ToList();
+                                            foreach (var items in routers)
+                                            {
+                                                deviceProRead = conveyorLine.DeviceProDTOs.Where(x => x.DeviceChildCode == items.NextPosi && x.DeviceProParamType == nameof(R_ConveyorLineDB)).OrderBy(x => x.DeviceProOffset).FirstOrDefault();
+                                                if (deviceProRead != null)
+                                                {
+                                                    R_ConveyorLineInfo conveyorLineInfoRead3 = conveyorLine.Communicator.ReadCustomer<R_ConveyorLineInfo>(deviceProRead.DeviceProAddress);
+
+                                                    R_ConveyorLineStatus conveyorLineStatus3 = conveyorLineInfoRead3.Status.ByteToBoolObject<R_ConveyorLineStatus>();
+
+                                                    ConveyorLineSignal conveyorLineSignalRead3 = conveyorLineInfoRead3.Signal.ByteToBoolObject<ConveyorLineSignal>();
+
+                                                    if (!conveyorLineSignalRead3.STB && !conveyorLineSignalRead3.ACK && conveyorLineStatus3.Online && conveyorLineStatus3.Free && !conveyorLineStatus3.Goods && !conveyorLineStatus3.Alarm && !STB && !ACK)//鍒ゆ柇鍑哄簱鍙f槸鍚︾┖闂�
+                                                    {
+                                                        Dt_Task dt_Task = _taskRepository.QueryFirst(x => x.TargetAddress == items.NextPosi);
+                                                        if (dt_Task == null)
+                                                        {
+                                                            conveyorLine.SetValue(W_ConveyorLineDBName.W_ConveyorLine_ACK, true, item.StationCode);
+                                                            _taskService.UpdateTask(task, TaskStatusEnum.RGV_Execute, currentAddress: item.StationCode, targetAddress: items.NextPosi, nextAddress: items.NextPosi, RGVCode: item.AGVStationCode);
+                                                            Thread.Sleep(500);
+                                                        }
+                                                    }
+                                                }
+                                            }
+
+                                        }
+
+                                    }
+                                }
+                                if (!conveyorLineSignalRead.STB && conveyorLineSignalRead.ACK && conveyorLineStatus.Online && conveyorLineStatus.Goods && !conveyorLineStatus.Alarm && STB && !ACK)
+                                {
+                                    conveyorLine.SetValue(W_ConveyorLineDBName.W_ConveyorLine_STB, false, item.StationCode);
+                                }
+                                if (!conveyorLineSignalRead.STB && !conveyorLineSignalRead.ACK && conveyorLineStatus.Online && conveyorLineStatus.Goods && !conveyorLineStatus.Alarm && !STB && ACK)
+                                {
+                                    conveyorLine.SetValue(W_ConveyorLineDBName.W_ConveyorLine_ACK, false, item.StationCode);
+                                }
+                                if (!conveyorLineSignalRead.STB && !conveyorLineSignalRead.ACK && conveyorLineStatus.Online && !conveyorLineStatus.Alarm && !STB && ACK)
+                                {
+                                    conveyorLine.SetValue(W_ConveyorLineDBName.W_ConveyorLine_ACK, false, item.StationCode);
+                                }
+                                //if (!conveyorLineSignalRead.STB && !conveyorLineSignalRead.ACK && conveyorLineStatus.Online && !conveyorLineStatus.Alarm && !STB && !ACK && Return)
+                                //{
+                                //    conveyorLine.SetValue(W_ConveyorLineDBName.W_ConveyorLine_Return, false, item.StationCode);
+                                //}
+                                if (conveyorLineSignalRead.STB && !conveyorLineSignalRead.ACK && conveyorLineStatus.Online && conveyorLineStatus.Goods && !conveyorLineStatus.Alarm && ACK)
+                                {
+                                    conveyorLine.SetValue(W_ConveyorLineDBName.W_ConveyorLine_ACK, false, item.StationCode);
+                                }
+
+
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            WriteError(nameof(CommonConveyorLine), ex.Message, ex);
+                        }
+
+                    }
+
                 }
             }
             catch (Exception ex)
             {
-                //Console.Out.WriteLine(nameof(CommonConveyorLineJob) + ":" + ex.ToString());
+                WriteError(nameof(CommonConveyorLine), ex.Message, ex);
             }
             return Task.CompletedTask;
         }
@@ -85,323 +328,66 @@
         /// 杈撻�佺嚎璇锋眰鍏ュ簱
         /// </summary>
         /// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param>
-        public void RequestInbound(CommonConveyorLine conveyorLine)
+        /// <param name="command">璇诲彇鐨勮姹備俊鎭�</param>
+        /// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
+        public void RequestInbound(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode)
         {
-            
-            List<PlatformStation> platformsList = _PlatformStationService.GetPlatformList(conveyorLine.DeviceCode);
-            foreach (var RGVStationitem in platformsList)
-            {
-                ConveyorLineCommand command = lineCommand(conveyorLine,RGVStationitem.Station_code);
-                if (command != null)
-                {
-                    if (command.Online)
-                    {
-                        if (command.STB)
-                        {
-                            WebResponseContent content = _taskService.RequestWMSTask(command.BarCode, RGVStationitem.Station_code.ToString(), command.GoodsType);
-                            if (content.Status)
-                            {
-                                DeviceProDTO? deviceProDTO6 = conveyorLine.DeviceProDTOs.Find(x => x.DeviceChildCode == RGVStationitem.Station_code.ToString() && x.DeviceProParamName == "ACK" && x.DeviceProParamType == "DeviceCommand");
-                                if (deviceProDTO6 != null)
-                                {
-                                    conveyorLine.Communicator.Write(deviceProDTO6.DeviceProAddress, (bool)true);
-                                    wcsWriteLog(RGVStationitem.Station_code.ToString(), "姝e父鏃ュ織", $"{RGVStationitem.Station_code}鍐欏叆杈撻�佺嚎淇″彿,妯″潡{deviceProDTO6.DeviceProAddress}锛歵rue");
-                                }
-                                else
-                                {
-                                    wcsWriteLog(RGVStationitem.Station_code.ToString(), "閿欒鏃ュ織", $"鏈壘鍒板浜庣殑璇诲彇妯″潡{RGVStationitem.Station_code}");
-                                }
-                            }
-                            else
-                            {
-                                wcsWriteLog(RGVStationitem.Station_code.ToString(), "閿欒鏃ュ織", $"鍏ュ簱绔欏彴锛歿RGVStationitem.Station_code}锛岄敊璇俊鎭細{content.Message}");
-                            }
-                        }
-                        else
-                        {
-                            DeviceProDTO? deviceProDTO6 = conveyorLine.DeviceProDTOs.Find(x => x.DeviceChildCode == RGVStationitem.Station_code.ToString() && x.DeviceProParamName == "ACK" && x.DeviceProParamType == "DeviceCommand");
-                            if (deviceProDTO6 != null)
-                            {
 
-                                conveyorLine.Communicator.Write(deviceProDTO6.DeviceProAddress, (bool)false);
-                                wcsWriteLog(RGVStationitem.Station_code.ToString(), "姝e父鏃ュ織", $"{RGVStationitem.Station_code}鍐欏叆杈撻�佺嚎淇″彿,妯″潡{deviceProDTO6.DeviceProAddress}锛歠alse");
-                            }
-                            else
-                            {
-                                wcsWriteLog(RGVStationitem.Station_code.ToString(), "閿欒鏃ュ織", $"鏈壘鍒板浜庣殑璇诲彇妯″潡{RGVStationitem.Station_code}");
-                            }
-                        }
-                    }
-                    else
-                    {
-                        wcsWriteLog(RGVStationitem.Station_code.ToString(), "閿欒鏃ュ織", $"璇ョ珯鍙皗RGVStationitem.Station_code}涓嶅浜庤仈鏈虹姸鎬�");
-                    }
-                   
-                }
-            }
         }
 
         /// <summary>
-        /// 璇诲彇鍫嗗灈鏈哄叆搴撶珯鍙颁俊鎭紝杩涜浠诲姟瀹屾垚
+        /// 杈撻�佺嚎璇锋眰鍏ュ簱涓嬩竴鍦板潃
         /// </summary>
         /// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param>
-        public void RequestInSCLine(CommonConveyorLine conveyorLine)
+        /// <param name="command">璇诲彇鐨勮姹備俊鎭�</param>
+        /// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
+        public void RequestInNextAddress(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode)
         {
-            List<string> platformsList = _PlatformStationService.GetPlatIn(conveyorLine.DeviceCode);    //璇诲彇绔欏彴淇℃伅
-            foreach (var RGVStationitem in platformsList)
-            {
-                ConveyorLineCommand command = lineCommand(conveyorLine, RGVStationitem);
-                if (command != null)
-                {
-                    if (command.Online && command.STB && command.TaskNo != 0)
-                    {
-                        //鍐欏叆鍙嶉
-                        DeviceProDTO? deviceProDTO = conveyorLine.DeviceProDTOs.Find(x => x.DeviceChildCode == RGVStationitem && x.DeviceProParamName == "ACK" && x.DeviceProParamType == "DeviceCommand");
 
-                        if (conveyorLine.Communicator.Write(deviceProDTO.DeviceProAddress, (bool)true))
-                        {
-                            DeviceProDTO? deviceProDTO2 = conveyorLine.DeviceProDTOs.Find(x => x.DeviceChildCode == RGVStationitem && x.DeviceProParamName == "STB" && x.DeviceProParamType == "ReadDeviceCommand");
-                            if (conveyorLine.Communicator.Read<bool>(deviceProDTO2.DeviceProAddress))
-                            {
-                                conveyorLine.Communicator.Write(deviceProDTO.DeviceProAddress, (bool)false);
-                                _taskService.UpdateTaskStatusToNext2(command.TaskNo);
-
-                                wcsWriteLog5(RGVStationitem, "姝e父淇℃伅", $"娓呴櫎绔欏彴锛歿RGVStationitem}鐨勪氦浜掍俊鍙峰啓鍏ワ細false锛屽湴鍧�锛歿deviceProDTO.DeviceProAddress}");
-                            }
-                            else
-                            {
-                                wcsWriteLog5(RGVStationitem, "閿欒淇℃伅", $"鏈鍙栧埌绔欏彴锛歿RGVStationitem}鐨勪氦浜掍俊鍙凤細true锛屽湴鍧�锛歿deviceProDTO.DeviceProAddress}");
-                            }
-                        }
-                        else
-                        {
-                            conveyorLine.Communicator.Write(deviceProDTO.DeviceProAddress, (bool)false);
-                            wcsWriteLog5(RGVStationitem, "閿欒淇℃伅", $"{RGVStationitem}鐨勪氦浜掍俊鍙峰啓鍏ワ細true ==銆� false锛屽湴鍧�锛歿deviceProDTO.DeviceProAddress}");
-                        }
-                    }
-                    else
-                    {
-                        wcsWriteLog5(RGVStationitem, "閿欒淇℃伅", $"鏈鍙栧埌绔欏彴锛歿RGVStationitem}鐨勭敵璇蜂俊鍙凤紝鐩墠淇″彿鐘舵�佷负銆侽nline锛歿command.Online}锛孲TB锛歿command.STB}锛孴askNo锛歿command.TaskNo}锛�");
-                    }
-                }
-            }
         }
 
         /// <summary>
-        /// RGV杈撻�佺嚎璇锋眰鍑虹珯
+        /// 杈撻�佺嚎鍏ュ簱瀹屾垚
         /// </summary>
         /// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param>
-        public void RequestOutbound(CommonConveyorLine conveyorLine)
+        /// <param name="command">璇诲彇鐨勮姹備俊鎭�</param>
+        /// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
+        public void ConveyorLineInFinish(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode)
         {
 
-            List<string> platformsList = _PlatformStationService.GetPlatform2(conveyorLine.DeviceCode);
-            foreach (var RGVStationitem in platformsList)
-            {
-                ConveyorLineCommand command = lineCommand(conveyorLine, RGVStationitem);
-                if (command != null)
-                {
-                    if(command.Online)
-                    {
-                        if (command.STB)
-                        {
-                            if (_taskService.UpdateTaskStatusToNext(command.TaskNo).Status)
-                            {
-                                DeviceProDTO? deviceProDTO6 = conveyorLine.DeviceProDTOs.Find(x => x.DeviceChildCode == RGVStationitem && x.DeviceProParamName == "ACK" && x.DeviceProParamType == "DeviceCommand");
-                                if (deviceProDTO6 != null)
-                                {
-                                    conveyorLine.Communicator.Write(deviceProDTO6.DeviceProAddress, (bool)true);
-                                    wcsWriteLog2(RGVStationitem, "姝e父鏃ュ織", $"{RGVStationitem}鍐欏叆杈撻�佺嚎淇″彿,妯″潡{deviceProDTO6.DeviceProAddress}锛歵rue");
-                                }
-                                else
-                                {
-                                    wcsWriteLog2(RGVStationitem, "閿欒鏃ュ織", $"鏈壘鍒板浜庣殑璇诲彇妯″潡{RGVStationitem}");
-                                }
-                            }
-                            else
-                            {
-                                wcsWriteLog2(RGVStationitem, "閿欒鏃ュ織", $"浠诲姟淇℃伅鏇存敼澶辫触");
-                            }
-                        }
-                        else
-                        {
-                            DeviceProDTO? deviceProDTO6 = conveyorLine.DeviceProDTOs.Find(x => x.DeviceChildCode == RGVStationitem && x.DeviceProParamName == "ACK" && x.DeviceProParamType == "DeviceCommand");
-                            if (deviceProDTO6 != null)
-                            {
-
-                                conveyorLine.Communicator.Write(deviceProDTO6.DeviceProAddress, (bool)false);
-                                wcsWriteLog2(RGVStationitem, "姝e父鏃ュ織", $"{RGVStationitem}鍐欏叆杈撻�佺嚎淇″彿,妯″潡{deviceProDTO6.DeviceProAddress}锛歠alse");
-                            }
-                            else
-                            {
-                                wcsWriteLog2(RGVStationitem, "閿欒鏃ュ織", $"鏈壘鍒板浜庣殑璇诲彇妯″潡{RGVStationitem}");
-                            }
-                        }
-                    }
-                    else
-                    {
-                        wcsWriteLog2(RGVStationitem, "閿欒鏃ュ織", $"璇ョ珯鍙皗RGVStationitem}涓嶅浜庤仈鏈虹姸鎬�");
-                    }
-
-                }
-            }
         }
 
         /// <summary>
-        /// 鑾峰彇鍑哄簱绔欏彴锛屾洿鏂板嚭搴撲换鍔�
+        /// 杈撻�佺嚎璇锋眰鍑轰俊鎭�
         /// </summary>
         /// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param>
-        public void RequestOutAdd(CommonConveyorLine conveyorLine)
+        /// <param name="command">璇诲彇鐨勮姹備俊鎭�</param>
+        /// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
+        public void RequestOutbound(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode)
         {
-            List<PlatformStation> platformsList = _PlatformStationService.GetPlatformOutList(conveyorLine.DeviceCode);
-            foreach (var RGVStationitem in platformsList)
-            {
-                ConveyorLineCommand command = lineCommand(conveyorLine, RGVStationitem.Station_code);
-                if (command != null)
-                {
-                    if(command.Online)
-                    {
-                        if (command.Free)
-                        {
-                            if (_taskService.OutConveyorLineTask(RGVStationitem))    //鏌ユ壘鏄惁琚崰鐢�
-                            {
-                                wcsWriteLog3(RGVStationitem.Station_code.ToString(), "鏇存柊鎴愬姛", $"浠诲姟淇℃伅鏇存柊鎴愬姛");
-                            }
-                            else
-                            {
-                                wcsWriteLog3(RGVStationitem.Station_code.ToString(), "閿欒淇℃伅", $"宸叉湁璇ョ珯鍙扮殑鍑哄簱浠诲姟鎴栦换鍔℃洿鏂板け璐�");
-                            }
-                        }
-                        else
-                        {
-                            wcsWriteLog3(RGVStationitem.Station_code.ToString(), "閿欒淇℃伅", $"璇ュ嚭搴撶珯鍙颁笉鍙斁璐�");
-                        }
-                    }
-                    else
-                    {
-                        wcsWriteLog3(RGVStationitem.Station_code.ToString(), "鏄惁鑱旀満", $"璇ョ珯鍙皗RGVStationitem.Station_code}涓嶅浜庤仈鏈虹姸鎬�");
-                    }
-                }
-            }
+
         }
 
-
         /// <summary>
-        /// 鍫嗗灈鏈哄嚭搴撶珯鍙帮紝鏍规嵁浠诲姟杩涜涓嬪彂鑷宠緭閫佺嚎
+        /// 杈撻�佺嚎璇锋眰鍑哄簱涓嬩竴鍦板潃
         /// </summary>
         /// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param>
-        public void RequestOutSCLine(CommonConveyorLine conveyorLine)
+        /// <param name="command">璇诲彇鐨勮姹備俊鎭�</param>
+        /// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
+        public void RequestOutNextAddress(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode)
         {
-            List<Dt_Task> StationData = _taskService.StackerCraneOutTask();
-            
-            foreach (var LinSCStationitem in StationData)
-            {
-                string platformsList = _PlatformStationService.GetOutSCName(LinSCStationitem.Roadway, LinSCStationitem.Station_storey);
-                DeviceProDTO? deviceProDTO6 = conveyorLine.DeviceProDTOs.Find(x => x.DeviceChildCode == platformsList && x.DeviceProParamName == "STB" && x.DeviceProParamType == "DeviceCommand");
-                DeviceProDTO? deviceProDTO7 = conveyorLine.DeviceProDTOs.Find(x => x.DeviceChildCode == platformsList && x.DeviceProParamName == "TaskNo" && x.DeviceProParamType == "DeviceCommand");
-                if (deviceProDTO6 != null && deviceProDTO7 != null)
-                {
-                    conveyorLine.Communicator.Write(deviceProDTO7.DeviceProAddress, (int)LinSCStationitem.TaskNum);
-                    if (conveyorLine.Communicator.Write(deviceProDTO6.DeviceProAddress, (bool)true))
-                    {
-                        DeviceProDTO? deviceProDTO8 = conveyorLine.DeviceProDTOs.Find(x => x.DeviceChildCode == platformsList && x.DeviceProParamName == "ACK" && x.DeviceProParamType == "ReadDeviceCommand");
-                        if (deviceProDTO8 != null)
-                        {
-                            if (conveyorLine.Communicator.Read<bool>(deviceProDTO8.DeviceProAddress))
-                            {
-                                _taskService.UpdateTaskStatusToNext(LinSCStationitem.TaskNum);
-                                conveyorLine.Communicator.Write(deviceProDTO6.DeviceProAddress, (bool)false);
-                                conveyorLine.Communicator.Write(deviceProDTO8.DeviceProAddress, (int)0);
-                                //鍐欏叆杈撻�佺嚎鍥炲簲淇″彿涓�
-                            }
-                            else
-                            {
-                                wcsWriteLog4(LinSCStationitem.TargetAddress, "鐢宠鍑哄簱鍫嗗灈鏈虹珯鍙伴敊璇俊鎭�", $"鏈鍙栧埌杈撻�佺嚎鍥炲簲淇″彿锛欰CK锛寋LinSCStationitem}");
-                            }
-                        }
-                        else
-                        {
-                            wcsWriteLog4(LinSCStationitem.TargetAddress, "鐢宠鍑哄簱鍫嗗灈鏈虹珯鍙伴敊璇俊鎭�", $"鏈壘鍒板浜庣殑璇诲彇妯″潡{LinSCStationitem}");
-                        }
-                    }
-                    else
-                    {
-                        wcsWriteLog4(LinSCStationitem.TargetAddress, "鐢宠鍑哄簱鍫嗗灈鏈虹珯鍙板け璐�", $"鍐欏叆杈撻�佺嚎淇″彿,妯″潡{deviceProDTO6.DeviceProAddress}锛氬け璐�");
-                    }
-                }
-                else
-                {
-                    wcsWriteLog4(LinSCStationitem.TargetAddress, "鐢宠鍑哄簱鍫嗗灈鏈虹珯鍙伴敊璇俊鎭�", $"鏈壘鍒板浜庣殑鍐欏叆妯″潡{LinSCStationitem}");
-                }
-            }
-        }
 
-        
+        }
 
         /// <summary>
-        /// 璇诲彇淇℃伅璁板綍
+        /// 杈撻�佺嚎鍑哄簱瀹屾垚
         /// </summary>
-        /// <param name="SCLLinStack"></param>
-        /// <param name="Logtype"></param>
-        /// <param name="Magessadd"></param>
-        public void wcsWriteLog(string SCLLinStack, string Logtype, string Magessadd)
+        /// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param>
+        /// <param name="command">璇诲彇鐨勮姹備俊鎭�</param>
+        /// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
+        public void ConveyorLineOutFinish(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode)
         {
-            WriteLog.Write_Log("鍏ュ簱鍙�", SCLLinStack + "绔欏彴", Logtype, new { 淇℃伅 = Magessadd });
-        }
 
-        public void wcsWriteLog2(string SCLLinStack, string Logtype, string Magessadd)
-        {
-            WriteLog.Write_Log("RGV绔欏彴", SCLLinStack + "绔欏彴", Logtype, new { 淇℃伅 = Magessadd });
-        }
-
-        public void wcsWriteLog3(string SCLLinStack, string Logtype, string Magessadd)
-        {
-            WriteLog.Write_Log("鍑哄簱鍙�", SCLLinStack + "绔欏彴", Logtype, new { 淇℃伅 = Magessadd });
-        }
-
-        public void wcsWriteLog4(string SCLLinStack, string Logtype, string Magessadd)
-        {
-            WriteLog.Write_Log("鍫嗗灈鏈虹珯鍙�", SCLLinStack + "绔欏彴", Logtype, new { 淇℃伅 = Magessadd });
-        }
-
-        public void wcsWriteLog5(string SCLLinStack, string Logtype, string Magessadd)
-        {
-            WriteLog.Write_Log("鍫嗗灈鏈哄叆搴撶珯鍙�", SCLLinStack + "绔欏彴", Logtype, new { 淇℃伅 = Magessadd });
-        }
-
-
-
-
-        public ConveyorLineCommand lineCommand(CommonConveyorLine conveyorLine,string Station_code)
-        {
-            ConveyorLineCommand conveyorLineCommand = new ConveyorLineCommand();
-            List<DeviceProDTO> deviceProDTO6 = conveyorLine.DeviceProDTOs
-                .Where(x => x.DeviceChildCode == Station_code
-                            && DBLine.ListDBdata.Contains(x.DeviceProParamName)
-                            && x.DeviceProParamType == "ReadDeviceCommand")
-                .ToList();
-            foreach (var item in deviceProDTO6)
-            {
-                var paramName = item.DeviceProParamName;
-                var propertyInfo = typeof(ConveyorLineCommand).GetProperty(paramName);
-
-                if (propertyInfo != null)
-                {
-                    if (item.DeviceDataType == "bool")
-                    {
-                       var value = conveyorLine.Communicator.Read<bool>(item.DeviceProAddress);
-                       propertyInfo.SetValue(conveyorLineCommand, value);
-                    }else if(item.DeviceDataType == "int")
-                    {
-                        var value = conveyorLine.Communicator.Read<int>(item.DeviceProAddress);
-                        propertyInfo.SetValue(conveyorLineCommand, value);
-                    }else if(item.DeviceDataType == "string")
-                    {
-                        var value = conveyorLine.Communicator.Read<string>(item.DeviceProAddress);
-                        propertyInfo.SetValue(conveyorLineCommand, value);
-                    }
-                }
-            }
-            return conveyorLineCommand;
         }
     }
 }

--
Gitblit v1.9.3