林豪 左 1 year ago
parent
commit
01e143dec2

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

@@ -147,7 +147,7 @@ namespace WCS.WorkEngineering.Systems
                 var floor = obj.Entity.GetFlag<int>("FloorIn");
                 floor = floor % 2 + 1;
                 obj.Entity.SetFlag("FloorIn", floor);
-                obj.Entity.SetFlag("InQuantity", inQuantity == inMaxQuantity ? 0 : inQuantity + 1);
+                obj.Entity.SetFlag("InQuantity", inQuantity + 1);
 
                 //获取当前机械臂所有的取货站台
                 var pickUpDevices = obj.Entity.Sources.Where(x => x.HasFlag(DeviceFlags.输送机)).Where(x => x.DeviceGroup.Any()).Select(
@@ -282,6 +282,7 @@ namespace WCS.WorkEngineering.Systems
                 var floor = obj.Entity.GetFlag<int>("FloorOut");
                 floor = floor % 2 + 1;
                 obj.Entity.SetFlag("FloorOut", floor);
+                obj.Entity.SetFlag("InQuantity", 0);
 
                 //获取当前堆垛机所有的取货站台
                 var arrOut = PutDevices.First(v => v.Key == obj.Entity.Code).Value;

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

@@ -540,7 +540,7 @@ namespace WCS.WorkEngineering
                 //环形库一北侧机械手取货位
                 new("424",new List<string> {"424","425"}),
                 new("433",new List<string> {"433","434"}),
-                new("442",new List<string> {"442","443"}),
+                new("442",new List<string> {"442","443","440","444"}),
                 //new("624",new List<string> {"624","625"}),
                 //new("633",new List<string> {"633","634"}),
                 //new("642",new List<string> {"642","643"})
@@ -573,7 +573,7 @@ namespace WCS.WorkEngineering
                 { DeviceFlags.拆盘机09, new List<string>(){ "1606" } },
                 { DeviceFlags.拆盘机非09, new List<string>(){ "1602" } },
                 { DeviceFlags.桁架码垛位, new List<string>(){ "1670", "1671", "1672", "1673", "1674", "1675","1664","1662","1665" } },
-                { DeviceFlags.环形库码垛工位, new List<string>(){ "1666"/*,"1661"*/ } },
+                { DeviceFlags.环形库码垛工位, new List<string>(){ "1666", "1661" } },
                 { DeviceFlags.AGV取货站台口, new List<string>(){ "2533", "2534", "2734" } },
                 { DeviceFlags.Robot, new List<string>(){ "Robot1" } },
         };