entity 任务实体更新

WCS.Entity/WCS_TASK.cs

@@ -211,41 +211,36 @@ namespace WCS.Entity
         /// <summary>
         /// 新建
         /// </summary>
-        新建 = 0,
+        NewBuild = 0,
 
         /// <summary>
-        /// 执行中
+        /// 输送机执行中
         /// </summary>
-        执行中 = 2,
-
-        /// <summary>
-        /// 入库交管结束
-        /// </summary>
-        入库交管结束 = 3,
+        ConveyorInProgress = 2,
 
         /// <summary>
         /// 堆垛机执行
         /// </summary>
-        堆垛机执行 = 5,
+        StackerExecution = 5,
 
         /// <summary>
         /// 堆垛机完成
         /// </summary>
-        堆垛机完成 = 6,
+        StackerCompleted = 6,
 
         /// <summary>
-        /// 出库RGV执行
+        /// AGV执行中
         /// </summary>
-        出库RGV执行 = 9,
+        AGVInProgress = 10,
 
         /// <summary>
         /// 已完成
         /// </summary>
-        已完成 = 99,
+        Finish = 99,
 
         /// <summary>
         /// 已取消
         /// </summary>
-        已取消 = 106
+        Cancel = 106
     }
 }

WcsFramework.sln

@@ -23,9 +23,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "成品库", "成品库", "{
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WCS.Entity", "WCS.Entity\WCS.Entity.csproj", "{99AB1CD4-1242-4A1B-AE90-ADD7674848B2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WCS.WorkEngineering", "WCS.WorkEngineering\WCS.WorkEngineering.csproj", "{1E0F2030-48C6-4C09-8D4D-0C7F02761C3B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WCS.WorkEngineering", "WCS.WorkEngineering\WCS.WorkEngineering.csproj", "{1E0F2030-48C6-4C09-8D4D-0C7F02761C3B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WCS.Entity.Protocol", "WCS.Entity.Protocol\WCS.Entity.Protocol.csproj", "{B87B1360-D8D2-4416-83BE-C6BC27679EA3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WCS.Entity.Protocol", "WCS.Entity.Protocol\WCS.Entity.Protocol.csproj", "{B87B1360-D8D2-4416-83BE-C6BC27679EA3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DBHelper", "DBHelper\DBHelper.csproj", "{4678DE65-23AD-4907-B752-E7F1F99195BA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LogHelper", "LogHelper\LogHelper.csproj", "{977B3F9A-1CB4-4CF2-A0A2-B95A6011933A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PLC.Siemens", "PLC.Siemens\PLC.Siemens.csproj", "{DB454F36-DE7B-4A9B-9A8B-8E2C3C4F81B7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -53,6 +59,18 @@ Global
 		{B87B1360-D8D2-4416-83BE-C6BC27679EA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B87B1360-D8D2-4416-83BE-C6BC27679EA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B87B1360-D8D2-4416-83BE-C6BC27679EA3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4678DE65-23AD-4907-B752-E7F1F99195BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4678DE65-23AD-4907-B752-E7F1F99195BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4678DE65-23AD-4907-B752-E7F1F99195BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4678DE65-23AD-4907-B752-E7F1F99195BA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{977B3F9A-1CB4-4CF2-A0A2-B95A6011933A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{977B3F9A-1CB4-4CF2-A0A2-B95A6011933A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{977B3F9A-1CB4-4CF2-A0A2-B95A6011933A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{977B3F9A-1CB4-4CF2-A0A2-B95A6011933A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DB454F36-DE7B-4A9B-9A8B-8E2C3C4F81B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DB454F36-DE7B-4A9B-9A8B-8E2C3C4F81B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DB454F36-DE7B-4A9B-9A8B-8E2C3C4F81B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DB454F36-DE7B-4A9B-9A8B-8E2C3C4F81B7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -63,6 +81,9 @@ Global
 		{99AB1CD4-1242-4A1B-AE90-ADD7674848B2} = {C783651F-7EB6-40BA-8E68-525F93B8FCED}
 		{1E0F2030-48C6-4C09-8D4D-0C7F02761C3B} = {FD3B782A-4A24-458C-B77F-6F46106AE2B4}
 		{B87B1360-D8D2-4416-83BE-C6BC27679EA3} = {FD3B782A-4A24-458C-B77F-6F46106AE2B4}
+		{4678DE65-23AD-4907-B752-E7F1F99195BA} = {C783651F-7EB6-40BA-8E68-525F93B8FCED}
+		{977B3F9A-1CB4-4CF2-A0A2-B95A6011933A} = {C783651F-7EB6-40BA-8E68-525F93B8FCED}
+		{DB454F36-DE7B-4A9B-9A8B-8E2C3C4F81B7} = {C783651F-7EB6-40BA-8E68-525F93B8FCED}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {2C009DED-1CDE-4D15-A895-5013ED32E8FC}