Merge branch '分拣库' of http://120.77.11.229:3000/zuolinhao/WcsFramework into 分拣库

YWGC/FJK/WCS.WorkEngineering/Systems/环形库/机械臂cs.cs

@@ -454,10 +454,10 @@ namespace WCS.WorkEngineering.Systems
                             obj.Data.SCol2 = 0;
                             obj.Data.SLayer2 = 0;
                             obj.Data.SDepth2 = 0;
-                            obj.Data.ELine1 = task.Line.ToShort();
-                            obj.Data.ECol1 = task.Col.ToShort();
-                            obj.Data.ELayer1 = task.Layer.ToShort();
-                            obj.Data.EDepth1 = task.Depth.ToShort();
+                            obj.Data.ELine2 = task.Line.ToShort();
+                            obj.Data.ECol2 = task.Col.ToShort();
+                            obj.Data.ELayer2 = task.Layer.ToShort();
+                            obj.Data.EDepth2 = task.Depth.ToShort();
                             obj.Data.TaskSum = taskList.Count.ToShort();
                             obj.Data.GoodsType = task.GoodsType switch
                             {

YWGC/FJK/WCS.WorkEngineering/Systems/环形库/环形库分配货位.cs

@@ -201,6 +201,12 @@ namespace WCS.WorkEngineering.Systems.环形库
                 "1044" => "Robot4",
                 "1244" => "Robot5",
                 "1444" => "Robot6",
+                "426" => "Robot1",
+                "626" => "Robot2",
+                "826" => "Robot3",
+                "1026" => "Robot4",
+                "1226" => "Robot5",
+                "1426" => "Robot6",
                 _ => "99999"
             };