From fcfafddcbe3748beda400e1ecd21d329b2a25c81 Mon Sep 17 00:00:00 2001
From: 肖洋 <cathay_xy@163.com>
Date: 星期五, 13 十二月 2024 09:52:26 +0800
Subject: [PATCH] 添加定时任务处理高温库存出库逻辑

---
 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/CommonConveyorLine_GWJob.cs |   29 +++++------------------------
 1 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/CommonConveyorLine_GWJob.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/CommonConveyorLine_GWJob.cs
index 616a63c..17da2c9 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/CommonConveyorLine_GWJob.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/CommonConveyorLine_GWJob.cs
@@ -141,27 +141,6 @@
                                         method.Invoke(this, new object[] { conveyorLine, command, childDeviceCode, count, platform });
                                     }
                                 }
-                                else
-                                {
-                                    if (!string.IsNullOrEmpty(platform.Location))
-                                    {
-                                        var strings = platform.Location.Split(',').ToList();
-                                        foreach (var ite in strings)
-                                        {
-                                            int index = strings.FindIndex(p => p == ite);
-                                            ConveyorLineTaskCommand command1 = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(ite);
-                                            if (command1.InteractiveSignal != 2)
-                                            {
-                                                MethodInfo? method = GetType().GetMethod(platform.ExecutionMethod);
-                                                if (method != null)
-                                                {
-                                                    int count = strings.Count - index;
-                                                    method.Invoke(this, new object[] { conveyorLine, command, childDeviceCode, count, platform });
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
                             }
                         }
 
@@ -170,13 +149,15 @@
                         var tokenInfos = _cacheService.Get<List<UserInfo>>("Cache_UserToken");
                         if (tokenInfos == null || !tokenInfos.Any())
                         {
-                            throw new Exception(conveyorLine.DeviceName + "缂撳瓨涓湭鎵惧埌Token缂撳瓨");
+                            //throw new Exception(conveyorLine.DeviceName + "缂撳瓨涓湭鎵惧埌Token缂撳瓨");
+                            continue;
                         }
                         var userTokenIds = tokenInfos?.Select(x => x.Token_ID).ToList();
                         var userIds = tokenInfos?.Select(x => x.UserId).ToList();
 
                         object obj = new
                         {
+                            childDeviceCode,
                             commandAfter = command,
                         };
                         _noticeService.StackerData(userIds?.FirstOrDefault(), userTokenIds, new { conveyorLine.DeviceName, data = obj });
@@ -215,7 +196,7 @@
                 var task = _taskService.QueryBarCodeConveyorLineTask(command.ConveyorLineBarcode, childDeviceCode);
                 //HandleTaskOut(conveyorLine, command, childDeviceCode, task);
                 // && command.ConveyorLineBarcode != "NoRead" && !command.ConveyorLineBarcode.IsNotEmptyOrNull()
-
+                ConsoleHelper.WriteSuccessLine($"銆恵conveyorLine.DeviceName}銆戞墭鐩樺彿锛氥�恵command.ConveyorLineBarcode}銆戣澶囩紪鐮侊細銆恵childDeviceCode}銆�");
                 if (task == null)
                 {
                     HandleNewTask(conveyorLine, command, childDeviceCode);
@@ -347,7 +328,7 @@
                 WriteInfo("鍏ョ珯鏍¢獙", "");
                 WriteInfo("鍏ョ珯鏍¢獙", $"銆恵childDeviceCode}銆戝叆绔欐牎楠岃繑鍥炲弬鏁般�恵result}銆�");
                 ResultTrayCellsStatus result1 = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(result);
-                if (result1.Success)
+                if (result1.Success || task.Remark != "NG")
                 {
                     Dt_Task? newTask = _taskService.UpdatePosition(task.TaskNum, task.CurrentAddress);
                     if (newTask != null)

--
Gitblit v1.9.3