fix

业务工程/分拣库/WCS.WorkEngineering/Extensions/DeviceExtension.cs

@@ -280,25 +280,59 @@ namespace WCS.WorkEngineering.Extensions
         {
             return add switch
             {
+                #region 库一
+
+                //北
+                "SRM1" => "1N",
                 "2532" => "1N",
                 "2527" => "1N",
                 "2528" => "1N",
-                "2732" => "1S",
-                "2727" => "1S",
-                "2728" => "1S",
+                "418" => "1N",
                 "1606" => "1N",
                 "1666" => "1NR",
                 "1661" => "1NR",
-                "SRM1" => "1N",
+                "18" => "1N",
+                //南
                 "SRM2" => "1S",
-                "418" => "1N",
-                "18" => "1S",
+                "2732" => "1S",
+                "2727" => "1S",
+                "2728" => "1S",
+                "618" => "1S",
                 "1676" => "1SR",
                 "1681" => "1SR",
-                "618" => "2N",
-                "1691" => "3NR",
-                "1696" => "3NR",
-                "818" => "3N",
+
+
+                #endregion 库一
+
+                #region 库二
+                //北
+                "SRM3" => "2N",
+                "818" => "2N",
+                "1691" => "2NR",
+                "1696" => "2NR",
+                //南
+                "SRM4" => "2S",
+                "1018" => "2S",
+                "1711" => "2SR",
+                "1706" => "2SR",
+
+                #endregion 库二
+
+
+                #region 库二
+                //北
+                "SRM5" => "3N",
+                "1218" => "3N",
+                "1721" => "3NR",
+                "1726" => "3NR",
+                //南
+                "SRM6" => "3S",
+                "1418" => "3S",
+                "1736" => "3SR",
+                "1741" => "3SR",
+
+                #endregion 库二
+
                 _ => "",
             };
         }

业务工程/分拣库/WCS.WorkEngineering/Systems/NoInteractionSystems.cs

@@ -65,6 +65,11 @@ namespace WCS.WorkEngineering.Systems
                                     task.Device = task.WarehouseCode switch
                                     {
                                         "1N" => "SRM1",
+                                        "1S" => "SRM2",
+                                        "2N" => "SRM3",
+                                        "2S" => "SRM4",
+                                        "3N" => "SRM5",
+                                        "3S" => "SRM6",
                                         _ => task.Device
                                     };
 
@@ -72,6 +77,10 @@ namespace WCS.WorkEngineering.Systems
                                     {
                                         "1666" or "1661" => "SRM1",
                                         "1681" or "1676" => "SRM2",
+                                        "1696" or "1691" => "SRM3",
+                                        "1711" or "1706" => "SRM4",
+                                        "1726" or "1721" => "SRM5",
+                                        "1741" or "1736" => "SRM6",
                                         _ => task.Device
                                     };
 

业务工程/分拣库/WCS.WorkEngineering/Systems/RGVSystems.cs

@@ -185,6 +185,10 @@ namespace WCS.WorkEngineering.Systems
                 {
                     "RGV1" => 1668,
                     "RGV2" => 1683,
+                    "RGV3" => 1698,
+                    "RGV4" => 1713,
+                    "RGV5" => 1728,
+                    "RGV6" => 1743,
                     _ => throw new ArgumentOutOfRangeException()
                 };
                 obj.Data.VoucherNo++;
@@ -257,7 +261,7 @@ namespace WCS.WorkEngineering.Systems
 
         public override bool Select(Device dev)
         {
-            return dev.Code is "RGV1" or "RGV2";
+            return dev.Code is "RGV1" or "RGV2" or "RGV3" or "RGV4" or "RGV5" or "RGV6";
             //return dev.HasFlag(Extensions.DeviceFlags.RGV);
         }
     }

业务工程/分拣库/WCS.WorkEngineering/Systems/环形库/机械臂cs.cs

@@ -385,7 +385,7 @@ namespace WCS.WorkEngineering.Systems
                         obj.Data.SLayer1 = taskInfo.Layer.ToShort();
                         obj.Data.SDepth1 = taskInfo.Depth.ToShort();
                         obj.Data.ELine1 = nextAdd.ToShort();
-                        obj.Data.ECol1 = taskInfoList.Min(x => x.ProdLine);
+                        obj.Data.ECol1 = taskInfo.WarehouseCode.Contains("S") ? taskInfoList.Max(x => x.ProdLine) : taskInfoList.Min(x => x.ProdLine);
                         obj.Data.ELayer1 = 0;
                         obj.Data.EDepth1 = 0;
                         //二工位取深度较少的值
@@ -396,7 +396,7 @@ namespace WCS.WorkEngineering.Systems
                         obj.Data.SLayer2 = taskInfo.Layer.ToShort();
                         obj.Data.SDepth2 = taskInfo.Depth.ToShort();
                         obj.Data.ELine2 = nextAdd.ToShort();
-                        obj.Data.ECol2 = taskInfoList.Max(x => x.ProdLine);
+                        obj.Data.ECol2 = taskInfo.WarehouseCode.Contains("S") ? taskInfoList.Min(x => x.ProdLine) : taskInfoList.Max(x => x.ProdLine);
                         obj.Data.ELayer2 = 0;
                         obj.Data.EDepth2 = 0;
                         obj.Data.TaskSum = taskInfoList.Count.ToShort();

业务工程/分拣库/WCS.WorkEngineering/WorkStart.cs

@@ -430,8 +430,6 @@ namespace WCS.WorkEngineering
 
             List<RouteInfo> routeInfos = new List<RouteInfo>();
 
-            #region 分拣库一
-
             routeInfos.AddRange(new List<RouteInfo>() {
 
                 #region 出库
@@ -936,8 +934,6 @@ namespace WCS.WorkEngineering
                 #endregion 入库
             });
 
-            #endregion 分拣库一
-
             Parallel.ForEach(routeInfos, routeInfo =>
             {
                 var device = Device.All.FirstOrDefault(x => x.Code == routeInfo.DeviceCode);