diff --git a/WcsMain/ApiServe/Service/WcsService/ElTagService.cs b/WcsMain/ApiServe/Service/WcsService/ElTagService.cs index 4c1dc78..a7a415a 100644 --- a/WcsMain/ApiServe/Service/WcsService/ElTagService.cs +++ b/WcsMain/ApiServe/Service/WcsService/ElTagService.cs @@ -5,7 +5,7 @@ using WcsMain.ApiServe.Factory; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; using WcsMain.DataService; -using WcsMain.Enum.TaskEnum; +using WcsMain.Enum.ElTag; using WcsMain.WcsAttribute.AutoFacAttribute; namespace WcsMain.ApiServe.Service.WcsService; diff --git a/WcsMain/ApiServe/Service/WcsService/WmsTaskService.cs b/WcsMain/ApiServe/Service/WcsService/WmsTaskService.cs index 7536880..550e211 100644 --- a/WcsMain/ApiServe/Service/WcsService/WmsTaskService.cs +++ b/WcsMain/ApiServe/Service/WcsService/WmsTaskService.cs @@ -7,7 +7,7 @@ using WcsMain.Business.CommonAction; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; using WcsMain.DataService; -using WcsMain.Enum.TaskEnum; +using WcsMain.Enum.Stacker; using WcsMain.StaticData; using WcsMain.WcsAttribute.AutoFacAttribute; diff --git a/WcsMain/ApiServe/Service/WmsService/ConveyService.cs b/WcsMain/ApiServe/Service/WmsService/ConveyService.cs index 4594d72..aa69ddc 100644 --- a/WcsMain/ApiServe/Service/WmsService/ConveyService.cs +++ b/WcsMain/ApiServe/Service/WmsService/ConveyService.cs @@ -4,7 +4,7 @@ using WcsMain.ApiServe.Factory; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; using WcsMain.DataService; -using WcsMain.Enum.TaskEnum; +using WcsMain.Enum.Convey; using WcsMain.WcsAttribute.AutoFacAttribute; namespace WcsMain.ApiServe.Service.WmsService; diff --git a/WcsMain/ApiServe/Service/WmsService/ElTagService.cs b/WcsMain/ApiServe/Service/WmsService/ElTagService.cs index a28fc96..91cebd5 100644 --- a/WcsMain/ApiServe/Service/WmsService/ElTagService.cs +++ b/WcsMain/ApiServe/Service/WmsService/ElTagService.cs @@ -6,7 +6,7 @@ using WcsMain.Common; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; using WcsMain.DataService; -using WcsMain.Enum.TaskEnum; +using WcsMain.Enum.ElTag; using WcsMain.WcsAttribute.AutoFacAttribute; namespace WcsMain.ApiServe.Service.WmsService; diff --git a/WcsMain/ApiServe/Service/WmsService/WmsTaskService.cs b/WcsMain/ApiServe/Service/WmsService/WmsTaskService.cs index 8020732..8954fa8 100644 --- a/WcsMain/ApiServe/Service/WmsService/WmsTaskService.cs +++ b/WcsMain/ApiServe/Service/WmsService/WmsTaskService.cs @@ -7,7 +7,7 @@ using WcsMain.Business.CommonAction; using WcsMain.Common; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; -using WcsMain.Enum.TaskEnum; +using WcsMain.Enum.Stacker; using WcsMain.ExtendMethod; using WcsMain.StaticData; using WcsMain.WcsAttribute.AutoFacAttribute; diff --git a/WcsMain/Business/CirculationTask/ElTag/LightElTag.cs b/WcsMain/Business/CirculationTask/ElTag/LightElTag.cs index aaba4a7..0377360 100644 --- a/WcsMain/Business/CirculationTask/ElTag/LightElTag.cs +++ b/WcsMain/Business/CirculationTask/ElTag/LightElTag.cs @@ -6,7 +6,7 @@ using WcsMain.DataBase.TableEntity; using WcsMain.ElTag.Atop; using WcsMain.ElTag.Atop.AtopEnum; using WcsMain.ElTag.Atop.Entity; -using WcsMain.Enum.TaskEnum; +using WcsMain.Enum.ElTag; using WcsMain.EquipOperation.ElTag; namespace WcsMain.Business.CirculationTask.ElTag; diff --git a/WcsMain/Business/CirculationTask/ElTag/OffElTag.cs b/WcsMain/Business/CirculationTask/ElTag/OffElTag.cs index 33512c1..b31c8c7 100644 --- a/WcsMain/Business/CirculationTask/ElTag/OffElTag.cs +++ b/WcsMain/Business/CirculationTask/ElTag/OffElTag.cs @@ -3,7 +3,7 @@ using WcsMain.Common; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; using WcsMain.ElTag.Atop.Entity; -using WcsMain.Enum.TaskEnum; +using WcsMain.Enum.ElTag; using WcsMain.EquipOperation.ElTag; namespace WcsMain.Business.CirculationTask.ElTag; diff --git a/WcsMain/Business/CirculationTask/Stacker/ExeTaskDoubleFork.cs b/WcsMain/Business/CirculationTask/Stacker/ExeTaskDoubleFork.cs index 520a756..5d4fd79 100644 --- a/WcsMain/Business/CirculationTask/Stacker/ExeTaskDoubleFork.cs +++ b/WcsMain/Business/CirculationTask/Stacker/ExeTaskDoubleFork.cs @@ -6,7 +6,6 @@ using WcsMain.DataBase.MixDao; using WcsMain.DataBase.TableEntity; using WcsMain.DataService; using WcsMain.Enum.Stacker; -using WcsMain.Enum.TaskEnum; using WcsMain.EquipOperation.Convey; using WcsMain.EquipOperation.Entity.Stacker; using WcsMain.EquipOperation.Stacker; diff --git a/WcsMain/Business/CirculationTask/TaskData/ResolveWmsTask.cs b/WcsMain/Business/CirculationTask/TaskData/ResolveWmsTask.cs index 1205f4b..b127627 100644 --- a/WcsMain/Business/CirculationTask/TaskData/ResolveWmsTask.cs +++ b/WcsMain/Business/CirculationTask/TaskData/ResolveWmsTask.cs @@ -3,12 +3,12 @@ using WcsMain.ExtendMethod; using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; using WcsMain.DataService; -using WcsMain.Enum.TaskEnum; using WcsMain.Business.CommonAction; using WcsMain.Common; using WcsMain.StaticData; using System.Linq.Expressions; using WcsMain.DataBase.MixDao; +using WcsMain.Enum.Stacker; namespace WcsMain.Business.CirculationTask.TaskData; diff --git a/WcsMain/DataBase/Dao/AppElTagTaskDao.cs b/WcsMain/DataBase/Dao/AppElTagTaskDao.cs index 737c615..eb7f8cf 100644 --- a/WcsMain/DataBase/Dao/AppElTagTaskDao.cs +++ b/WcsMain/DataBase/Dao/AppElTagTaskDao.cs @@ -1,7 +1,7 @@ using WcsMain.ApiServe.Controllers.Dto.WcsDto.ElTag; using WcsMain.Common; using WcsMain.DataBase.TableEntity; -using WcsMain.Enum.TaskEnum; +using WcsMain.Enum.ElTag; using WcsMain.WcsAttribute.AutoFacAttribute; namespace WcsMain.DataBase.Dao; diff --git a/WcsMain/DataBase/Dao/AppWcsTaskDao.cs b/WcsMain/DataBase/Dao/AppWcsTaskDao.cs index 9495f13..4a12edb 100644 --- a/WcsMain/DataBase/Dao/AppWcsTaskDao.cs +++ b/WcsMain/DataBase/Dao/AppWcsTaskDao.cs @@ -2,6 +2,7 @@ using WcsMain.ApiServe.Controllers.Dto.WcsDto.WcsTask; using WcsMain.Common; using WcsMain.DataBase.TableEntity; +using WcsMain.Enum.Stacker; using WcsMain.Enum.TaskEnum; using WcsMain.WcsAttribute.AutoFacAttribute; diff --git a/WcsMain/DataBase/Dao/AppWmsTaskDao.cs b/WcsMain/DataBase/Dao/AppWmsTaskDao.cs index d5d6644..7fc174a 100644 --- a/WcsMain/DataBase/Dao/AppWmsTaskDao.cs +++ b/WcsMain/DataBase/Dao/AppWmsTaskDao.cs @@ -1,7 +1,7 @@ using WcsMain.ApiServe.Controllers.Dto.WcsDto.WmsTask; using WcsMain.Common; using WcsMain.DataBase.TableEntity; -using WcsMain.Enum.TaskEnum; +using WcsMain.Enum.Stacker; using WcsMain.WcsAttribute.AutoFacAttribute; namespace WcsMain.DataBase.Dao; diff --git a/WcsMain/DataBase/MixDao/TaskDao.cs b/WcsMain/DataBase/MixDao/TaskDao.cs index 0812862..8981d5e 100644 --- a/WcsMain/DataBase/MixDao/TaskDao.cs +++ b/WcsMain/DataBase/MixDao/TaskDao.cs @@ -1,6 +1,6 @@ using WcsMain.Common; using WcsMain.DataBase.TableEntity; -using WcsMain.Enum.TaskEnum; +using WcsMain.Enum.Stacker; using WcsMain.ExtendMethod; using WcsMain.WcsAttribute.AutoFacAttribute; diff --git a/WcsMain/DataService/EnumData.cs b/WcsMain/DataService/EnumData.cs index e25f580..0ef81ea 100644 --- a/WcsMain/DataService/EnumData.cs +++ b/WcsMain/DataService/EnumData.cs @@ -1,4 +1,4 @@ -using WcsMain.Enum.TaskEnum; +using WcsMain.Enum.Stacker; namespace WcsMain.DataService; diff --git a/WcsMain/ElTag/Atop/BaseOprDataHandler.cs b/WcsMain/ElTag/Atop/BaseOprDataHandler.cs index 94d07cc..194da9d 100644 --- a/WcsMain/ElTag/Atop/BaseOprDataHandler.cs +++ b/WcsMain/ElTag/Atop/BaseOprDataHandler.cs @@ -3,7 +3,7 @@ using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; using WcsMain.ElTag.Atop.AtopEnum; using WcsMain.ElTag.Atop.Entity; -using WcsMain.Enum.TaskEnum; +using WcsMain.Enum.ElTag; using WcsMain.EquipOperation.ElTag; using WcsMain.ExtendMethod; using WcsMain.WcsAttribute.AutoFacAttribute; diff --git a/WcsMain/ElTag/Atop/ConnectOprServe.cs b/WcsMain/ElTag/Atop/ConnectOprServe.cs index d6847a8..6c11aee 100644 --- a/WcsMain/ElTag/Atop/ConnectOprServe.cs +++ b/WcsMain/ElTag/Atop/ConnectOprServe.cs @@ -5,8 +5,8 @@ using WcsMain.DataBase.Dao; using WcsMain.DataBase.TableEntity; using WcsMain.ElTag.Atop.AtopEnum; using WcsMain.ElTag.Atop.Entity; +using WcsMain.Enum.ElTag; using WcsMain.Enum.General; -using WcsMain.Enum.TaskEnum; using WcsMain.Enum.Tcp; using WcsMain.EquipOperation.ElTag; using WcsMain.Tcp.Entity; diff --git a/WcsMain/Enum/TaskEnum/ConveyTaskStatusEnum.cs b/WcsMain/Enum/Convey/ConveyTaskStatusEnum.cs similarity index 83% rename from WcsMain/Enum/TaskEnum/ConveyTaskStatusEnum.cs rename to WcsMain/Enum/Convey/ConveyTaskStatusEnum.cs index 927c40c..92663ec 100644 --- a/WcsMain/Enum/TaskEnum/ConveyTaskStatusEnum.cs +++ b/WcsMain/Enum/Convey/ConveyTaskStatusEnum.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Enum.TaskEnum; +namespace WcsMain.Enum.Convey; /// /// 输送机任务状态枚举 diff --git a/WcsMain/Enum/TaskEnum/ElTagTaskStatusEnum.cs b/WcsMain/Enum/ElTag/ElTagTaskStatusEnum.cs similarity index 87% rename from WcsMain/Enum/TaskEnum/ElTagTaskStatusEnum.cs rename to WcsMain/Enum/ElTag/ElTagTaskStatusEnum.cs index d2971f5..5948956 100644 --- a/WcsMain/Enum/TaskEnum/ElTagTaskStatusEnum.cs +++ b/WcsMain/Enum/ElTag/ElTagTaskStatusEnum.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Enum.TaskEnum; +namespace WcsMain.Enum.ElTag; /// /// 电子标签任务状态枚举 diff --git a/WcsMain/Enum/TaskEnum/ElTagTaskTypeEnum.cs b/WcsMain/Enum/ElTag/ElTagTaskTypeEnum.cs similarity index 81% rename from WcsMain/Enum/TaskEnum/ElTagTaskTypeEnum.cs rename to WcsMain/Enum/ElTag/ElTagTaskTypeEnum.cs index 458f582..cf5ad87 100644 --- a/WcsMain/Enum/TaskEnum/ElTagTaskTypeEnum.cs +++ b/WcsMain/Enum/ElTag/ElTagTaskTypeEnum.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Enum.TaskEnum; +namespace WcsMain.Enum.ElTag; /// /// 电子标签的任务类型 diff --git a/WcsMain/Enum/FucResultEnum.cs b/WcsMain/Enum/FucResultEnum.cs deleted file mode 100644 index 466a327..0000000 --- a/WcsMain/Enum/FucResultEnum.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace WcsMain.Enum; - -/// -/// 动作执行的结果 -/// -public enum FucResultEnum -{ - offline, - success, - fail, -} \ No newline at end of file diff --git a/WcsMain/Enum/TaskEnum/WcsTaskStatusEnum.cs b/WcsMain/Enum/Stacker/WcsTaskStatusEnum.cs similarity index 86% rename from WcsMain/Enum/TaskEnum/WcsTaskStatusEnum.cs rename to WcsMain/Enum/Stacker/WcsTaskStatusEnum.cs index 3349768..036ea75 100644 --- a/WcsMain/Enum/TaskEnum/WcsTaskStatusEnum.cs +++ b/WcsMain/Enum/Stacker/WcsTaskStatusEnum.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Enum.TaskEnum; +namespace WcsMain.Enum.Stacker; /// /// WCS 表状态 diff --git a/WcsMain/Enum/TaskEnum/WcsTaskTypeEnum.cs b/WcsMain/Enum/Stacker/WcsTaskTypeEnum.cs similarity index 87% rename from WcsMain/Enum/TaskEnum/WcsTaskTypeEnum.cs rename to WcsMain/Enum/Stacker/WcsTaskTypeEnum.cs index efcb48d..7053129 100644 --- a/WcsMain/Enum/TaskEnum/WcsTaskTypeEnum.cs +++ b/WcsMain/Enum/Stacker/WcsTaskTypeEnum.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Enum.TaskEnum; +namespace WcsMain.Enum.Stacker; public enum WcsTaskTypeEnum { diff --git a/WcsMain/Enum/TaskEnum/WmsTaskStatusEnum.cs b/WcsMain/Enum/Stacker/WmsTaskStatusEnum.cs similarity index 87% rename from WcsMain/Enum/TaskEnum/WmsTaskStatusEnum.cs rename to WcsMain/Enum/Stacker/WmsTaskStatusEnum.cs index 9febcb1..f900203 100644 --- a/WcsMain/Enum/TaskEnum/WmsTaskStatusEnum.cs +++ b/WcsMain/Enum/Stacker/WmsTaskStatusEnum.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Enum.TaskEnum; +namespace WcsMain.Enum.Stacker; /// /// WMS任务状态枚举 diff --git a/WcsMain/Enum/TaskEnum/WmsTaskTypeEnum.cs b/WcsMain/Enum/Stacker/WmsTaskTypeEnum.cs similarity index 87% rename from WcsMain/Enum/TaskEnum/WmsTaskTypeEnum.cs rename to WcsMain/Enum/Stacker/WmsTaskTypeEnum.cs index 30027e7..ef50223 100644 --- a/WcsMain/Enum/TaskEnum/WmsTaskTypeEnum.cs +++ b/WcsMain/Enum/Stacker/WmsTaskTypeEnum.cs @@ -1,4 +1,4 @@ -namespace WcsMain.Enum.TaskEnum; +namespace WcsMain.Enum.Stacker; /// /// Wms 的任务枚举 diff --git a/WcsMain/EquipOperation/Entity/Stacker/StackerPlcTask.cs b/WcsMain/EquipOperation/Entity/Stacker/StackerPlcTask.cs index 8957b0c..1f6fb1a 100644 --- a/WcsMain/EquipOperation/Entity/Stacker/StackerPlcTask.cs +++ b/WcsMain/EquipOperation/Entity/Stacker/StackerPlcTask.cs @@ -1,5 +1,5 @@ using System.Collections; -using WcsMain.Enum.TaskEnum; +using WcsMain.Enum.Stacker; namespace WcsMain.EquipOperation.Entity.Stacker; diff --git a/WcsMain/ExtendMethod/AppWcsTaskExtendMethod.cs b/WcsMain/ExtendMethod/AppWcsTaskExtendMethod.cs index 61822e6..98c005e 100644 --- a/WcsMain/ExtendMethod/AppWcsTaskExtendMethod.cs +++ b/WcsMain/ExtendMethod/AppWcsTaskExtendMethod.cs @@ -1,5 +1,5 @@ using WcsMain.DataBase.TableEntity; -using WcsMain.Enum.TaskEnum; +using WcsMain.Enum.Stacker; using WcsMain.EquipOperation.Entity.Stacker; namespace WcsMain.ExtendMethod;