fix

业务工程/时效库/WCS.WorkEngineering/Systems/装箱码垛/入缓存扫码.cs

@@ -111,12 +111,12 @@ namespace WCS.WorkEngineering.Systems.装箱码垛
 
                         var cacheList = new List<string>();
 
-                        cacheList = obj.Entity.Code switch
+                        cacheList = task.Robot switch
                         {
                             "Robot1" => new List<string> { "5100", "5086", "5070", "5056" },
                             "Robot2" => new List<string> { "5310", "5295", "5280", "5265" },
-                            "Robot3" => new List<string> { "5392", "5377", "5362", "5347" },
-                            "Robot10" => new List<string> { "5392", "5377", "5362", "5347" }, //表示人工码垛位
+                            "Robot3" => new List<string> { /*"5392", */"5377", "5362"/*, "5347"*/ },
+                            "Robot10" => new List<string> { /*"5392", */"5377", "5362"/*, "5347"*/ }, //表示人工码垛位
                             _ => new List<string>()  // 默认情况，可根据需要处理
                         };
 

业务工程/时效库/WCS.WorkEngineering/WorkStart.cs

@@ -183,7 +183,7 @@ namespace WCS.WorkEngineering
                 dev.SetFlag("装箱码垛");
             });
 
-            AddDevices(5331, 5434, "{0:d}", (dev, i) =>
+            AddDevices(5331, 5450, "{0:d}", (dev, i) =>
             {
                 var index = i + 330;
                 dev.AddProtocol<IStation520>(index * 14, 520, "10.30.39.220");
@@ -239,7 +239,7 @@ namespace WCS.WorkEngineering
             });
 
             Device.Find("5418").AddFlag("码垛工位", "8307").AddFlag("位置", "抓取");
-            "5448，5449，5450".Split(',').For((dev, i) =>
+            "5448,5449,5450".Split(',').For((dev, i) =>
             {
                 dev.AddFlag("Parent", "5418");
             });
@@ -359,15 +359,15 @@ namespace WCS.WorkEngineering
 
             #region 机械手
 
-            AddDevices(3, 3, "Robot{0:d}", (dev, i) =>
+            #region 新增第三个机械臂
+            AddDevices(1, 2, "Robot{0:d}", (dev, i) =>
             {
                 dev.AddProtocol<IRobot520>(i * 24, 520, "10.30.43.117");
                 dev.AddProtocol<IRobot521>(i * 34, 521, "10.30.43.117");
                 dev.AddProtocol<IRobot522>(i * 4, 522, "10.30.43.117");
             });
 
-            #region 新增第三个机械臂
-            AddDevices(1, 2, "Robot{0:d}", (dev, i) =>
+            AddDevices(3, 3, "Robot{0:d}", (dev, i) =>
             {
                 dev.AddProtocol<IRobot520>(i * 24, 520, "10.30.43.118");
                 dev.AddProtocol<IRobot521>(i * 34, 521, "10.30.43.118");