merge

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
+