Merge branch 'master' of http://gitlab.siger-data.com:9000/jiawei.su/Laisi_AutoMES2

Server/Apis/Siger.ApiACC/Siger.ApiACC.csproj

@@ -32,6 +32,7 @@
     <ProjectReference Include="..\..\Common\Siger.Middlelayer.Common\Siger.Middlelayer.Common.csproj" />
     <ProjectReference Include="..\..\Common\Siger.Middlelayer.Log\Siger.Middlelayer.Log.csproj" />
     <ProjectReference Include="..\..\Infrastructure\Repositories\Siger.Middlelayer.AccRepository\Siger.Middlelayer.AccRepository.csproj" />
+    <ProjectReference Include="..\..\Infrastructure\Repositories\Siger.Middlelayer.CncRepository\Siger.Middlelayer.CncRepository.csproj" />
     <ProjectReference Include="..\..\Infrastructure\Siger.Middlelayer.Dapper\Siger.Middlelayer.Dapper.csproj" />
     <ProjectReference Include="..\Siger.ApiCommon\Siger.ApiCommon.csproj" />
   </ItemGroup>

Server/Apis/Siger.ApiACC/Tasks/AccRegistry.cs

@@ -9,7 +9,7 @@ namespace Siger.ApiACC.Tasks
         public AccRegistry()
         {
             //Logger.RegisterLogEngine(Module.Acc);
-            Schedule<AccCalculateTraceJob>().ToRunNow().AndEvery(30).Minutes();
+            //Schedule<AccCalculateTraceJob>().ToRunNow().AndEvery(30).Minutes();
 
            
         }

Server/Apis/Siger.ApiACC/Tasks/AutoMES.cs

+using FluentScheduler;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Siger.ApiACC.Tasks
+{
+    public class AutoMES : IJob, IDisposable
+    {
+      
+
+        public void Execute()
+        {
+            throw new NotImplementedException();
+        }
+        public void Dispose()
+        {
+            throw new NotImplementedException();
+        }
+
+
+        //获取TaskList 
+        private List<int>GetTaskList()
+        {
+
+            return new List<int>();
+        }
+    }
+}

Server/Apis/Siger.ApiACC/Tasks/DBhelper.cs

+using Siger.Middlelayer.AccRepository;
+using Siger.Middlelayer.CncRepository;
+using Siger.Middlelayer.Repository;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Siger.ApiACC.Tasks
+{
+    public class DBhelper 
+    {
+        private static DBhelper _helper;
+        public static DBhelper Instance = _helper ?? (_helper = new DBhelper());
+
+        public ApiCncDbContext CncDbContext;
+        public ApiAccDbContext AccDbContext;
+        public ApiConfigDbContext ConfigDbContext;
+
+        static DBhelper()
+        {
+        }
+        public void LoadDbContext()
+        {
+            CncDbContext = new ApiCncDbContext();
+            AccDbContext = new ApiAccDbContext();
+            ConfigDbContext = new ApiConfigDbContext();
+        }
+
+        public List<int> GetTaskList()
+        {
+            return new List<int>();
+        }
+        public void Dispose()
+        {
+            CncDbContext?.Dispose();
+            AccDbContext?.Dispose();
+            ConfigDbContext?.Dispose();
+        }
+    }
+}

Server/Common/Siger.Middlelayer.Share/Enum/ModuleEnum/Automation.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Siger.Middlelayer.Share.Enum.ModuleEnum
+{
+    public class Automation
+    {
+        /// <summary>
+        /// 任务触发类型
+        /// </summary>
+        public enum TaskTrigerType
+        {
+            /// <summary>
+            /// 手动任务
+            /// </summary>
+            Manual=1,
+            /// <summary>
+            ///  自动任务
+            /// </summary>
+            Auto=2
+        }
+        /// <summary>
+        /// Task任务状态结果
+        /// </summary>
+        public enum TaskResultStatus
+        {
+            /// <summary>
+            /// 取消
+            /// </summary>
+            Cancel=0,
+            /// <summary>
+            /// 待生产
+            /// </summary>
+            Waiting=1,
+            /// <summary>
+            /// 生产中
+            /// </summary>
+            Produce=2,
+            /// <summary>
+            /// 生产完成
+            /// </summary>
+            Complated=3
+        }
+        /// <summary>
+        /// 设备状态 （自动任务）
+        /// </summary>
+        public enum MachineStatus
+        {
+            /// <summary>
+            /// 待生产
+            /// </summary>
+            Waiting = 1,
+            /// <summary>
+            /// 生产中
+            /// </summary>
+            Produce = 2,
+            /// <summary>
+            /// 生产完成
+            /// </summary>
+            Complated = 3
+        }
+    }
+}