分拣一新增入库口

YWGC/FJK/WCS.WorkEngineering/Systems/AgvSystems.cs

@@ -168,7 +168,7 @@ namespace WCS.WorkEngineering.Systems
                                             db.Default.UpdateableRowLock(agv).SplitTable(x => x.Take(2)).ExecuteCommand();
                                         }                                                                             
                                         //人工满托入库
-                                        if (agv.TaskType == AGVTaskType.EnterDepot &&(agv.Station == "2533" || agv.Station == "2935" /*|| agv.Station == "2735"*/ || agv.Station == "3135"))
+                                        if (agv.TaskType == AGVTaskType.EnterDepot &&(agv.Station == "2535" || agv.Station == "2935" || agv.Station == "2735" || agv.Station == "3135"))
                                         {
                                             AgvApi.满托入库(agv.Position, agv.ID.ToString(), agv.Station);
                                             var tasknew = db.Default.Queryable<WCS_TaskInfo>().NoLock().Where(x => x.ID == agv.TaskId).First();

YWGC/FJK/WCS.WorkEngineering/Systems/NoInteractionSystems.cs

@@ -120,11 +120,11 @@ namespace WCS.WorkEngineering.Systems
                                         Position = task.WorkBench,
                                         Station = task.WarehouseCode switch
                                         {
-                                            "1N" => "2533",
+                                            "1N" => "2535",
                                             "1S" => "2735",
                                             "2N" => "2935",
                                             "2S" => "3135",
-                                            _ => "2533"
+                                            _ => "2535"
                                         },
                                          AddWho = "WCS",
                                         AddTime = DateTime.Now
@@ -361,11 +361,11 @@ namespace WCS.WorkEngineering.Systems
                                             var agv1 = db.Default.Queryable<WCS_TaskInfo>().NoLock().Where(x => x.Status <= TaskStatus.StackerExecution && x.AddrTo == srmStation[0]).Count();
                                             var agv2 = db.Default.Queryable<WCS_TaskInfo>().NoLock().Where(x => x.Status <= TaskStatus.StackerExecution && x.AddrTo == srmStation[1]).Count();
                                             task.SrmStation = "";
-                                            if (srmStation[0] == "2534"/* || srmStation[0] == "2934"*/)
-                                            {
-                                                task.AddrTo = srmStation[0];
-                                            }
-                                            else
+                                            //if (srmStation[0] == "2534"/* || srmStation[0] == "2934"*/)
+                                            //{
+                                            //    task.AddrTo = srmStation[0];
+                                            //}
+                                            //else
                                             {
                                                 task.AddrTo = agv1 > agv2 ? srmStation[1] : srmStation[0];
                                             }
@@ -458,11 +458,11 @@ namespace WCS.WorkEngineering.Systems
                                             var agv1 = db.Default.Queryable<WCS_TaskInfo>().NoLock().Where(x => x.Status <= TaskStatus.StackerExecution && x.AddrTo == srmStation[0]).Count();
                                             var agv2 = db.Default.Queryable<WCS_TaskInfo>().NoLock().Where(x => x.Status <= TaskStatus.StackerExecution && x.AddrTo == srmStation[1]).Count();
                                             task.SrmStation = "";
-                                            if (srmStation[0] == "2534"/* || srmStation[0] == "2934"*/)
-                                            {
-                                                task.AddrTo = srmStation[0];
-                                            }
-                                            else
+                                            //if (srmStation[0] == "2534"/* || srmStation[0] == "2934"*/)
+                                            //{
+                                            //    task.AddrTo = srmStation[0];
+                                            //}
+                                            //else
                                             {
                                                 task.AddrTo = agv1 > agv2 ? srmStation[1] : srmStation[0];
                                             }
@@ -597,7 +597,7 @@ namespace WCS.WorkEngineering.Systems
             if (n > num)
             {
                 sta = db.Default.Queryable<WCS_AgvTaskInfo>().NoLock().Where(v => v.Status >= AGVTaskStatus.Confirm && v.Status < AGVTaskStatus.Complete1 && v.TaskType == AGVTaskType.EnterDepot
-                && (v.Station != "2533" && v.Station != "2935"  && v.Station != "3135" && !v.Station.StartsWith("9")))//过滤掉人工满托入库和重绕区任务
+                && (v.Station != "2535" && v.Station != "2735" && v.Station != "2935"  && v.Station != "3135" && !v.Station.StartsWith("9")))//过滤掉人工满托入库和重绕区任务
                     .SplitTable(v => v.Take(2)).ToList().GroupBy(x => x.Station).Select(x => new { x.Key, Count = x.Count() }).MinBy(x => x.Count).Key;
             }
 

YWGC/FJK/WCS.WorkEngineering/WorkStart.cs

@@ -487,7 +487,7 @@ namespace WCS.WorkEngineering
 
                 #region 巷道--一楼堆垛机放货口
 
-                new RouteInfo("TY1", new string[] { "2532","2534",/*"2533"*/ }), //人工取货口
+                new RouteInfo("TY1", new string[] { "2532","2534","2533" }), //人工取货口
                 new RouteInfo("TY2", new string[] { "2732","2734","2733" }),
 
                 #endregion 巷道--一楼堆垛机放货口
@@ -546,7 +546,7 @@ namespace WCS.WorkEngineering
                 #region 一楼人工入库口-巷道
 
                 new RouteInfo("2532", new string[] { "TY1" }),
-                new RouteInfo("2533", new string[] { "TY1" }),//分拣库一
+                new RouteInfo("2535", new string[] { "TY1" }),//分拣库一
                 new RouteInfo("2732", new string[] { "TY2" }),
                 new RouteInfo("2735", new string[] { "TY2" }),
 
@@ -1907,7 +1907,7 @@ namespace WCS.WorkEngineering
                      { DeviceFlags.拆盘机, new List<string>(){ "1602", "1612" } },
                      { DeviceFlags.桁架码垛位, new List<string>(){ "1670","1671","1672","1673","1674","1675","1664","1662","1663","1665","1677","1678","1679","1680","1685","1686","1687","1688","1689","1690","1606","1616"} },
                      { DeviceFlags.环形库码垛工位, new List<string>(){ "1666", "1661", "1676", "1681" } },
-                     { DeviceFlags.AGV取货站台口, new List<string>(){ /*"2533",*/ "2534", "2734", "2733"} },
+                     { DeviceFlags.AGV取货站台口, new List<string>(){ "2533", "2534", "2734", "2733"} },
                      { DeviceFlags.Robot, new List<string>(){ "Robot1", "Robot2" } },
                      {DeviceFlags.二次码垛RGV取货口, new List<string>(){ "1606", "1616"}},
                      {DeviceFlags.重绕区叫料工位, new List<string>(){ "9201", "9202","9203", "9204","9205", "9206","9207", "9208","9209",