1

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

@@ -335,7 +335,7 @@ namespace WCS.WorkEngineering.Systems
                     //区分任务是拆盘机到码垛工位，还是码垛工位到拆盘机
                     if (dev.Entity.HasFlag(DeviceFlags.拆盘机))
                     {
-                        World.Log($"任务处理:开始-下发取货任务-任务号[{obj.Data.TaskNumber}]任务类型[{obj.Data.CmdType}]起始地址[{obj.Data.StartPosition}]目标地址[{obj.Data.DestPosition}]凭证号[{obj.Data.VoucherNo}]");
+                        World.Log($"任务处理:开始-下发取货任务-任务号[{obj.Data.TaskNumber}]任务类型[{obj.Data.CmdType}]RGV运行状态[{obj.Data2.WorkMode.GetDescription()}]起始地址[{obj.Data.StartPosition}]目标地址[{obj.Data.DestPosition}]凭证号[{obj.Data.VoucherNo}]");
                         obj.Data.TaskNumber = dev.Data.TaskNumber;
                         obj.Data.CmdType = RGVCmdType.PickGoods;
                         obj.Data.StartPosition = dev.Entity.Code.ToShort();
@@ -355,7 +355,7 @@ namespace WCS.WorkEngineering.Systems
                         return;
                     }
 
-                    World.Log($"任务处理:开始-下发满托入库任务-任务号[{obj.Data.TaskNumber}]任务类型[{obj.Data.CmdType}]起始地址[{obj.Data.StartPosition}]目标地址[{obj.Data.DestPosition}]凭证号[{obj.Data.VoucherNo}]");
+                    World.Log($"任务处理:开始-下发满托入库任务-任务号[{obj.Data.TaskNumber}]任务类型[{obj.Data.CmdType}]RGV运行状态[{obj.Data2.WorkMode.GetDescription()}]起始地址[{obj.Data.StartPosition}]目标地址[{obj.Data.DestPosition}]凭证号[{obj.Data.VoucherNo}]");
                     //非拆盘机起始任务
                     //站台中的任务号
                     WCS_TaskInfo task = null;

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

@@ -104,7 +104,7 @@ namespace WCS.WorkEngineering.Systems
                                 {
                                     case OutTypeEnum.自动出库任务 or OutTypeEnum.全自动手动出库任务:
 
-                                        if (task.SrmStation is "1601" or "1605" or "1611" or "1615" or "1631" or "2532" or "2732" or "2932" or "3132" or "3332" or "3532" or "1621" or "1631")
+                                        if (task.SrmStation is "1601" or "1605" or "1611" or "1615" or "1631" or "2532" or "2732" or "2932" or "3132" or "3332" or "3532" or "1621" or "1631" or "1641" or "1651")
                                         {
                                             task.Status = Entity.TaskStatus.Finish;
                                             var dev = new Station(Device.All.FirstOrDefault(v => v.Code == task.SrmStation) ?? throw new KnownException($"未找到{task.SrmStation}信息", LogLevelEnum.High), this.World);

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

@@ -376,7 +376,7 @@ namespace WCS.WorkEngineering
                 new("10.30.37.234",new  List<int>(){ 1696, 1691}), //库二北
                 new("10.30.37.236",new  List<int>(){ 1711, 1706}), //库二南
                 new("10.30.37.238",new  List<int>(){ 1726, 1721}), //库三北
-                new("10.30.37.240",new  List<int>(){ 1736, 1741}), //库三南
+                new("10.30.37.240",new  List<int>(){ 1741, 1736}), //库三南
             };
 
             foreach (var item in tuples21)
@@ -1090,7 +1090,7 @@ namespace WCS.WorkEngineering
                 { DeviceFlags.桁架09缓存放行点, new List<string>(){ "466", "480", "494", "508", "522", "536", "666", "680", "694", "708", "722", "736"
                     , "866", "880", "894", "908", "922", "936", "1066", "1080", "1094", "1108", "1122", "1136",
                      "1266", "1280", "1294", "1308", "1322", "1336",  "1466", "1480", "1494", "1408", "1422", "1436" } },
-                { DeviceFlags.桁架09异常缓存放行点, new List<string>(){ "591", "791", "991" , "1191"/* , "1391" , "1591" } },
+                { DeviceFlags.桁架09异常缓存放行点, new List<string>(){ "591", "791", "991" , "1191" , "1391" , "1591" } },
                 { DeviceFlags.桁架18缓存放行点, new List<string>(){ "550", "564", "578", "750", "764", "778", "950", "964", "978" , "1150", "1164", "1178" /*, "1350", "1364", "1378" , "1450", "1464", "1478"*/ } },
                 { DeviceFlags.桁架取货点, new List<string>(){ "461", "475", "489", "503", "517", "531", "545", "559", "573", "586", "661", "675", "689", "703", "717", "731", "745", "759", "773", "786",
                      "861", "875", "889", "903", "917", "931", "945", "959", "973", "986", "1061", "1075", "1089", "1103", "1117", "1131", "1145", "1159", "1173", "1186",
@@ -1099,7 +1099,7 @@ namespace WCS.WorkEngineering
                 { DeviceFlags.拆盘机, new List<string>(){ "1602", "1612", "1622", "1632", "1642", "1652" } },
                 { DeviceFlags.桁架码垛位, new List<string>(){ /*"1670", "1671",*/ "1672", "1673", "1674", "1675", "1664","1662","1663","1665","1677","1678","1679","1680",/*"1685","1686",*/"1687","1688","1689",
                     "1690", "1692", "1693", "1694", "1695", "1700", "1701", "1702", "1703", "1704", "1705", "1707", "1708", "1709", "1710", "1715", "1716", "1717", "1718", "1719", "1720", "1722", "1723", "1724", "1725", "1730", "1731", "1732", "1733", "1734", "1735", "1737", "1738", "1739", "1740", "1745", "1746", "1747", "1748", "1749", "1750" } },
-                { DeviceFlags.环形库码垛工位, new List<string>(){ "1666", "1661", "1676", "1681", "1691", "1696", "1706", "1711"/*, "1721", "1726", "1736", "1741"*/ } },
+                { DeviceFlags.环形库码垛工位, new List<string>(){ "1666", "1661", "1676", "1681", "1691", "1696", "1706", "1711", "1721", "1726", "1736", "1741" } },
                 { DeviceFlags.AGV取货站台口, new List<string>(){ "2533", "2534", "2734", "2733","2934","2933","3133", "3134","3333","3334","3533","3534"} },
                 { DeviceFlags.Robot, new List<string>(){ "Robot1", "Robot2", "Robot3", "Robot4" , "Robot5", "Robot6" } },
                 {DeviceFlags.二次码垛RGV取货口, new List<string>(){ "1606", "1616", "1626","1636","1646","1656"}}