From 085da24bf0e975ee42055cc5b179c4c03f698b85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=94=84=E5=A4=B4?= Date: Tue, 11 Jun 2024 18:43:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A6=84=E8=8F=8A=E8=AE=BE=E5=A4=87=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E5=8E=8B=E5=8A=9B=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AutoControl/InitAction.cs | 2 +- .../LjElectrical/UpAction.cs | 6 +- .../LjMetage/UpAction.cs | 6 +- .../LjPressure/DownAction.cs | 2 +- .../LjPressure/FrmPressureUpdate.cs | 4 +- .../LjPressure/PressurePLC.cs | 136 +++++++++--------- .../LjPressure/UpAction.cs | 2 +- .../LjProportional/UpAction.cs | 6 +- .../LjWeight/UpAction.cs | 6 +- .../OliveEQSetting/InItDbAction.cs | 64 ++++----- Main/MCEdit/Data/MCProject/SCWSProject2.mprj | 1 - Main/MCRun/App.config | 2 +- 12 files changed, 118 insertions(+), 119 deletions(-) diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs index 09d4c60..a37a1f2 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs @@ -94,7 +94,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl private void StateRefresh(object sender, EventArgs e) { - if (GetAllDbMCControlsByOption(DbOptionTypes.QueryAndModify).Count == 0) + if (GetAllControls().Count == 0) { timer.Stop(); timer.Dispose(); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/UpAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/UpAction.cs index 9187e25..050ad2f 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/UpAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/UpAction.cs @@ -32,9 +32,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical var view = 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/UpAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/UpAction.cs index a49ead7..39bf513 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/UpAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/UpAction.cs @@ -46,9 +46,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage var view = 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/LjPressure/DownAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/DownAction.cs index 7c08dd5..c0d3253 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/DownAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/DownAction.cs @@ -55,7 +55,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure lsView.Add(view); } - PressurePLC.DownToPlc(lsView); + new PressurePLC().DownToPlc(lsView); } } } \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/FrmPressureUpdate.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/FrmPressureUpdate.cs index 6412bf8..f5bf1dd 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/FrmPressureUpdate.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/FrmPressureUpdate.cs @@ -46,7 +46,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure return; } - var v = PressurePLC.UpdateFromPlc(id); + var v = new PressurePLC().UpdateFromPlc(id); if (null!=v) { this.LowLimit.Text = v.LowLimit.ToString(CultureInfo.InvariantCulture); @@ -104,7 +104,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure }; - PressurePLC.DownToPlc(new List() + new PressurePLC().DownToPlc(new List() { view }); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/PressurePLC.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/PressurePLC.cs index c59f669..9d8c21d 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/PressurePLC.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/PressurePLC.cs @@ -12,11 +12,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure { public class PressurePLC { - private static BasePlcHelper GetPlcHelper => BasePlcHelper.Instance; + #region 压送秤A气源压力 DBW12 数组Id=1 - private static void DownDbw12(PressureSettingView view) + private void DownDbw12(PressureSettingView view) { @@ -29,9 +29,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } } - static PlcWriteUtil plcWriter = new PlcWriteUtil(); + PlcWriteUtil plcWriter = new PlcWriteUtil(); - private static void DownDbPressureSettingView(int start, PressureSettingView view) + private void DownDbPressureSettingView(int start, PressureSettingView view) { int begin = start; int end = begin + 4; @@ -41,10 +41,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } - private static DB2107Helper _db2107Helper = new DB2107Helper(); + DB2107Helper _db2107Helper = new DB2107Helper(); - private static PressureSettingView UpDbw12() + private PressureSettingView UpDbw12() { PressureSettingView view = new PressureSettingView(); @@ -58,7 +58,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure #endregion - private static void DownDbw26(PressureSettingView view) + private void DownDbw26(PressureSettingView view) { // PlcWriter plcWriter=new PlcWriter(); @@ -75,7 +75,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } } - private static PressureSettingView UpDbw26() + private PressureSettingView UpDbw26() { var v1 = _db2107Helper.Pressure.TopPressure_V1; @@ -84,7 +84,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } - static PressureSettingView GetSettingView(int id, Pressure_HMI v1) + public PressureSettingView GetSettingView(int id, Pressure_HMI v1) { PressureSettingView view = new PressureSettingView(); view.Id = id; @@ -94,7 +94,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } - private static void DownDbw40(PressureSettingView view) + private void DownDbw40(PressureSettingView view) { if (view != null) { @@ -102,7 +102,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } } - private static PressureSettingView UpDbw40() + private PressureSettingView UpDbw40() { PressureSettingView view = GetSettingView(3, _db2107Helper.Pressure.LinePressure_V1); @@ -114,7 +114,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } - private static void DownDbw54(PressureSettingView view) + private void DownDbw54(PressureSettingView view) { if (view != null) { @@ -122,7 +122,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } } - private static PressureSettingView UpDbw54() + private PressureSettingView UpDbw54() { PressureSettingView view = GetSettingView(4, _db2107Helper.Pressure.MainPress_V2); @@ -134,7 +134,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } - private static void DownDbw68(PressureSettingView view) + private void DownDbw68(PressureSettingView view) { if (view != null) { @@ -142,7 +142,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } } - private static PressureSettingView UpDbw68() + private PressureSettingView UpDbw68() { PressureSettingView view = GetSettingView(5, _db2107Helper.Pressure.TopPressure_V2); @@ -154,7 +154,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } - private static void DownDbw82(PressureSettingView view) + private void DownDbw82(PressureSettingView view) { if (view != null) { @@ -162,7 +162,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } } - private static PressureSettingView UpDbw82() + private PressureSettingView UpDbw82() { PressureSettingView view = GetSettingView(6, _db2107Helper.Pressure.LinePressure_V2); @@ -173,7 +173,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure return view; } - private static void DownDbw96(PressureSettingView view) + private void DownDbw96(PressureSettingView view) { if (view != null) { @@ -181,7 +181,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } } - private static PressureSettingView UpDbw96() + private PressureSettingView UpDbw96() { PressureSettingView view = GetSettingView(7, _db2107Helper.Pressure.MainPress_V3); @@ -193,7 +193,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } - private static void DownDbw110(PressureSettingView view) + private void DownDbw110(PressureSettingView view) { if (view != null) { @@ -201,7 +201,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } } - private static PressureSettingView UpDbw110() + private PressureSettingView UpDbw110() { PressureSettingView view = GetSettingView(8, _db2107Helper.Pressure.TopPressure_V3); @@ -212,7 +212,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure return view; } - private static void DownDbw124(PressureSettingView view) + private void DownDbw124(PressureSettingView view) { if (view != null) { @@ -220,7 +220,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } } - private static PressureSettingView UpDbw124() + private PressureSettingView UpDbw124() { PressureSettingView view = GetSettingView(9, _db2107Helper.Pressure.LinePressure_V3); @@ -234,14 +234,14 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } - private static void DownDbw138(PressureSettingView view) + private void DownDbw138(PressureSettingView view) { if (view != null) { DownDbPressureSettingView(142, view); } } - private static PressureSettingView UpDbw138() + private PressureSettingView UpDbw138() { PressureSettingView view = GetSettingView(10, _db2107Helper.Pressure.MainPress_V4); @@ -255,7 +255,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } - private static void DownDbw152(PressureSettingView view) + private void DownDbw152(PressureSettingView view) { if (view != null) { @@ -263,7 +263,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } } - private static PressureSettingView UpDbw152() + private PressureSettingView UpDbw152() { PressureSettingView view = GetSettingView(11, _db2107Helper.Pressure.TopPressure_V4); @@ -276,7 +276,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure return view; } - private static void DownDbw166(PressureSettingView view) + private void DownDbw166(PressureSettingView view) { if (view != null) { @@ -284,7 +284,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } } - private static PressureSettingView UpDbw166() + private PressureSettingView UpDbw166() { PressureSettingView view = GetSettingView(12, _db2107Helper.Pressure.LinePressure_V4); @@ -298,7 +298,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } - private static void DownDbw180(PressureSettingView view) + private void DownDbw180(PressureSettingView view) { if (view != null) { @@ -306,7 +306,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } } - private static PressureSettingView UpDbw180() + private PressureSettingView UpDbw180() { PressureSettingView view = GetSettingView(13, _db2107Helper.Pressure.MainPress_V5); @@ -320,7 +320,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } - private static void DownDbw194(PressureSettingView view) + private void DownDbw194(PressureSettingView view) { if (view != null) { @@ -328,7 +328,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } } - private static PressureSettingView UpDbw194() + private PressureSettingView UpDbw194() { PressureSettingView view = GetSettingView(14, _db2107Helper.Pressure.TopPressure_V5); @@ -341,7 +341,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure return view; } - private static void DownDbw208(PressureSettingView view) + private void DownDbw208(PressureSettingView view) { if (view != null) { @@ -349,7 +349,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } } - private static PressureSettingView UpDbw208() + private PressureSettingView UpDbw208() { PressureSettingView view = GetSettingView(15, _db2107Helper.Pressure.LinePressure_V5); @@ -364,7 +364,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure - private static void DownDBW222(PressureSettingView view) + private void DownDBW222(PressureSettingView view) { if (view != null) { @@ -372,7 +372,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } } - private static PressureSettingView UpDbw222() + private PressureSettingView UpDbw222() { PressureSettingView view = GetSettingView(16, _db2107Helper.Pressure.PressDaybin_B1); @@ -385,7 +385,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure return view; } - private static void DownDBW236(PressureSettingView view) + private void DownDBW236(PressureSettingView view) { if (view != null) { @@ -393,7 +393,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } } - private static PressureSettingView UpDbw236() + private PressureSettingView UpDbw236() { PressureSettingView view = GetSettingView(17, _db2107Helper.Pressure.PressDaybin_B2); @@ -406,7 +406,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure return view; } - private static void DownDBW250(PressureSettingView view) + private void DownDBW250(PressureSettingView view) { if (view != null) { @@ -414,7 +414,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } } - private static PressureSettingView UpDbw250() + private PressureSettingView UpDbw250() { PressureSettingView view = GetSettingView(18, _db2107Helper.Pressure.PressDaybin_B3); @@ -427,7 +427,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure return view; } - private static void DownDBW264(PressureSettingView view) + private void DownDBW264(PressureSettingView view) { if (view != null) { @@ -435,7 +435,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } } - private static PressureSettingView UpDbw264() + private PressureSettingView UpDbw264() { PressureSettingView view = GetSettingView(19, _db2107Helper.Pressure.PressDaybin_B4); @@ -448,7 +448,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure return view; } - private static void DownDBW278(PressureSettingView view) + private void DownDBW278(PressureSettingView view) { if (view != null) { @@ -456,7 +456,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } } - private static PressureSettingView UpDbw278() + private PressureSettingView UpDbw278() { PressureSettingView view = GetSettingView(20, _db2107Helper.Pressure.PressDaybin_B5); @@ -469,14 +469,14 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure return view; } - private static void DownDBW292(PressureSettingView view) + private void DownDBW292(PressureSettingView view) { if (view != null) { DownDbPressureSettingView(296, view); } } - private static PressureSettingView UpDbw292() + private PressureSettingView UpDbw292() { PressureSettingView view = GetSettingView(21, _db2107Helper.Pressure.PressDaybin_B6); @@ -489,7 +489,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure return view; } - private static void DownDBW306(PressureSettingView view) + private void DownDBW306(PressureSettingView view) { if (view != null) { @@ -497,7 +497,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } } - private static PressureSettingView UpDbw306() + private PressureSettingView UpDbw306() { PressureSettingView view = GetSettingView(22, _db2107Helper.Pressure.PressDaybin_B7); @@ -510,7 +510,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure return view; } - private static void DownDBW320(PressureSettingView view) + private void DownDBW320(PressureSettingView view) { if (view != null) { @@ -518,7 +518,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } } - private static PressureSettingView UpDbw320() + private PressureSettingView UpDbw320() { PressureSettingView view = GetSettingView(23, _db2107Helper.Pressure.PressDaybin_B8); @@ -531,7 +531,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure return view; } - private static void DownDBW334(PressureSettingView view) + private void DownDBW334(PressureSettingView view) { if (view != null) { @@ -539,7 +539,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } } - private static PressureSettingView UpDbw334() + private PressureSettingView UpDbw334() { PressureSettingView view = GetSettingView(24, _db2107Helper.Pressure.PressDaybin_B9); @@ -552,7 +552,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure return view; } - private static void DownDBW348(PressureSettingView view) + private void DownDBW348(PressureSettingView view) { if (view != null) { @@ -560,7 +560,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } } - private static PressureSettingView UpDbw348() + private PressureSettingView UpDbw348() { PressureSettingView view = GetSettingView(25, _db2107Helper.Pressure.PressDaybin_B10); @@ -573,7 +573,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure return view; } - private static void DownDBW362(PressureSettingView view) + private void DownDBW362(PressureSettingView view) { if (view != null) { @@ -581,7 +581,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } } - private static PressureSettingView UpDbw362() + private PressureSettingView UpDbw362() { PressureSettingView view = GetSettingView(26, _db2107Helper.Pressure.PressDaybin_B11); @@ -594,7 +594,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure return view; } - private static void DownDBW376(PressureSettingView view) + private void DownDBW376(PressureSettingView view) { if (view != null) { @@ -602,7 +602,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } } - private static PressureSettingView UpDbw376() + private PressureSettingView UpDbw376() { PressureSettingView view = GetSettingView(27, _db2107Helper.Pressure.PressDaybin_B12); @@ -616,7 +616,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } - private static void DownDBW390(PressureSettingView view) + private void DownDBW390(PressureSettingView view) { if (view != null) { @@ -624,7 +624,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } } - private static PressureSettingView UpDbw390() + private PressureSettingView UpDbw390() { PressureSettingView view = GetSettingView(28, _db2107Helper.Pressure.PR2PCP01); @@ -638,7 +638,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } - private static void DownDBW404(PressureSettingView view) + private void DownDBW404(PressureSettingView view) { if (view != null) { @@ -646,7 +646,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } } - private static PressureSettingView UpDbw404() + private PressureSettingView UpDbw404() { PressureSettingView view = GetSettingView(29, _db2107Helper.Pressure.PR2PCP02); @@ -660,7 +660,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } - private static void DownDBW418(PressureSettingView view) + private void DownDBW418(PressureSettingView view) { if (view != null) { @@ -668,7 +668,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } } - private static PressureSettingView UpDbw418() + private PressureSettingView UpDbw418() { PressureSettingView view = GetSettingView(30, _db2107Helper.Pressure.PR2PCP03); @@ -686,7 +686,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure /// 下发到plc /// /// - public static void DownToPlc(List ls) + public void DownToPlc(List ls) { foreach (var pressureSettingView in ls) { @@ -816,7 +816,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure /// 下发到plc /// /// - public static List UpdateFromPlc() + public List UpdateFromPlc() { List ls = new List @@ -860,7 +860,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } - public static PressureSettingView UpdateFromPlc(int id) + public PressureSettingView UpdateFromPlc(int id) { PressureSettingView view = new PressureSettingView(); switch (id) diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/UpAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/UpAction.cs index 7be6b7c..c09d568 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/UpAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/UpAction.cs @@ -38,7 +38,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure return; } - var pressureSettingViews = PressurePLC.UpdateFromPlc(); + var pressureSettingViews = new PressurePLC().UpdateFromPlc(); foreach (var v in pressureSettingViews) { string sql = diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/UpAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/UpAction.cs index 91ec63f..9cccf29 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/UpAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/UpAction.cs @@ -50,9 +50,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjProportional var views = 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/UpAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/UpAction.cs index 5b7a60e..fc5f9af 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/UpAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/UpAction.cs @@ -47,9 +47,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight var views = 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/OliveEQSetting/InItDbAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/OliveEQSetting/InItDbAction.cs index 61de016..9336f14 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/OliveEQSetting/InItDbAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/OliveEQSetting/InItDbAction.cs @@ -149,17 +149,17 @@ namespace Mesnac.Action.ChemicalWeighing.OliveEQSetting //table.Rows.Clear(); - var pressureSettingViews = PressurePLC.UpdateFromPlc(); + var pressureSettingViews = new PressurePLC().UpdateFromPlc(); foreach (var v in pressureSettingViews) { - if(v.LowLimit>0 || v.HighLimit > 0) - { - string sql = - $"update PressureSetting set LowLimit={v.LowLimit},HighLimit={v.HighLimit} where Id={v.Id}"; - DBHelp.ExecuteNonQuery(sql); - } + //if(v.LowLimit>0 || v.HighLimit > 0) + //{ + // string sql = + // $"update PressureSetting set LowLimit={v.LowLimit},HighLimit={v.HighLimit} where Id={v.Id}"; + // DBHelp.ExecuteNonQuery(sql); + //} } @@ -187,12 +187,12 @@ namespace Mesnac.Action.ChemicalWeighing.OliveEQSetting var views = ProportionalPlc.UpFromPlc(); foreach (var v in views) { - if(v.SV>0 || v.PV > 0) - { - string sql = - $"update ProportionalSetting set SV={v.SV},PV={v.PV} where Id={v.Id}"; - DBHelp.ExecuteNonQuery(sql); - } + //if(v.SV>0 || v.PV > 0) + //{ + // string sql = + // $"update ProportionalSetting set SV={v.SV},PV={v.PV} where Id={v.Id}"; + // DBHelp.ExecuteNonQuery(sql); + //} } @@ -220,12 +220,12 @@ namespace Mesnac.Action.ChemicalWeighing.OliveEQSetting var views = WeightSettingPlc.UpFromPlc(); foreach (var v in views) { - if(v.LowWeight>0 || v.HighWeight > 0) - { - string sql = - $"update WeightSetting set LowWeight={v.LowWeight},HighWeight={v.HighWeight} where Id={v.Id}"; - DBHelp.ExecuteNonQuery(sql); - } + //if(v.LowWeight>0 || v.HighWeight > 0) + //{ + // string sql = + // $"update WeightSetting set LowWeight={v.LowWeight},HighWeight={v.HighWeight} where Id={v.Id}"; + // DBHelp.ExecuteNonQuery(sql); + //} } @@ -251,12 +251,12 @@ namespace Mesnac.Action.ChemicalWeighing.OliveEQSetting var view = ElectricalPlc.UpFromPlc(); foreach (var v in view) { - if (v.Speed > 0) - { - string sql = - $"update ElectricalSetting set Speed={v.Speed} where Id={v.Id}"; - DBHelp.ExecuteNonQuery(sql); - } + //if (v.Speed > 0) + //{ + // string sql = + // $"update ElectricalSetting set Speed={v.Speed} where Id={v.Id}"; + // DBHelp.ExecuteNonQuery(sql); + //} } @@ -281,13 +281,13 @@ namespace Mesnac.Action.ChemicalWeighing.OliveEQSetting var view = MetagePlc.UpFromPlc(); foreach (var v in view) { - if(v.HighSpeed > 0 || v.LowSpeed>0 || v.WeightSlow>0 || v.Precut>0 || v.JogTime > 0) - { - 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); - } + //if(v.HighSpeed > 0 || v.LowSpeed>0 || v.WeightSlow>0 || v.Precut>0 || v.JogTime > 0) + //{ + // 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/Main/MCEdit/Data/MCProject/SCWSProject2.mprj b/Main/MCEdit/Data/MCProject/SCWSProject2.mprj index eaab218..1baf9a1 100644 --- a/Main/MCEdit/Data/MCProject/SCWSProject2.mprj +++ b/Main/MCEdit/Data/MCProject/SCWSProject2.mprj @@ -17,7 +17,6 @@ - diff --git a/Main/MCRun/App.config b/Main/MCRun/App.config index 3e0d4fd..445edf0 100644 --- a/Main/MCRun/App.config +++ b/Main/MCRun/App.config @@ -5,7 +5,7 @@ - +