diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/DownAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/DownAction.cs index f744640..2d3b971 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/DownAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/DownAction.cs @@ -50,7 +50,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical lsView.Add(view); } - ElectricalPlc.DownToPlc(lsView); + new ElectricalPlc().DownToPlc(lsView); } } } \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/ElectricalPlc.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/ElectricalPlc.cs index c2286b6..00ce96b 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/ElectricalPlc.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/ElectricalPlc.cs @@ -10,18 +10,18 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical { public class ElectricalPlc { - private static BasePlcHelper GetPlcHelper => BasePlcHelper.Instance; + private BasePlcHelper GetPlcHelper => BasePlcHelper.Instance; - private static DB2107Helper _db2107Helper = new DB2107Helper(); + private DB2107Helper _db2107Helper = new DB2107Helper(); - private static void DownElectricalView(int start, ElectricalView view) + private void DownElectricalView(int start, ElectricalView view) { PlcConnect.Instance.Write($"DB2107.{start}.0",view.Speed); } - private static void Down1324(ElectricalView view) + private void Down1324(ElectricalView view) { if (null != view) { @@ -32,7 +32,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } } - private static ElectricalView Up1324() + private ElectricalView Up1324() { ElectricalView view = new ElectricalView(); view.Id = 1; @@ -51,7 +51,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical - private static ElectricalView Up1328() + private ElectricalView Up1328() { ElectricalView view = new ElectricalView(); view.Id = 2; @@ -63,7 +63,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } - private static void Down1328(ElectricalView view) + private void Down1328(ElectricalView view) { if (null != view) { @@ -76,7 +76,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } - private static ElectricalView Up1332() + private ElectricalView Up1332() { ElectricalView view = new ElectricalView(); view.Id = 3; @@ -88,7 +88,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } - private static void Down1332(ElectricalView view) + private void Down1332(ElectricalView view) { if (null != view) { @@ -100,7 +100,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } - private static ElectricalView Up1336() + private ElectricalView Up1336() { ElectricalView view = new ElectricalView(); view.Id = 4; @@ -112,7 +112,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } - private static void Down1336(ElectricalView view) + private void Down1336(ElectricalView view) { if (null != view) { @@ -124,7 +124,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } - private static ElectricalView Up1340() + private ElectricalView Up1340() { ElectricalView view = new ElectricalView(); view.Id = 5; @@ -136,7 +136,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } - private static void Down1340(ElectricalView view) + private void Down1340(ElectricalView view) { if (null != view) { @@ -149,7 +149,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } - private static ElectricalView Up1344() + private ElectricalView Up1344() { ElectricalView view = new ElectricalView(); view.Id = 6; @@ -161,7 +161,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } - private static void Down1344(ElectricalView view) + private void Down1344(ElectricalView view) { if (null != view) { @@ -172,7 +172,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } } - private static ElectricalView Up1348() + private ElectricalView Up1348() { ElectricalView view = new ElectricalView(); view.Id = 7; @@ -184,7 +184,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } - private static void Down1348(ElectricalView view) + private void Down1348(ElectricalView view) { if (null != view) { @@ -195,7 +195,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } } - private static ElectricalView Up1352() + private ElectricalView Up1352() { ElectricalView view = new ElectricalView(); view.Id = 8; @@ -207,7 +207,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } - private static void Down1352(ElectricalView view) + private void Down1352(ElectricalView view) { if (null != view) { @@ -219,7 +219,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } - private static ElectricalView Up1356() + private ElectricalView Up1356() { ElectricalView view = new ElectricalView(); view.Id = 9; @@ -231,7 +231,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } - private static void Down1356(ElectricalView view) + private void Down1356(ElectricalView view) { if (null != view) { @@ -244,7 +244,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } - private static ElectricalView Up1360() + private ElectricalView Up1360() { ElectricalView view = new ElectricalView(); view.Id = 10; @@ -256,7 +256,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } - private static void Down1360(ElectricalView view) + private void Down1360(ElectricalView view) { if (null != view) { @@ -268,7 +268,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } } - private static ElectricalView Up1364() + private ElectricalView Up1364() { ElectricalView view = new ElectricalView(); view.Id = 11; @@ -280,7 +280,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } - private static void Down1364(ElectricalView view) + private void Down1364(ElectricalView view) { if (null != view) { @@ -293,7 +293,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } - private static ElectricalView Up1368() + private ElectricalView Up1368() { ElectricalView view = new ElectricalView(); view.Id = 12; @@ -305,7 +305,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } - private static void Down1368(ElectricalView view) + private void Down1368(ElectricalView view) { if (null != view) { @@ -316,7 +316,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } } - private static ElectricalView Up1372() + private ElectricalView Up1372() { ElectricalView view = new ElectricalView(); view.Id = 13; @@ -328,7 +328,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } - private static void Down1372(ElectricalView view) + private void Down1372(ElectricalView view) { if (null != view) { @@ -340,7 +340,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } } - private static ElectricalView Up1376() + private ElectricalView Up1376() { ElectricalView view = new ElectricalView(); view.Id = 14; @@ -352,7 +352,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } - private static void Down1376(ElectricalView view) + private void Down1376(ElectricalView view) { if (null != view) { @@ -364,7 +364,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } - private static ElectricalView Up1380() + private ElectricalView Up1380() { ElectricalView view = new ElectricalView(); view.Id = 15; @@ -376,7 +376,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } - private static void Down1380(ElectricalView view) + private void Down1380(ElectricalView view) { if (null != view) { @@ -387,7 +387,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } } - private static ElectricalView Up1384() + private ElectricalView Up1384() { ElectricalView view = new ElectricalView(); view.Id = 16; @@ -399,7 +399,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } - private static void Down1384(ElectricalView view) + private void Down1384(ElectricalView view) { if (null != view) { @@ -410,7 +410,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } } - private static ElectricalView Up1388() + private ElectricalView Up1388() { ElectricalView view = new ElectricalView(); view.Id = 17; @@ -422,7 +422,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } - private static void Down1388(ElectricalView view) + private void Down1388(ElectricalView view) { if (null != view) { @@ -434,7 +434,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } - private static ElectricalView Up1392() + private ElectricalView Up1392() { ElectricalView view = new ElectricalView(); view.Id = 18; @@ -446,7 +446,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } - private static void Down1392(ElectricalView view) + private void Down1392(ElectricalView view) { if (null != view) { @@ -458,7 +458,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } - private static ElectricalView Up1396() + private ElectricalView Up1396() { ElectricalView view = new ElectricalView(); view.Id = 19; @@ -471,7 +471,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } - private static void Down1396(ElectricalView view) + private void Down1396(ElectricalView view) { if (null != view) { @@ -483,7 +483,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } } - private static ElectricalView Up1400() + private ElectricalView Up1400() { ElectricalView view = new ElectricalView(); view.Id = 20; @@ -497,7 +497,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } - private static void Down1400(ElectricalView view) + private void Down1400(ElectricalView view) { if (null != view) { @@ -510,7 +510,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } - private static ElectricalView Up1404() + private ElectricalView Up1404() { ElectricalView view = new ElectricalView(); view.Id = 21; @@ -522,7 +522,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } - private static void Down1404(ElectricalView view) + private void Down1404(ElectricalView view) { if (null != view) { @@ -534,7 +534,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } - public static IList UpFromPlc() + public IList UpFromPlc() { IList ls = new List(); ls.Add(Up1324()); @@ -562,7 +562,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } - public static ElectricalView UpFromPlc(int id) + public ElectricalView UpFromPlc(int id) { ElectricalView view = new ElectricalView(); switch (id) @@ -637,7 +637,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical } - public static void DownToPlc(List views) + public void DownToPlc(List views) { foreach (var view in views) { diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/FrmElectrical.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/FrmElectrical.cs index d2412c3..5553005 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/FrmElectrical.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/FrmElectrical.cs @@ -18,7 +18,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical { this._id = id; ElectricalView view = new ElectricalView(); - view = ElectricalPlc.UpFromPlc(id); + view =new ElectricalPlc().UpFromPlc(id); if (null != view) { this.Speed.Text = view.Speed.ToString(); @@ -53,7 +53,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical ElectricalView view = new ElectricalView(); view.Id = _id; view.Speed = Convert.ToSingle(speed); - ElectricalPlc.DownToPlc(new List() + new ElectricalPlc().DownToPlc(new List() { view }); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/InitDbAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/InitDbAction.cs index cb074d6..1f04c09 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/InitDbAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/InitDbAction.cs @@ -38,7 +38,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical DBHelp.GetTable(@"select Id, Name, Speed from ElectricalSetting"); - var view = ElectricalPlc.UpFromPlc(); + var view = new ElectricalPlc().UpFromPlc(); if (this._materialGridControl != null && this._materialGridControl.BaseControl != null) diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/UpAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/UpAction.cs index 050ad2f..a7497dd 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/UpAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/UpAction.cs @@ -29,12 +29,12 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical public void DoWord() { - var view = ElectricalPlc.UpFromPlc(); + var view = new ElectricalPlc().UpFromPlc(); foreach (var v in view) { - //string sql = - // $"update ElectricalSetting set Speed={v.Speed} where Id={v.Id}"; - //DBHelp.ExecuteNonQuery(sql); + string sql = + $"update ElectricalSetting set Speed={v.Speed} where Id={v.Id}"; + DBHelp.ExecuteNonQuery(sql); } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/DownAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/DownAction.cs index e9310e9..5a4fe6e 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/DownAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/DownAction.cs @@ -67,7 +67,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage lsView.Add(view); } - MetagePlc.DownToPlc(lsView); + new MetagePlc().DownToPlc(lsView); foreach (var v in lsView) diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/FrmMetage.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/FrmMetage.cs index e2375ba..c65a6f6 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/FrmMetage.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/FrmMetage.cs @@ -18,7 +18,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage public FrmMetage(int id) : this() { this._id = id; - var upFromPlc = MetagePlc.UpFromPlc(id); + var upFromPlc = new MetagePlc().UpFromPlc(id); if (null != upFromPlc) { this.HighSpeed.Text = upFromPlc.HighSpeed.ToString(); @@ -93,7 +93,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage }; - MetagePlc.DownToPlc(new List() { view }); + new MetagePlc().DownToPlc(new List() { view }); string sql = $"update MetageSetting set HighSpeed={view.HighSpeed},LowSpeed={view.LowSpeed},WeightSlow={view.WeightSlow},Precut={view.Precut},JogTime={view.JogTime} where Id={view.Id}"; DBHelp.ExecuteNonQuery(sql); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/MetageHelp.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/MetageHelp.cs index 67404f7..1ccff77 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/MetageHelp.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/MetageHelp.cs @@ -13,9 +13,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage - private static DB2107Helper _db2107Helper = new DB2107Helper(); + private DB2107Helper _db2107Helper = new DB2107Helper(); - private static void DownMetageView(int start, MetageView view) + private void DownMetageView(int start, MetageView view) { int highSpeed = start; int lowSpeed = start+4; @@ -33,7 +33,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage PlcConnect.Instance.Write($"DB2107.{jobTime}.0", Convert.ToUInt16(view.JogTime)); } - static MetageView GetMetageView(int id, WeightParaE weight) + MetageView GetMetageView(int id, WeightParaE weight) { //WeightParaE @@ -50,7 +50,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } - private static void Down694(MetageView view) + private void Down694(MetageView view) { if (null != view) { @@ -73,7 +73,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage - private static MetageView Up694() + private MetageView Up694() { // var basePlcHelper = GetPlcHelper; @@ -94,7 +94,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } - private static void Down712(MetageView view) + private void Down712(MetageView view) { if (null != view) { @@ -114,7 +114,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } } - private static MetageView Up712() + private MetageView Up712() { //var basePlcHelper = GetPlcHelper; //MetageView view = new MetageView() @@ -132,7 +132,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } - private static void Down730(MetageView view) + private void Down730(MetageView view) { if (null != view) { @@ -150,7 +150,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } } - private static MetageView Up730() + private MetageView Up730() { //var basePlcHelper = GetPlcHelper; //MetageView view = new MetageView() @@ -168,7 +168,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } - private static void Down748(MetageView view) + private void Down748(MetageView view) { if (null != view) { @@ -187,7 +187,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } } - private static MetageView Up748() + private MetageView Up748() { //var basePlcHelper = GetPlcHelper; //MetageView view = new MetageView() @@ -205,7 +205,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } - private static void Down766(MetageView view) + private void Down766(MetageView view) { if (null != view) { @@ -224,7 +224,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } } - private static MetageView Up766() + private MetageView Up766() { //var basePlcHelper = GetPlcHelper; //MetageView view = new MetageView() @@ -242,7 +242,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } - private static void Down784(MetageView view) + private void Down784(MetageView view) { if (null != view) { @@ -261,7 +261,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } } - private static MetageView Up784() + private MetageView Up784() { //var basePlcHelper = GetPlcHelper; //MetageView view = new MetageView() @@ -279,7 +279,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } - private static void Down802(MetageView view) + private void Down802(MetageView view) { if (null != view) { @@ -297,7 +297,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } } - private static MetageView Up802() + private MetageView Up802() { //var basePlcHelper = GetPlcHelper; //MetageView view = new MetageView() @@ -314,7 +314,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } - private static void Down820(MetageView view) + private void Down820(MetageView view) { if (null != view) { @@ -332,7 +332,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } } - private static MetageView Up820() + private MetageView Up820() { //var basePlcHelper = GetPlcHelper; //MetageView view = new MetageView() @@ -350,7 +350,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } - private static void Down838(MetageView view) + private void Down838(MetageView view) { if (null != view) { @@ -369,7 +369,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } } - private static MetageView Up838() + private MetageView Up838() { //var basePlcHelper = GetPlcHelper; //MetageView view = new MetageView() @@ -387,7 +387,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } - private static void Down856(MetageView view) + private void Down856(MetageView view) { if (null != view) { @@ -405,7 +405,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } } - private static MetageView Up856() + private MetageView Up856() { //var basePlcHelper = GetPlcHelper; //MetageView view = new MetageView() @@ -423,7 +423,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } - private static void Down874(MetageView view) + private void Down874(MetageView view) { if (null != view) { @@ -441,7 +441,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } } - private static MetageView Up874() + private MetageView Up874() { //var basePlcHelper = GetPlcHelper; //MetageView view = new MetageView() @@ -458,7 +458,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage return GetMetageView(11, _db2107Helper.WeightPra.Silo[10]); } - private static void Down892(MetageView view) + private void Down892(MetageView view) { if (null != view) { @@ -476,7 +476,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } } - private static MetageView Up892() + private MetageView Up892() { //var basePlcHelper = GetPlcHelper; //MetageView view = new MetageView() @@ -494,7 +494,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } - private static void Down910(MetageView view) + private void Down910(MetageView view) { if (null != view) { @@ -512,7 +512,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } } - private static MetageView Up910() + private MetageView Up910() { //var basePlcHelper = GetPlcHelper; //MetageView view = new MetageView() @@ -530,7 +530,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } - private static void Down928(MetageView view) + private void Down928(MetageView view) { if (null != view) { @@ -548,7 +548,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } } - private static MetageView Up928() + private MetageView Up928() { //var basePlcHelper = GetPlcHelper; //MetageView view = new MetageView() @@ -566,7 +566,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } - private static void Down946(MetageView view) + private void Down946(MetageView view) { if (null != view) { @@ -585,7 +585,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } } - private static MetageView Up946() + private MetageView Up946() { //var basePlcHelper = GetPlcHelper; //MetageView view = new MetageView() @@ -604,7 +604,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } - private static void Down964(MetageView view) + private void Down964(MetageView view) { if (null != view) { @@ -620,7 +620,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } } - private static MetageView Up964() + private MetageView Up964() { //var basePlcHelper = GetPlcHelper; //MetageView view = new MetageView() @@ -638,7 +638,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } - private static void Down982(MetageView view) + private void Down982(MetageView view) { if (null != view) { @@ -653,7 +653,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } } - private static MetageView Up982() + private MetageView Up982() { //var basePlcHelper = GetPlcHelper; //MetageView view = new MetageView() @@ -669,7 +669,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage return GetMetageView(17, _db2107Helper.WeightPra.Daybin[1]); } - private static void Down1000(MetageView view) + private void Down1000(MetageView view) { if (null != view) { @@ -685,7 +685,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } } - private static MetageView Up1000() + private MetageView Up1000() { //var basePlcHelper = GetPlcHelper; //MetageView view = new MetageView() @@ -703,7 +703,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } - private static void Down1018(MetageView view) + private void Down1018(MetageView view) { if (null != view) { @@ -718,7 +718,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } } - private static MetageView Up1018() + private MetageView Up1018() { //var basePlcHelper = GetPlcHelper; //MetageView view = new MetageView() @@ -736,7 +736,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } - private static void Down1036(MetageView view) + private void Down1036(MetageView view) { if (null != view) { @@ -751,7 +751,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } } - private static MetageView Up1036() + private MetageView Up1036() { //var basePlcHelper = GetPlcHelper; //MetageView view = new MetageView() @@ -769,7 +769,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } - private static void Down1054(MetageView view) + private void Down1054(MetageView view) { if (null != view) { @@ -785,7 +785,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } } - private static MetageView Up1054() + private MetageView Up1054() { //var basePlcHelper = GetPlcHelper; //MetageView view = new MetageView() @@ -803,7 +803,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } - private static void Down1072(MetageView view) + private void Down1072(MetageView view) { if (null != view) { @@ -818,7 +818,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } } - private static MetageView Up1072() + private MetageView Up1072() { //var basePlcHelper = GetPlcHelper; //MetageView view = new MetageView() @@ -836,7 +836,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } - private static void Down1090(MetageView view) + private void Down1090(MetageView view) { if (null != view) { @@ -853,7 +853,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } } - private static MetageView Up1090() + private MetageView Up1090() { //var basePlcHelper = GetPlcHelper; //MetageView view = new MetageView() @@ -871,7 +871,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } - private static void Down1108(MetageView view) + private void Down1108(MetageView view) { if (null != view) { @@ -887,7 +887,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } } - private static MetageView Up1108() + private MetageView Up1108() { //var basePlcHelper = GetPlcHelper; //MetageView view = new MetageView() @@ -904,7 +904,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } - private static void Down1126(MetageView view) + private void Down1126(MetageView view) { if (null != view) { @@ -920,7 +920,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } } - private static MetageView Up1126() + private MetageView Up1126() { //var basePlcHelper = GetPlcHelper; //MetageView view = new MetageView() @@ -938,7 +938,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } - private static void Down1144(MetageView view) + private void Down1144(MetageView view) { if (null != view) { @@ -955,7 +955,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } } - private static MetageView Up1144() + private MetageView Up1144() { //var basePlcHelper = GetPlcHelper; //MetageView view = new MetageView() @@ -973,7 +973,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } - private static void Down1162(MetageView view) + private void Down1162(MetageView view) { if (null != view) { @@ -989,7 +989,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } } - private static MetageView Up1162() + private MetageView Up1162() { //var basePlcHelper = GetPlcHelper; //MetageView view = new MetageView() @@ -1008,7 +1008,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } - private static void Down1180(MetageView view) + private void Down1180(MetageView view) { if (null != view) { @@ -1023,7 +1023,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } } - private static MetageView Up1180() + private MetageView Up1180() { //var basePlcHelper = GetPlcHelper; //MetageView view = new MetageView() @@ -1041,7 +1041,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } - private static void Down1198(MetageView view) + private void Down1198(MetageView view) { if (null != view) { @@ -1057,7 +1057,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } } - private static MetageView Up1198() + private MetageView Up1198() { //var basePlcHelper = GetPlcHelper; //MetageView view = new MetageView() @@ -1075,7 +1075,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } - private static void Down1216(MetageView view) + private void Down1216(MetageView view) { if (null != view) { @@ -1090,7 +1090,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } } - private static MetageView Up1216() + private MetageView Up1216() { //var basePlcHelper = GetPlcHelper; //MetageView view = new MetageView() @@ -1108,7 +1108,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } - private static void Down1234(MetageView view) + private void Down1234(MetageView view) { if (null != view) { @@ -1123,7 +1123,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } } - private static MetageView Up1234() + private MetageView Up1234() { //var basePlcHelper = GetPlcHelper; //MetageView view = new MetageView() @@ -1141,7 +1141,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } - private static void Down1252(MetageView view) + private void Down1252(MetageView view) { if (null != view) { @@ -1156,7 +1156,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } } - private static MetageView Up1252() + private MetageView Up1252() { //var basePlcHelper = GetPlcHelper; //MetageView view = new MetageView() @@ -1174,7 +1174,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } - private static void Down1270(MetageView view) + private void Down1270(MetageView view) { if (null != view) { @@ -1189,7 +1189,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } } - private static MetageView Up1270() + private MetageView Up1270() { //var basePlcHelper = GetPlcHelper; //MetageView view = new MetageView() @@ -1207,7 +1207,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } - private static void Down1288(MetageView view) + private void Down1288(MetageView view) { if (null != view) { @@ -1222,7 +1222,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } } - private static MetageView Up1288() + private MetageView Up1288() { //var basePlcHelper = GetPlcHelper; //MetageView view = new MetageView() @@ -1240,7 +1240,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } - private static void Down1306(MetageView view) + private void Down1306(MetageView view) { if (null != view) { @@ -1256,7 +1256,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } } - private static MetageView Up1306() + private MetageView Up1306() { //var basePlcHelper = GetPlcHelper; //MetageView view = new MetageView() @@ -1276,7 +1276,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage - public static MetageView UpFromPlc(int id) + public MetageView UpFromPlc(int id) { MetageView view = new MetageView(); switch (id) @@ -1394,7 +1394,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage return view; } - public static IList UpFromPlc() + public IList UpFromPlc() { IList ls = new List(); ls.Add(Up694()); @@ -1436,7 +1436,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } - public static void DownToPlc(IList list) + public void DownToPlc(IList list) { foreach (var v in list) { diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/UpAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/UpAction.cs index 39bf513..918ab6a 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/UpAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/UpAction.cs @@ -43,12 +43,12 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage private void DoWord() { - var view = MetagePlc.UpFromPlc(); + var view = new MetagePlc().UpFromPlc(); foreach (var v in view) { - //string sql = - // $"update MetageSetting set HighSpeed={v.HighSpeed},LowSpeed={v.LowSpeed},WeightSlow={v.WeightSlow},Precut={v.Precut},JogTime={v.JogTime} where Id={v.Id}"; - //DBHelp.ExecuteNonQuery(sql); + string sql = + $"update MetageSetting set HighSpeed={v.HighSpeed},LowSpeed={v.LowSpeed},WeightSlow={v.WeightSlow},Precut={v.Precut},JogTime={v.JogTime} where Id={v.Id}"; + DBHelp.ExecuteNonQuery(sql); } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/DownAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/DownAction.cs index 23c9e04..03842ac 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/DownAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/DownAction.cs @@ -67,7 +67,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional lsView.Add(view); } - ProportionalPlc.DownToPlc(lsView); + new ProportionalPlc().DownToPlc(lsView); } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/FrmProportional.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/FrmProportional.cs index 2b456ac..ea787ce 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/FrmProportional.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/FrmProportional.cs @@ -18,7 +18,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional this._id = id; SV.MaxLength = 5; SV.Enabled = true; - var view = ProportionalPlc.UpFromPlc(id); + var view = new ProportionalPlc().UpFromPlc(id); if (view != null) { SV.Text = view.SV.ToString(CultureInfo.InvariantCulture); @@ -64,7 +64,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional return; } - ProportionalPlc.DownToPlc(new []{view}); + new ProportionalPlc().DownToPlc(new []{view}); ProportionalDB.Update(view); this.DialogResult = DialogResult.OK; diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/ProportionalPlc.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/ProportionalPlc.cs index 76818b1..8037318 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/ProportionalPlc.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/ProportionalPlc.cs @@ -14,9 +14,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional - private static DB2107Helper _db2107Helper = new DB2107Helper(); + private DB2107Helper _db2107Helper = new DB2107Helper(); - private static void DownProportionalSettingView(int start, ProportionalSettingView view) + private void DownProportionalSettingView(int start, ProportionalSettingView view) { int sv = start + 4; PlcConnect.Instance.Write($"DB2107.{sv}.0", Convert.ToSingle(view.SV)); @@ -24,7 +24,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional } - private static void Down614(ProportionalSettingView view) + private void Down614(ProportionalSettingView view) { if (null != view) { @@ -35,7 +35,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional } - private static ProportionalSettingView GetProportionalSettingView(int id, PID_HMI pID) + private ProportionalSettingView GetProportionalSettingView(int id, PID_HMI pID) { ProportionalSettingView vi = new ProportionalSettingView() { @@ -47,7 +47,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional } - private static ProportionalSettingView Up614() + private ProportionalSettingView Up614() { // @@ -60,7 +60,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional return vi; } - private static void Down622(ProportionalSettingView view) + private void Down622(ProportionalSettingView view) { if (null != view) { @@ -69,7 +69,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional } - private static ProportionalSettingView Up622() + private ProportionalSettingView Up622() { ProportionalSettingView vi = GetProportionalSettingView(2, _db2107Helper.PID.Purge_V1); @@ -83,7 +83,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional - private static void Down630(ProportionalSettingView view) + private void Down630(ProportionalSettingView view) { if (null != view) { @@ -92,7 +92,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional } - private static ProportionalSettingView Up630() + private ProportionalSettingView Up630() { ProportionalSettingView vi = GetProportionalSettingView(3, _db2107Helper.PID.Convey_V2); @@ -104,7 +104,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional return vi; } - private static void Down638(ProportionalSettingView view) + private void Down638(ProportionalSettingView view) { if (null != view) { @@ -113,7 +113,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional } - private static ProportionalSettingView Up638() + private ProportionalSettingView Up638() { ProportionalSettingView vi = GetProportionalSettingView(4, _db2107Helper.PID.Purge_V2); @@ -130,7 +130,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional - private static void Down646(ProportionalSettingView view) + private void Down646(ProportionalSettingView view) { if (null != view) { @@ -139,7 +139,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional } - private static ProportionalSettingView Up646() + private ProportionalSettingView Up646() { ProportionalSettingView vi = GetProportionalSettingView(5, _db2107Helper.PID.Convey_V3); @@ -152,7 +152,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional } - private static void Down654(ProportionalSettingView view) + private void Down654(ProportionalSettingView view) { if (null != view) { @@ -161,7 +161,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional } - private static ProportionalSettingView Up654() + private ProportionalSettingView Up654() { ProportionalSettingView vi = GetProportionalSettingView(6, _db2107Helper.PID.Purge_V3); @@ -177,7 +177,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional - private static void Down662(ProportionalSettingView view) + private void Down662(ProportionalSettingView view) { if (null != view) { @@ -186,7 +186,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional } - private static ProportionalSettingView Up662() + private ProportionalSettingView Up662() { ProportionalSettingView vi = GetProportionalSettingView(7, _db2107Helper.PID.Convey_V4); @@ -199,7 +199,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional } - private static void Down670(ProportionalSettingView view) + private void Down670(ProportionalSettingView view) { if (null != view) { @@ -208,7 +208,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional } - private static ProportionalSettingView Up670() + private ProportionalSettingView Up670() { ProportionalSettingView vi = GetProportionalSettingView(8, _db2107Helper.PID.Purge_V4); @@ -224,7 +224,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional - private static void Down678(ProportionalSettingView view) + private void Down678(ProportionalSettingView view) { if (null != view) { @@ -233,7 +233,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional } - private static ProportionalSettingView Up678() + private ProportionalSettingView Up678() { ProportionalSettingView vi = GetProportionalSettingView(9, _db2107Helper.PID.Convey_V5); @@ -246,7 +246,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional } - private static void Down686(ProportionalSettingView view) + private void Down686(ProportionalSettingView view) { if (null != view) { @@ -255,7 +255,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional } - private static ProportionalSettingView Up686() + private ProportionalSettingView Up686() { ProportionalSettingView vi = GetProportionalSettingView(10, _db2107Helper.PID.Purge_V5); @@ -269,7 +269,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional - public static void DownToPlc(IEnumerable views) + public void DownToPlc(IEnumerable views) { foreach (var v in views) { @@ -309,7 +309,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional } } - public static ProportionalSettingView UpFromPlc(int id) + public ProportionalSettingView UpFromPlc(int id) { switch (id) { @@ -349,7 +349,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional } - public static IEnumerable UpFromPlc() + public IEnumerable UpFromPlc() { ICollection co = new List(); co.Add(Up614()); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/UpAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/UpAction.cs index 9cccf29..bab57f9 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/UpAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/UpAction.cs @@ -47,12 +47,12 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional - var views = ProportionalPlc.UpFromPlc(); + var views = new ProportionalPlc().UpFromPlc(); foreach (var v in views) { - //string sql = - // $"update ProportionalSetting set SV={v.SV},PV={v.PV} where Id={v.Id}"; - //DBHelp.ExecuteNonQuery(sql); + string sql = + $"update ProportionalSetting set SV={v.SV},PV={v.PV} where Id={v.Id}"; + DBHelp.ExecuteNonQuery(sql); } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/DownAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/DownAction.cs index afcf2bf..adcc4f5 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/DownAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/DownAction.cs @@ -51,7 +51,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight lsView.Add(view); } - WeightSettingPlc.DownToPlc(lsView); + new WeightSettingPlc().DownToPlc(lsView); } } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/FrmWeight.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/FrmWeight.cs index 2a078d1..be49300 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/FrmWeight.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/FrmWeight.cs @@ -25,7 +25,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight private void SetUpdateFromPlc() { - WeightSettingView view = WeightSettingPlc.UpFromPlc(_id); + WeightSettingView view = new WeightSettingPlc().UpFromPlc(_id); this.HighWeight.Text = view.HighWeight.ToString(CultureInfo.InvariantCulture); this.LowWeight.Text = view.LowWeight.ToString(CultureInfo.InvariantCulture); } @@ -61,7 +61,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight LowWeight = low }; - WeightSettingPlc.DownToPlc(new []{view}); + new WeightSettingPlc().DownToPlc(new []{view}); //select Id,Name,ActWeight,HighLevel,HighWeight,LowLevel,LowWeight from WeightSetting string sql =$"update WeightSetting set LowWeight={view.LowWeight},HighWeight={view.HighWeight} where Id={view.Id}"; DBHelp.ExecuteNonQuery(sql); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/UpAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/UpAction.cs index fc5f9af..1adc370 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/UpAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/UpAction.cs @@ -44,12 +44,12 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight private void DoWord() { - var views = WeightSettingPlc.UpFromPlc(); + var views = new WeightSettingPlc().UpFromPlc(); foreach (var v in views) { - //string sql = - // $"update WeightSetting set LowWeight={v.LowWeight},HighWeight={v.HighWeight} where Id={v.Id}"; - //DBHelp.ExecuteNonQuery(sql); + string sql = + $"update WeightSetting set LowWeight={v.LowWeight},HighWeight={v.HighWeight} where Id={v.Id}"; + DBHelp.ExecuteNonQuery(sql); } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/WeightSettingPlc.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/WeightSettingPlc.cs index 727f132..0d530e2 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/WeightSettingPlc.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/WeightSettingPlc.cs @@ -16,7 +16,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight - private static void Down432(WeightSettingView view) + private void Down432(WeightSettingView view) { if (null != view) { @@ -25,11 +25,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight } - static PlcWriteUtil plcWriter = new PlcWriteUtil(); + PlcWriteUtil plcWriter = new PlcWriteUtil(); - private static DB2107Helper _db2107Helper = new DB2107Helper(); + private DB2107Helper _db2107Helper = new DB2107Helper(); - private static void DownWeightSettingView(int start, WeightSettingView view) + private void DownWeightSettingView(int start, WeightSettingView view) { int hight = start + 4; int low = start + 8; @@ -40,7 +40,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight - private static WeightSettingView GetWeightSettingView(int id, Silo_HMI silo) + private WeightSettingView GetWeightSettingView(int id, Silo_HMI silo) { WeightSettingView view = new WeightSettingView() { @@ -52,7 +52,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight } - private static WeightSettingView Up432() + private WeightSettingView Up432() { WeightSettingView view = GetWeightSettingView(1, _db2107Helper.Weight.Hopper_1); @@ -60,7 +60,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight } - private static void Down446(WeightSettingView view) + private void Down446(WeightSettingView view) { if (null != view) { @@ -68,7 +68,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight } } - private static WeightSettingView Up446() + private WeightSettingView Up446() { WeightSettingView view = GetWeightSettingView(2, _db2107Helper.Weight.Hopper_2); @@ -81,7 +81,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight } - private static void Down460(WeightSettingView view) + private void Down460(WeightSettingView view) { if (null != view) { @@ -89,7 +89,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight } } - private static WeightSettingView Up460() + private WeightSettingView Up460() { WeightSettingView view = GetWeightSettingView(3, _db2107Helper.Weight.Hopper_3); @@ -101,7 +101,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight return view; } - private static void Down474(WeightSettingView view) + private void Down474(WeightSettingView view) { if (null != view) { @@ -109,7 +109,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight } } - private static WeightSettingView Up474() + private WeightSettingView Up474() { WeightSettingView view = GetWeightSettingView(4, _db2107Helper.Weight.Hopper_4); @@ -122,7 +122,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight } - private static void Down488(WeightSettingView view) + private void Down488(WeightSettingView view) { if (null != view) { @@ -130,7 +130,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight } } - private static WeightSettingView Up488() + private WeightSettingView Up488() { WeightSettingView view = GetWeightSettingView(5, _db2107Helper.Weight.Vessel_1); @@ -144,7 +144,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight - private static void Down502(WeightSettingView view) + private void Down502(WeightSettingView view) { if (null != view) { @@ -152,7 +152,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight } } - private static WeightSettingView Up502() + private WeightSettingView Up502() { WeightSettingView view = GetWeightSettingView(6, _db2107Helper.Weight.Vessel_2); @@ -164,7 +164,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight return view; } - private static void Down516(WeightSettingView view) + private void Down516(WeightSettingView view) { if (null != view) { @@ -172,7 +172,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight } } - private static WeightSettingView Up516() + private WeightSettingView Up516() { WeightSettingView view = GetWeightSettingView(7, _db2107Helper.Weight.Vessel_3); @@ -185,7 +185,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight } - private static void Down530(WeightSettingView view) + private void Down530(WeightSettingView view) { if (null != view) { @@ -193,7 +193,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight } } - private static WeightSettingView Up530() + private WeightSettingView Up530() { WeightSettingView view = GetWeightSettingView(8, _db2107Helper.Weight.Vessel_4); @@ -206,7 +206,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight } - private static void Down544(WeightSettingView view) + private void Down544(WeightSettingView view) { if (null != view) { @@ -214,7 +214,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight } } - private static WeightSettingView Up544() + private WeightSettingView Up544() { WeightSettingView view = GetWeightSettingView(9, _db2107Helper.Weight.Vessel_5); @@ -228,7 +228,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight - private static void Down558(WeightSettingView view) + private void Down558(WeightSettingView view) { if (null != view) { @@ -236,7 +236,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight } } - private static WeightSettingView Up558() + private WeightSettingView Up558() { WeightSettingView view = GetWeightSettingView(10, _db2107Helper.Weight.WScale_1); @@ -249,7 +249,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight } - private static void Down572(WeightSettingView view) + private void Down572(WeightSettingView view) { if (null != view) { @@ -257,7 +257,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight } } - private static WeightSettingView Up572() + private WeightSettingView Up572() { WeightSettingView view = GetWeightSettingView(11, _db2107Helper.Weight.WScale_2); @@ -269,7 +269,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight return view; } - private static void Down586(WeightSettingView view) + private void Down586(WeightSettingView view) { if (null != view) { @@ -277,7 +277,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight } } - private static WeightSettingView Up586() + private WeightSettingView Up586() { WeightSettingView view = GetWeightSettingView(12, _db2107Helper.Weight.WScale_3); @@ -289,7 +289,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight return view; } - private static void Down600(WeightSettingView view) + private void Down600(WeightSettingView view) { if (null != view) { @@ -297,7 +297,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight } } - private static WeightSettingView Up600() + private WeightSettingView Up600() { WeightSettingView view = GetWeightSettingView(13, _db2107Helper.Weight.WScale_4); @@ -310,7 +310,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight } - public static void DownToPlc(IEnumerable views) + public void DownToPlc(IEnumerable views) { foreach (var v in views) { @@ -359,7 +359,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight } } - public static WeightSettingView UpFromPlc(int id) + public WeightSettingView UpFromPlc(int id) { switch (id) { @@ -409,7 +409,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight - public static IEnumerable UpFromPlc() + public IEnumerable UpFromPlc() { ICollection ls = new List(); ls.Add(Up432()); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/OliveEQSetting/InItDbAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/OliveEQSetting/InItDbAction.cs index 9336f14..c1bd882 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/OliveEQSetting/InItDbAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/OliveEQSetting/InItDbAction.cs @@ -184,7 +184,7 @@ namespace Mesnac.Action.ChemicalWeighing.OliveEQSetting .FirstOrDefault(); //获取物料数据控件 - var views = ProportionalPlc.UpFromPlc(); + var views = new ProportionalPlc().UpFromPlc(); foreach (var v in views) { //if(v.SV>0 || v.PV > 0) @@ -217,7 +217,7 @@ namespace Mesnac.Action.ChemicalWeighing.OliveEQSetting .FirstOrDefault(); //获取物料数据控件 - var views = WeightSettingPlc.UpFromPlc(); + var views = new WeightSettingPlc().UpFromPlc(); foreach (var v in views) { //if(v.LowWeight>0 || v.HighWeight > 0) @@ -248,7 +248,7 @@ namespace Mesnac.Action.ChemicalWeighing.OliveEQSetting - var view = ElectricalPlc.UpFromPlc(); + var view = new ElectricalPlc().UpFromPlc(); foreach (var v in view) { //if (v.Speed > 0) @@ -278,7 +278,7 @@ namespace Mesnac.Action.ChemicalWeighing.OliveEQSetting .FirstOrDefault(); //获取物料数据控件 - var view = MetagePlc.UpFromPlc(); + var view = new MetagePlc().UpFromPlc(); foreach (var v in view) { //if(v.HighSpeed > 0 || v.LowSpeed>0 || v.WeightSlow>0 || v.Precut>0 || v.JogTime > 0)