From eaa7c0d999c6dd7901bf4f0de79b861eae38e978 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 08 十月 2025 22:51:28 +0800
Subject: [PATCH] 代码提交

---
 项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs |  524 ----------------------------------------------------------
 1 files changed, 1 insertions(+), 523 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
index 343d3eb..d3fd64a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
@@ -76,28 +76,7 @@
                 CommonConveyorLine conveyorLine = (CommonConveyorLine)context.JobDetail.JobDataMap.Get("JobParams");
                 if (conveyorLine != null)
                 {
-                    // 鏌ヨ鎵�鏈夊瓙璁惧鐨勪綅缃�
-                    List<string> childDeviceCodes = _routerService.QueryAllPositions(conveyorLine.DeviceCode);
-                    // 鑾峰彇鎵�鏈夌珯鐐圭鐞嗗櫒
-                    List<Dt_StationManager> stationManagers = _stationManagerService.GetAllStationByDeviceCode(conveyorLine.DeviceCode);
-
-                    // 骞惰澶勭悊姣忎釜瀛愯澶�
-                    var tasks = childDeviceCodes.Select(childDeviceCode => ProcessDeviceAsync(conveyorLine, childDeviceCode)).ToList();
-
-                    // 骞惰澶勭悊姣忎釜绔欑偣绠$悊鍣�
-                    tasks = stationManagers.Select(station => Task.Run(async () =>
-                    {
-                        ConveyorLineTaskCommand command = ReadCommand(conveyorLine, station.stationChildCode);
-                        if (command == null )
-                        {
-                            return;
-                        }
-
-                        IStationHandler handler = StationHandlerFactory.GetHandler(station.stationType, this);
-                        await handler.HandleStationAsync(conveyorLine, station, command);
-                    })).ToList();
-
-                    await Task.WhenAll(tasks);
+                  
                 }
             }
             catch (Exception ex)
@@ -106,507 +85,6 @@
                 Console.Out.WriteLine(nameof(CommonConveyorLineJob) + ":" + ex.ToString());
             }
             return;
