diff --git a/JY.DAL/IocConfig.cs b/JY.DAL/IocConfig.cs index 0c9d026..b7d4fa8 100644 --- a/JY.DAL/IocConfig.cs +++ b/JY.DAL/IocConfig.cs @@ -20,7 +20,7 @@ namespace JY.DAL var services = new ServiceCollection(); //services.AddScoped(typeof(IRepository<>), typeof(Repository<>)); services.AddScoped(typeof(IRepository<>), typeof(Repository<>)); - services.AddScoped, Repository>(); + //services.AddScoped, Repository>(); services.AddScoped(); services.AddScoped(); diff --git a/JY.Inspection/HomeForm.cs b/JY.Inspection/HomeForm.cs index 6a01323..52ad8dc 100644 --- a/JY.Inspection/HomeForm.cs +++ b/JY.Inspection/HomeForm.cs @@ -470,8 +470,6 @@ namespace JY.Inspection _speech.SelectVoice(neededVoice.VoiceInfo.Name); } - IocConfig.Initialize(); - LogManagerControl.AddLog("程序已启动", LogAddtype.local); } @@ -1999,8 +1997,7 @@ namespace JY.Inspection { try { - Repository repository = new Repository(); - var feedingService = new FeedingDataService(repository); + FeedingDataService feedingService = IocConfig.Provider.GetService(); List list = (List)obj; if (list != null) @@ -2092,8 +2089,7 @@ namespace JY.Inspection ///1# 进站条码 } - Repository repository = new Repository(); - FeedingDataService service = new FeedingDataService(repository); + FeedingDataService service = (FeedingDataService)IocConfig.Provider.GetService(); for (int i = 0; i < listBarOut.Count; i++) { @@ -2508,9 +2504,8 @@ namespace JY.Inspection { try { - //BlankingDataService service = IocConfig.Provider.GetService(); - Repository repository = new Repository(); - var service = new BlankingDataService(repository); + BlankingDataService service = + (BlankingDataService)IocConfig.Provider.GetService(); List list = (List)obj; if (list != null) diff --git a/JY.Inspection/Program.cs b/JY.Inspection/Program.cs index 007f20c..10b30fa 100644 --- a/JY.Inspection/Program.cs +++ b/JY.Inspection/Program.cs @@ -1,4 +1,5 @@ using HslCommunication; +using JY.DAL; using JY.Utility; using System; using System.Reflection; @@ -33,6 +34,9 @@ namespace JY.Inspection IniFileHelper.CreateIniFile(Application.StartupPath + "\\Config\\", "Configure.ini"); string mutexName = Assembly.GetEntryAssembly().FullName; string title = IniFileHelper.ReadIniData("SYSTEM_CONFIGURE", "Project_Name"); + + IocConfig.Initialize(); + mFrmMain = new HomeForm(); bool isFirst; using (new Mutex(false, mutexName, out isFirst))