Browse Source

简化 `NoInteractionSystems.cs` 中的逻辑处理

在 `NoInteractionSystems.cs` 文件中,删除了与 `task.AddrNext` 和 `des2` 相关的代码行,并注释掉了一些条件判断和变量赋值的逻辑。这些更改旨在简化代码,移除对 `task.AddrNext` 为 "1604" 的处理逻辑,同时保留 `task.WorkBench` 的赋值,以确保任务的工作台信息能够正确更新。
林豪 左 2 months ago
parent
commit
4bc040e0ad
1 changed files with 17 additions and 17 deletions
  1. 17 17
      YWGC/FJK/WCS.WorkEngineering/Systems/NoInteractionSystems.cs

+ 17 - 17
YWGC/FJK/WCS.WorkEngineering/Systems/NoInteractionSystems.cs

@@ -236,25 +236,25 @@ namespace WCS.WorkEngineering.Systems
                                     //计算下一个地址
                                     var path1 = DevicePath.GetPath(task.AddrFrom, task.Device);
                                     task.AddrNext = path1.Points[1].Code;
-                                    var des1 = task.AddrNext;
-                                    var des2 = "1";
-                                    //分拣一
-                                    if (task.AddrNext == "1604")
-                                    {
-                                        des2 = "1606";
-                                    }
-                                   
-                                    //else if (task.AddrNext == "1614")
+                                    //var des1 = task.AddrNext;
+                                    //var des2 = "1";
+                                    ////分拣一
+                                    //if (task.AddrNext == "1604")
                                     //{
-                                    //    des2 = "1616";
+                                    //    des2 = "1606";
                                     //}
-                                    var num1 = db.Default.Queryable<WCS_TaskInfo>().RowLock().Where(t => t.WorkBench == des1 && t.Status < TaskStatus.Finish && t.Type == TaskType.EnterDepot).Count();
-                                    var num2 = db.Default.Queryable<WCS_TaskInfo>().RowLock().Where(t => t.WorkBench == des2 && t.Status < TaskStatus.Finish && t.Type == TaskType.EnterDepot).Count();
-                                    if (task.AddrNext == "1604")
-                                    {
-                                        task.AddrNext = num1 <= num2 ? des2 : des1;
-                                    }                                    
-                                    task.WorkBench = task.AddrNext;
+                                   
+                                    ////else if (task.AddrNext == "1614")
+                                    ////{
+                                    ////    des2 = "1616";
+                                    ////}
+                                    //var num1 = db.Default.Queryable<WCS_TaskInfo>().RowLock().Where(t => t.WorkBench == des1 && t.Status < TaskStatus.Finish && t.Type == TaskType.EnterDepot).Count();
+                                    //var num2 = db.Default.Queryable<WCS_TaskInfo>().RowLock().Where(t => t.WorkBench == des2 && t.Status < TaskStatus.Finish && t.Type == TaskType.EnterDepot).Count();
+                                    //if (task.AddrNext == "1604")
+                                    //{
+                                    //    task.AddrNext = num1 <= num2 ? des2 : des1;
+                                    //}                                    
+                                    //task.WorkBench = task.AddrNext;
                                     task.SrmStation = task.BarCode.Contains("TPA") || task.BarCode.Contains("TPB") ? task.AddrFrom : path1.Points[2].Code;
 
                                     db.Default.UpdateableRowLock(task).UpdateColumns(x => new { x.Status, x.Device, x.AddrNext, x.SrmStation, x.WorkBench }).ExecuteCommand();