-        }
-
-        private Task ProcessDeviceAsync(CommonConveyorLine conveyorLine, string childDeviceCode)
-        {
-            try
-            {
-                // 璇诲彇浠诲姟鍛戒护鍜岃澶囧懡浠�
-                ConveyorLineTaskCommand command = ReadCommand(conveyorLine, childDeviceCode);
-                if (command != null)
-                {
-                    #region 璋冪敤浜嬩欢鎬荤嚎閫氱煡鍓嶇
-
-                    // 鑾峰彇缂撳瓨涓殑鐢ㄦ埛淇℃伅
-                    var tokenInfos = _cacheService.Get<List<UserInfo>>("Cache_UserToken");
-                    if (tokenInfos != null && tokenInfos.Any())
-                    {
-                        userTokenIds = tokenInfos.Select(x => x.Token_ID).ToList();
-                        userIds = tokenInfos.Select(x => x.UserId).ToList();
-
-                        // 鏋勯�犻�氱煡鏁版嵁
-                        object obj = new
-                        {
-                            command
-                        };
-                        // 鍙戦�侀�氱煡
-                        _noticeService.LineData(userIds.FirstOrDefault(), userTokenIds, new { conveyorLine.DeviceName, childDeviceCode, data = obj });
-                    }
-
-                    #endregion 璋冪敤浜嬩欢鎬荤嚎閫氱煡鍓嶇
-
-                    var structs = BitConverter.GetBytes(command.InteractiveSignal).Reverse().ToArray().ToBoolArray();
-                    // 鑾峰彇璁惧鍗忚璇︽儏
-                    List<DeviceProtocolDetailDTO>? deviceProtocolDetails = conveyorLine.DeviceProtocolDetailDTOs.Where(x => x.DeviceProParamName == nameof(ConveyorLineTaskCommand.InteractiveSignal)).ToList();
-
-                    if (deviceProtocolDetails != null)
-                    {
-                        foreach (var item in deviceProtocolDetails)
-                        {
-                            int itemValue = item.ProtocalDetailValue.ObjToInt();
-                            if (structs[itemValue] == true)
-                            {
-                                // 鑾峰彇澶勭悊鏂规硶
-                                MethodInfo? method = GetType().GetMethod(item.ProtocolDetailType);
-                                if (method != null)
-                                {
-                                    // 璋冪敤澶勭悊鏂规硶
-                                    method.Invoke(this, new object[] { conveyorLine, command, childDeviceCode, itemValue });
-                                }
-                            }
-                        }
-                    }
-
-               }
-            }
-            catch (Exception ex)
-            {
-            }
-            return Task.CompletedTask;
-        }
-
-        #region 鍏ュ簱
-
-        /// <summary>
-        /// 杈撻�佺嚎璇锋眰鍏ュ簱
-        /// </summary>
-        /// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param>
-        /// <param name="command">璇诲彇鐨勮姹備俊鎭�</param>
-        /// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
-        /// <param name="ProtocalDetailValue">绾夸綋褰撳墠bool璇诲彇鍋忕Щ鍦板潃</param>
-        public async Task RequestInbound(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int ProtocalDetailValue)
-        {
-            try
-            {
-                // 杈撳嚭璀﹀憡淇℃伅锛岃〃绀轰换鍔″凡鍒拌揪瀛愯澶囧苟璇锋眰鎵爜鍏ュ簱
-                var log = $"鏃堕棿锛氥�恵DateTime.Now}銆戙�恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉$爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣姹傛壂鐮佸叆搴�";
-                ConsoleHelper.WriteWarningLine(log);
-                // 鍙戦�侀�氱煡
-                await _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = log, time = DateTime.Now.ToString("G"), color = "red" });
-                WriteInfo(conveyorLine.DeviceName, log);
-
-                // 鏌ヨ鏉$爜瀵瑰簲鐨勪换鍔�
-                var task = _taskService.QueryBarCodeConveyorLineTask(command.Barcode.ToString(), childDeviceCode);
-                if (task != null)
-                {
-                    // 濡傛灉浠诲姟绫诲瀷鏄嚭搴撴垨鍑烘墭鐩橈紝鍒欏鐞嗗嚭搴撲换鍔�
-                    if (task.TaskType == (int)TaskOutboundTypeEnum.OutTray || task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
-                    {
-                        HandleTaskOut(conveyorLine, command, childDeviceCode, ProtocalDetailValue, task);
-                    }
-                    else
-                    {
-                        // 鑾峰彇浠诲姟鐨勪笅涓�鐩爣鍦板潃
-                        var next = task.NextAddress;
-                        // 灏嗕换鍔℃槧灏勪负鍛戒护
-                        var taskCommand = MapTaskCommand(task, command);
-                        // 鎭㈠浠诲姟鐨勪笅涓�鐩爣鍦板潃
-                        task.NextAddress = next;
-                        // 鍙戦�佸懡浠ゅ埌瀛愯澶�
-                        conveyorLine.SendCommand(taskCommand, childDeviceCode);
-
-                        // 杈撳嚭璀﹀憡淇℃伅锛岃〃绀轰换鍔″凡鍒拌揪瀛愯澶囧苟璇锋眰鎵爜鍏ュ簱锛屼笅涓�鐩爣鍦板潃
-                        var logs = $"鏃堕棿锛氥�恵DateTime.Now}銆戙�恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉$爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣姹傛壂鐮佸叆搴�,涓嬩竴鐩爣鍦板潃銆恵taskCommand.TargetAddress}銆�";
-                        ConsoleHelper.WriteWarningLine(logs);
-
-                        await _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = logs, time = DateTime.Now.ToString("G"), color = "red" });
-                        WriteInfo(conveyorLine.DeviceName, logs);
-
-                        // 鍙戦�佷换鍔″畬鎴愰�氱煡
-                        ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
-                        // 鏇存柊浠诲姟鐘舵�佷负涓嬩竴鐘舵��
-                        _taskService.UpdateTaskStatusToNext(task);
-                    }
-                }
-                else
-                {
-                    // 濡傛灉浠诲姟涓虹┖涓旀潯鐮佷笉涓�"NoRead"涓旀潯鐮佷笉涓虹┖锛屽垯澶勭悊鏂颁换鍔�
-                    if (task == null && command.Barcode.ToString() != "NoRead" && command.Barcode.IsNotEmptyOrNull())
-                    {
-                        // 鏌ヨ鏉$爜瀵瑰簲鐨勪换鍔�
-                        task = _taskService.QueryBarcodeTask(command.Barcode.ToString(), childDeviceCode);
-                        if (task == null)
-                            // 寮傛澶勭悊鏂颁换鍔�
-                            await HandleNewTaskAsync(conveyorLine, command, childDeviceCode, ProtocalDetailValue);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                // 鎹曡幏骞惰緭鍑哄紓甯镐俊鎭�
-                Console.Out.WriteLine(ex.ToString());
-            }
-        }
-
-        #region 杈撻�佺嚎璇锋眰鍏ュ簱涓嬩竴鍦板潃
-
-        /// <summary>
-        /// 杈撻�佺嚎璇锋眰鍏ュ簱涓嬩竴鍦板潃
-        /// </summary>
-        /// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param>
-        /// <param name="command">璇诲彇鐨勮姹備俊鎭�</param>
-        /// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
-        public void RequestInNextAddress(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode)
-        {
-            var log = $"鏃堕棿锛氥�恵DateTime.Now}銆戙�恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉$爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣姹傚叆搴撲笅涓�鍦板潃";
-            ConsoleHelper.WriteWarningLine(log);
-
-            _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = log, time = DateTime.Now.ToString("G"), color = "red" });
-            WriteInfo(conveyorLine.DeviceName, log);
-
-            Dt_Task task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode, command.Barcode.ToString());
-            if (task != null)
-            {
-                if (command.Barcode.ToString() == task.PalletCode)
-                {
-                    Dt_Task? newTask = _taskService.UpdatePosition(task.TaskNum, task.CurrentAddress);
-                    if (newTask != null)
-                    {
-                        //ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(newTask);
-                        //taskCommand.InteractiveSignal = command.InteractiveSignal;
-                        var next = newTask.NextAddress;
-                        var taskCommand = MapTaskCommand(newTask, command);
-                        newTask.NextAddress = next;
-
-                        var logs = $"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉$爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣姹傚叆搴撲笅涓�鍦板潃,涓嬩竴鐩爣鍦板潃銆恵taskCommand.TargetAddress}銆�";
-                        ConsoleHelper.WriteWarningLine(logs);
-
-                        _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = logs, time = DateTime.Now.ToString("G"), color = "red" });
-                        WriteInfo(conveyorLine.DeviceName, logs);
-
-                        conveyorLine.SendCommand(taskCommand, childDeviceCode);
-                        _taskService.UpdateData(newTask);
-                    }
-                }
-            }
-        }
-
-        #endregion 杈撻�佺嚎璇锋眰鍏ュ簱涓嬩竴鍦板潃
-
-        /// <summary>
-        /// 杈撻�佺嚎鍏ュ簱瀹屾垚
-        /// </summary>
-        /// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param>
-        /// <param name="command">璇诲彇鐨勮姹備俊鎭�</param>
-        /// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
-        /// <param name="ProtocalDetailValue">绾夸綋褰撳墠bool璇诲彇鍋忕Щ鍦板潃</param>
-        public void ConveyorLineInFinish(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int ProtocalDetailValue)
-        {
-            try
-            {
-                var log = $"鏃堕棿锛氥�恵DateTime.Now}銆戙�恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉$爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣緭閫佺嚎鍏ュ簱瀹屾垚";
-                ConsoleHelper.WriteWarningLine(log);
-
-                _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = log, time = DateTime.Now.ToString("G"), color = "red" });
-                WriteInfo(conveyorLine.DeviceName, log);
-
-                var task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode, command.Barcode.ToString());
-                if (task != null && task.TaskState != (int)TaskInStatusEnum.Line_InFinish)
-                {
-                    if (command.Barcode.ToString() == task.PalletCode && childDeviceCode == task.NextAddress)
-                    {
-                        if (task.TaskType == (int)TaskInboundTypeEnum.InNG)
-                        {
-                            int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
-
-                            var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.SourceAddress);
-                            task.CurrentAddress = station.stationLocation;
-                            task.NextAddress = station.stationNGLocation;
-                            task.TargetAddress = task.NextAddress;
-                            task.TaskState = nextStatus;
-                            task.ModifyDate = DateTime.Now;
-                            task.Modifier = "System";
-                            _taskRepository.UpdateData(task);
-
-                            conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, "1000", childDeviceCode);
-
-                            var logs = $"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉$爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣緭閫佺嚎鍏ュ簱瀹屾垚,涓嬩竴鐩爣鍦板潃銆愮瓑寰呭垎閰嶈揣浣�,骞跺啓鍏�1000銆�";
-                            ConsoleHelper.WriteWarningLine(logs);
-
-                            _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = logs, time = DateTime.Now.ToString("G"), color = "red" });
-                            WriteInfo(conveyorLine.DeviceName, logs);
-
-                            ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
-                        }
-                        else
-                        {
-                            WebResponseContent content = _taskService.UpdateTaskStatusToNext(task);
-                            WriteInfo(conveyorLine.DeviceName, content.ToJsonString());
-                            if (!content.Status)
-                            {
-                                ConsoleHelper.WriteWarningLine($"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉$爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣緭閫佺嚎鍏ュ簱瀹屾垚,浠诲姟鎵ц澶辫触{JsonConvert.SerializeObject(content)}");
-                                return;
-                            }
-
-                            conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, "1000", childDeviceCode);
-
-                            var logs = $"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉$爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣緭閫佺嚎鍏ュ簱瀹屾垚,涓嬩竴鐩爣鍦板潃銆愮瓑寰呭垎閰嶈揣浣�,骞跺啓鍏�1000銆�";
-                            ConsoleHelper.WriteWarningLine(logs);
-
-                            _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = logs, time = DateTime.Now.ToString("G"), color = "red" });
-                            WriteInfo(conveyorLine.DeviceName, logs);
-
-                            ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
-                            Console.Out.WriteLine(content.ToJsonString());
-                        }
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-            }
-        }
-
-        #endregion 鍏ュ簱
-
-        #region 鍑哄簱
-
-        /// <summary>
-        /// 杈撻�佺嚎璇锋眰鍑轰俊鎭�
-        /// </summary>
-        /// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param>
-        /// <param name="command">璇诲彇鐨勮姹備俊鎭�</param>
-        /// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
-        /// <param name="ProtocalDetailValue">绾夸綋褰撳墠bool璇诲彇鍋忕Щ鍦板潃</param>
-        public void RequestOutbound(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int ProtocalDetailValue)
-        {
-            try
-            {
-                // 鏌ヨ杈撻�佺嚎浠诲姟锛屾牴鎹緭閫佺嚎璁惧鍜屽瓙璁惧浠g爜鑾峰彇浠诲姟淇℃伅
-                var task = _taskService.QueryConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode);
-
-                // 杈撳嚭鎴愬姛淇℃伅锛屽寘鎷緭閫佺嚎鍚嶇О銆佷换鍔″彿銆佹墭鐩樻潯鐮佸拰瀛愯澶囦唬鐮侊紝浠ュ強浠诲姟淇℃伅
-                var logs = $"鏃堕棿锛氥�恵DateTime.Now}銆戙�恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉$爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣緭閫佺嚎璇锋眰鍑哄簱,task{task.ToJsonString()}";
-                ConsoleHelper.WriteSuccessLine(logs);
-
-                _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = logs, time = DateTime.Now.ToString("G"), color = "red" });
-                WriteInfo(conveyorLine.DeviceName, logs);
-
-                // 濡傛灉浠诲姟涓嶄负绌猴紝鍒欐墽琛屼互涓嬫搷浣�
-                if (task != null)
-                {
-                    // 鑾峰彇浠诲姟鐨勪笅涓�鐩爣鍦板潃
-                    var next = task.NextAddress;
-
-                    // 灏嗕换鍔″懡浠ゆ槧灏勫埌褰撳墠浠诲姟
-                    var taskCommand = MapTaskCommand(task, command);
-
-                    // 鎭㈠浠诲姟鐨勪笅涓�鐩爣鍦板潃
-                    task.NextAddress = next;
-
-                    // 杈撳嚭鎴愬姛淇℃伅锛屽寘鎷緭閫佺嚎鍚嶇О銆佷换鍔″彿銆佹墭鐩樻潯鐮併�佸瓙璁惧浠g爜鍜屼笅涓�鐩爣鍦板潃
-                    var log = $"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉$爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣緭閫佺嚎璇锋眰鍑哄簱,涓嬩竴鐩爣鍦板潃銆恵taskCommand.TargetAddress}銆�";
-                    ConsoleHelper.WriteSuccessLine(log);
-
-                    _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = log, time = DateTime.Now.ToString("G"), color = "red" });
-                    WriteInfo(conveyorLine.DeviceName, log);
-
-                    // 鍚戣緭閫佺嚎鍙戦�佸懡浠�
-                    conveyorLine.SendCommand(taskCommand, childDeviceCode);
-
-                    // 瀹屾垚杈撻�佺嚎鍙戦�佷换鍔★紝骞舵洿鏂颁换鍔$姸鎬�
-                    ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
-
-                    // 鏇存柊浠诲姟鐘舵�佸埌涓嬩竴涓姸鎬�
-                    _taskService.UpdateTaskStatusToNext(task);
-
-                    // 濡傛灉浠诲姟鐨勭洰鏍囧湴鍧�鏄�"1020-1"锛屽垯鍐嶆鏇存柊浠诲姟鐘舵�佸埌涓嬩竴涓姸鎬�
-                    if (task.TargetAddress == "1020-1"|| task.TargetAddress == "1049-8")
-                    {
-                        _taskService.UpdateTaskStatusToNext(task);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-            }
-        }
-
-        /// <summary>
-        /// 杈撻�佺嚎璇锋眰鍑哄簱涓嬩竴鍦板潃
-        /// </summary>
-        /// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param>
-        /// <param name="command">璇诲彇鐨勮姹備俊鎭�</param>
-        /// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
-        public void RequestOutNextAddress(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int ProtocalDetailValue)
-        {
-            // 鎵撳嵃鎴愬姛鏃ュ織锛屾樉绀哄綋鍓嶈澶囧悕绉般�佷换鍔″彿銆佹墭鐩樻潯鐮佷互鍙婅姹傚嚭搴撲笅涓�鍦板潃鐨勫瓙璁惧浠g爜
-            var log = $"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉$爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣緭閫佺嚎璇锋眰鍑哄簱涓嬩竴鍦板潃";
-            ConsoleHelper.WriteSuccessLine(log);
-
-            _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = log, time = DateTime.Now.ToString("G"), color = "red" });
-            WriteInfo(conveyorLine.DeviceName, log);
-
-            // 鏌ヨ姝e湪鎵ц鐨勮緭閫佺嚎浠诲姟锛屾牴鎹换鍔″彿鍜屽瓙璁惧浠g爜鑾峰彇浠诲姟淇℃伅
-            Dt_Task task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode, command.Barcode.ToString());
-
-            // 濡傛灉浠诲姟瀛樺湪
-            if (task != null)
-            {
-                // 妫�鏌ヤ换鍔′腑鐨勬墭鐩樻潯鐮佹槸鍚︿笌鍛戒护涓殑鎵樼洏鏉$爜涓�鑷�
-                if (command.Barcode.ToString() == task.PalletCode)
-                {
-                    // 鏇存柊浠诲姟鐨勪綅缃俊鎭紝骞惰幏鍙栨洿鏂板悗鐨勪换鍔″璞�
-                    Dt_Task? newTask = _taskService.UpdatePosition(task.TaskNum, task.CurrentAddress);
-
-                    // 濡傛灉鏇存柊鍚庣殑浠诲姟瀵硅薄涓嶄负绌�
-                    if (newTask != null)
-                    {
-                        // 鑾峰彇涓嬩竴鐩爣鍦板潃
-                        var next = newTask.NextAddress;
-
-                        // 灏嗘柊浠诲姟瀵硅薄鏄犲皠涓轰换鍔″懡浠ゅ璞�
-                        var taskCommand = MapTaskCommand(newTask, command);
-
-                        // 鎭㈠鏂颁换鍔″璞$殑涓嬩竴鐩爣鍦板潃
-                        newTask.NextAddress = next;
-
-                        // 鎵撳嵃鎴愬姛鏃ュ織锛屾樉绀哄綋鍓嶈澶囧悕绉般�佷换鍔″彿銆佹墭鐩樻潯鐮併�佸瓙璁惧浠g爜浠ュ強涓嬩竴鐩爣鍦板潃
-                        var logs = $"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉$爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣緭閫佺嚎璇锋眰鍑哄簱涓嬩竴鍦板潃,涓嬩竴鐩爣鍦板潃銆恵taskCommand.TargetAddress}銆�";
-                        ConsoleHelper.WriteSuccessLine(logs);
-
-                        _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = logs, time = DateTime.Now.ToString("G"), color = "red" });
-                        WriteInfo(conveyorLine.DeviceName, logs);
-
-                        // 鍙戦�佷换鍔″懡浠ゅ埌瀛愯澶�
-                        conveyorLine.SendCommand(taskCommand, childDeviceCode);
-
-                        // 鏍囪杈撻�佺嚎鍙戦�佷换鍔″畬鎴�
-                        ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
-
-                        _taskService.UpdateData(newTask);
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// 杈撻�佺嚎鍑哄簱瀹屾垚
-        /// </summary>
-        /// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param>
-        /// <param name="command">璇诲彇鐨勮姹備俊鎭�</param>
-        /// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
-        public void ConveyorLineOutFinish(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int ProtocalDetailValue)
-        {
-            try
-            {
-                // 鎵撳嵃鎴愬姛淇℃伅锛岃〃绀烘墭鐩樺凡鍒拌揪鎸囧畾杈撻�佺嚎骞跺畬鎴愬嚭搴�
-                var logs = $"銆恵conveyorLine.DeviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉$爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣緭閫佺嚎鍑哄簱瀹屾垚";
-                ConsoleHelper.WriteSuccessLine(logs);
-
-                _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = logs, time = DateTime.Now.ToString("G"), color = "red" });
-                WriteInfo(conveyorLine.DeviceName, logs);
-
-                // 鏌ヨ姝e湪鎵ц鐨勮緭閫佺嚎浠诲姟
-                var task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode, command.Barcode.ToString());
-
-                // 濡傛灉浠诲姟瀛樺湪
-                if (task != null)
-                {
-                    // 濡傛灉浠诲姟涓殑鎵樼洏鏉$爜涓庡懡浠や腑鐨勬墭鐩樻潯鐮佷竴鑷�
-                    if (command.Barcode.ToString() == task.PalletCode)
-                    {
-                        // 鍒涘缓涓�涓┖鐨刉ebResponseContent瀵硅薄
-                        WebResponseContent content = new WebResponseContent();
-
-                        // 淇濆瓨浠诲姟鐨勪笅涓�鐩爣鍦板潃
-                        var next = task.NextAddress;
-                        // 灏嗕换鍔℃槧灏勪负鍛戒护
-                        var taskCommand = MapTaskCommand(task, command);
-                        // 鎭㈠浠诲姟鐨勪笅涓�鐩爣鍦板潃
-                        task.NextAddress = next;
-
-                        // 濡傛灉浠诲姟鐨勬墭鐩樻潯鐮佷笌鍛戒护涓殑鎵樼洏鏉$爜涓嶄竴鑷存垨鑰呬换鍔″娉ㄤ负"NG"
-                        if (task.PalletCode != command.Barcode.ToString() || task.Remark == "NG")
-                        {
-                            // 璁剧疆鍛戒护鐨勭洰鏍囧湴鍧�涓篘G鍦板潃
-                            taskCommand.TargetAddress = 1;
-                        }
-                        else
-                        {
-                            // 璁剧疆鍛戒护鐨勭洰鏍囧湴鍧�涓�1000
-                            taskCommand.TargetAddress = 1000;
-                        }
-
-                        // 鎵撳嵃鎴愬姛淇℃伅锛岃〃绀烘墭鐩樺凡鍒拌揪鎸囧畾杈撻�佺嚎骞跺畬鎴愬嚭搴擄紝涓嬩竴鐩爣鍦板潃宸茬‘瀹�
-                        var log = $"銆恵conveyorLine.DeviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉$爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣緭閫佺嚎鍑哄簱瀹屾垚,涓嬩竴鐩爣鍦板潃銆恵taskCommand.TargetAddress}銆�";
-                        ConsoleHelper.WriteSuccessLine(log);
-
-                        _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = log, time = DateTime.Now.ToString("G"), color = "red" });
-                        WriteInfo(conveyorLine.DeviceName, log);
-
-                        // 鍙戦�佸懡浠ゅ埌杈撻�佺嚎
-                        conveyorLine.SendCommand(taskCommand, childDeviceCode);
-                        // 瀹屾垚杈撻�佺嚎鍙戦��
-                        ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
-                        // 鏇存柊浠诲姟鐘舵�佸埌涓嬩竴涓姸鎬�
-                        content = _taskService.UpdateTaskStatusToNext(task);
-                    }
-                    else
-                    {
-                     
-                        // 瀹屾垚杈撻�佺嚎鍙戦��
-                        ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
-                        // 鏇存柊浠诲姟鐘舵�佸埌涓嬩竴涓姸鎬�
-                        _taskService.UpdateTaskStatusToNext(task);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-            }
-        }
-
-        #endregion 鍑哄簱
-
-        /// <summary>
-        /// 杈撻�佺嚎浜や簰瀹屾垚
-        /// </summary>
-        /// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param>
-        /// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
-        /// <param name="ProtocalDetailValue">绾夸綋褰撳墠bool璇诲彇鍋忕Щ鍦板潃</param>
-        /// <param name="value">鍊�</param>
-        public void ConveyorLineSendFinish(CommonConveyorLine conveyorLine, string childDeviceCode, int ProtocalDetailValue, bool value)
-        {
-            // 浠巆onveyorLine涓殑DeviceProDTOs鍒楄〃涓煡鎵剧涓�涓鍚堟潯浠剁殑DeviceProDTO瀵硅薄
-            // 鏉′欢鏄疍eviceProParamType绛変簬DeviceCommand锛屼笖DeviceChildCode绛変簬childDeviceCode
-            // 鏌ユ壘缁撴灉鎸塂eviceProOffset鍗囧簭鎺掑垪
-            DeviceProDTO? devicePro = conveyorLine.DeviceProDTOs.Where(x => x.DeviceProParamType == nameof(DeviceCommand) && x.DeviceChildCode == childDeviceCode).OrderBy(x => x.DeviceProOffset).FirstOrDefault();
-
-            // 灏哾evicePro鐨凞eviceProAddress鎸�'.'鍒嗗壊鎴愬瓧绗︿覆鏁扮粍x
-            string[] x = devicePro.DeviceProAddress.Split('.');
-
-            // 灏嗘暟缁剎鐨勬渶鍚庝竴涓厓绱犳浛鎹负ProtocalDetailValue鍔�1鍚庣殑瀛楃涓插舰寮�
-            x[x.Length - 1] = (ProtocalDetailValue + 1).ToString();
-
-            // 灏嗕慨鏀瑰悗鐨勬暟缁剎閲嶆柊鎷兼帴鎴愬瓧绗︿覆锛屼綔涓烘柊鐨凞eviceProAddress
-            string DeviceProAddress = string.Join(".", x);
-
-            var writeBool = conveyorLine.Communicator.Read<bool>(DeviceProAddress);
-            if (writeBool != value)
-            {
-                // 浣跨敤conveyorLine鐨凜ommunicator瀵硅薄鐨刉rite鏂规硶锛屽皢value鍐欏叆鏂扮殑DeviceProAddress鍦板潃
-                conveyorLine.Communicator.Write(DeviceProAddress, value);
-            }
-        }
-
-        public async Task LogAndWarn(string deviceName, string log, string color = "red")
-        {
-            ConsoleHelper.WriteWarningLine(log);
-            await _noticeService.Logs(userTokenIds, new { deviceName, log = log, time = DateTime.Now.ToString("G"), color = color });
-            WriteInfo(deviceName, log);
-        }
-
-        private ConveyorLineTaskCommand ReadCommand(CommonConveyorLine conveyorLine,string childDeviceCode)
-        {
-            ConveyorLineTaskCommand command = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(childDeviceCode);
-
-            DeviceProDTO? devicePro = conveyorLine.DeviceProDTOs.Where(x => x.DeviceChildCode == childDeviceCode && x.DeviceProParamName == "ConveyorLineBarcode").FirstOrDefault();
-            byte[] Barcode = conveyorLine.Communicator.Read(devicePro.DeviceProAddress, 10);
-
-            command.Barcode = Encoding.ASCII.GetString(Barcode);
-            return command;
         }
 
     }

--
Gitblit v1.9.3