From d8d71bf3f0fcb4137c16fad3036159392d367b96 Mon Sep 17 00:00:00 2001 From: nodyang Date: Thu, 12 Oct 2023 10:39:58 +0800 Subject: [PATCH] merge --- .../Test/TestAction.cs | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs index 1587781..2712176 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs @@ -50,11 +50,10 @@ namespace Mesnac.Action.ChemicalWeighing.Test base.RunIni(runtime); //必须调用 var allDb=GetAllControls(); -<<<<<<< HEAD - //int adsa = BasePlcHelper.Instance.BU1BLT01_Alarm.NowValue.ToInt(); + - string sql = "insert into ActionCode values (13,'test','',1) select @@IDENTITY"; + DbHelper dbHelper = Mesnac.Basic.DataSourceFactory.Instance.GetDbHelper(Mesnac.Basic.DataSourceFactory.MCDbType.Local); if (dbHelper == null) @@ -68,10 +67,9 @@ namespace Mesnac.Action.ChemicalWeighing.Test int[] ssss = new int [] { }; var ss2s = BasePlcHelper.Instance.PlcReadByRunName("BU1BLT01_Set", out ssss); - mcControllist = GetAllDbMCControlsByOption(DbOptionTypes.None);//获取所有待初始化控件 - - startdate = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "MCLabel153".ToLower()).FirstOrDefault().BaseControl; + + Timer timer1 = new Timer(); timer1.Interval = 1000; @@ -79,14 +77,10 @@ namespace Mesnac.Action.ChemicalWeighing.Test timer1.Tick += new EventHandler(timer1EventProcessor);//添加事件 - //ParametersWithPc.B1.FirstWord 256 768 - - //badc1el26587193265870 -======= mCButton = allDb.FirstOrDefault(x => x.Name == "MCButton1") as MCButton; mCButton.Click += new EventHandler(timer1EventProcessor); ->>>>>>> dep +