change - 榄菊设备参数压力管理 partchange

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/MaterialInfoTypeHelp.cs

@@ -17,7 +17,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMaterial
 
     public class MyNameValueStr
     {
-        public String Id { get; set; }
+        public string Id { get; set; }
         public string Name { get; set; }
     }
 

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/FrmPressureUpdate.Designer.cs

@@ -45,18 +45,15 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure
             // 
             // HighLimit
             // 
-            this.HighLimit.Enabled = false;
             this.HighLimit.Location = new System.Drawing.Point(108, 58);
             this.HighLimit.Margin = new System.Windows.Forms.Padding(5);
             this.HighLimit.MaxLength = 100;
             this.HighLimit.Name = "HighLimit";
             this.HighLimit.Size = new System.Drawing.Size(129, 21);
             this.HighLimit.TabIndex = 47;
-            this.HighLimit.TextChanged += new System.EventHandler(this.HighLimit_TextChanged);
             // 
             // LowLimit
             // 
-            this.LowLimit.Enabled = false;
             this.LowLimit.Location = new System.Drawing.Point(108, 27);
             this.LowLimit.Margin = new System.Windows.Forms.Padding(5);
             this.LowLimit.MaxLength = 100;
@@ -139,6 +136,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure
             this.Controls.Add(this.label4);
             this.Controls.Add(this.label3);
             this.Controls.Add(this.label1);
+            this.ForeColor = System.Drawing.SystemColors.ControlText;
             this.Name = "FrmPressureUpdate";
             this.Text = "需改压力参数";
             this.ResumeLayout(false);

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/FrmPressureUpdate.cs

@@ -85,6 +85,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure
 
             PressureSettingView view = new PressureSettingView()
             {
+                Id = _id,
                 HighLimit = b,
                 LowLimit = a,
                 Alarm = Convert.ToInt16(Alarm.SelectedValue)
@@ -95,13 +96,14 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure
                 view
             });
 
+            string sql =
+                    $"update  PressureSetting set LowLimit={view.LowLimit},HighLimit={view.HighLimit} where Id={view.Id}";
+            DBHelp.ExecuteNonQuery(sql);
+
             this.DialogResult = System.Windows.Forms.DialogResult.OK;
             
         }
 
-        private void HighLimit_TextChanged(object sender, EventArgs e)
-        {
 
-        }
     }
 }

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/InitDbAction.cs

@@ -47,7 +47,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure
             }
             else
             {
-                ICSharpCode.Core.LoggingService<InitDbAction>.Warn("刷新物料信息失败：物料数据控件为Null...");
+                ICSharpCode.Core.LoggingService<InitDbAction>.Warn("刷新物料信息失败：压力数据控件为Null...");
             }
         }
 

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/UpAction.cs

@@ -34,7 +34,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure
             foreach (var v in pressureSettingViews)
             {
                 string sql =
-                    $"update  PressureSetting set LowLimit={v.LowLimit},HighLimit={v.LowLimit} where Id={v.Id}";
+                    $"update  PressureSetting set LowLimit={v.LowLimit},HighLimit={v.HighLimit} where Id={v.Id}";
                 DBHelp.ExecuteNonQuery(sql);
             }
             

Main/MCEdit/Data/MCProject/nodeDevice.xml

@@ -13,7 +13,7 @@
       </Connection>
     </Main>
     <Group>
-      <Group name="B1" block="1165" start="0" len="1129" access="ReadWrite" remark="ParametersWithPc" isautoread="False">
+      <Group name="B1" block="1165" start="0" len="1129" access="ReadWrite" remark="ParametersWithPc" isautoread="True">
         <Data>
           <Data name="FirstWord" runname="FirstWord" start="0" len="1" method="Default_Bit(0,1)" max="" issave="False" subtractor="" remark="FirstWord" />
           <Data name="WatchDog" runname="WatchDog" start="1" len="1" method="Default_ShortDiv()" max="" issave="False" subtractor="" remark="系统通用参数" />
@@ -758,7 +758,7 @@
           <Data name="PV2DDB01" runname="PV2DDB01" start="1028" len="1" method="Default_Bit(3,1)" max="" issave="False" subtractor="" remark="" />
         </Data>
       </Group>
-      <Group name="reportDataToPC" block="146" start="0" len="2504" access="ReadWrite" remark="reportDataToPC" isautoread="False">
+      <Group name="reportDataToPC" block="146" start="0" len="2504" access="ReadWrite" remark="reportDataToPC" isautoread="True">
         <Data>
           <Data name="dryerA_dos0_eqNo" runname="dryerA_dos0_eqNo" start="0" len="1" method="Default_ShortDiv()" max="" issave="False" subtractor="" remark="设备编号" />
           <Data name="dryerA_dos0_batch" runname="dryerA_dos0_batch" start="1" len="1" method="Default_ShortDiv()" max="" issave="False" subtractor="" remark="批次号" />
@@ -2610,7 +2610,7 @@
           <Data name="wetMixingH_9_mixSpeed" runname="wetMixingH_9_mixSpeed" start="2502" len="2" method="Default_Float()" max="" issave="False" subtractor="" remark="速度" />
         </Data>
       </Group>
-      <Group name="RecipeDataFromPC" block="2104" start="0" len="1710" access="ReadWrite" remark="" isautoread="False">
+      <Group name="RecipeDataFromPC" block="146" start="0" len="1710" access="ReadWrite" remark="" isautoread="True">
         <Data>
           <Data name="FirstWord" runname="FirstWord" start="0" len="1" method="Default_ShortDiv()" max="" issave="False" subtractor="" remark="预留" />
           <Data name="recipeCode" runname="recipeCode" start="1" len="1" method="Default_ShortDiv()" max="" issave="False" subtractor="" remark="配方代码" />
@@ -3758,7 +3758,7 @@
           <Data name="Weter_M8Step9_tolerance" runname="Weter_M8Step9_tolerance" start="1787" len="2" method="Default_Float()" max="" issave="False" subtractor="" remark="设定公差" />
         </Data>
       </Group>
-      <Group name="DB2102-valveInitDB" block="2102" start="0" len="92" access="ReadWrite" remark="valveInitDB" isautoread="False">
+      <Group name="DB2102-valveInitDB" block="2102" start="0" len="91" access="ReadWrite" remark="valveInitDB" isautoread="True">
         <Data>
           <Data name="BU1ASF01_ManualMode" runname="BU1ASF01_ManualMode" start="0" len="1" method="Default_Bit(0,1)" max="" issave="True" subtractor="" remark="手动模式" />
           <Data name="BU1ASF01_AutoMode" runname="BU1ASF01_AutoMode" start="0" len="1" method="Default_Bit(1,1)" max="" issave="True" subtractor="" remark="自动模式" />
@@ -4987,7 +4987,7 @@
           <Data name="BU8GEB01_P" runname="BU8GEB01_P" start="90" len="1" method="Default_Bit(12,1)" max="" issave="True" subtractor="" remark="状态态志" />
         </Data>
       </Group>
-      <Group name="DB2103-motorInitDB" block="2103" start="0" len="201" access="ReadWrite" remark="motorInitDB" isautoread="False">
+      <Group name="DB2103-motorInitDB" block="2103" start="0" len="201" access="ReadWrite" remark="motorInitDB" isautoread="True">
         <Data>
           <Data name="DM1ASI01_ManualMode" runname="DM1ASI01_ManualMode" start="0" len="1" method="Default_Bit(0,1)" max="" issave="True" subtractor="" remark="手动模式" />
           <Data name="DM1ASI01_AutoMode" runname="DM1ASI01_AutoMode" start="0" len="1" method="Default_Bit(1,1)" max="" issave="True" subtractor="" remark="自动模式" />
@@ -5867,7 +5867,7 @@
           <Data name="DM8GEM_ACT_Speed" runname="DM8GEM_ACT_Speed" start="199" len="2" method="Default_Float()" max="" issave="True" subtractor="" remark="运行速度反馈0-200" />
         </Data>
       </Group>
-      <Group name="FC3_Analog" block="1" start="0" len="276" access="ReadWrite" remark="" isautoread="False">
+      <Group name="FC3_Analog" block="5" start="0" len="276" access="ReadWrite" remark="" isautoread="True">
         <Data>
           <Data name="PR1DBT01_Min" runname="PR1DBT01_Min" start="0" len="1" method="Default_ShortDiv()" max="" issave="False" subtractor="" remark="" />
           <Data name="PR1DBT01_Max" runname="PR1DBT01_Max" start="1" len="1" method="Default_ShortDiv()" max="" issave="False" subtractor="" remark="" />
@@ -6147,7 +6147,7 @@
           <Data name="From_SiloO_Alarm" runname="From_SiloO_Alarm" start="275" len="1" method="Default_Bit(0,1)" max="" issave="False" subtractor="" remark="" />
         </Data>
       </Group>
-      <Group name="FC5_Motor" block="91" start="0" len="46" access="ReadWrite" remark="" isautoread="False">
+      <Group name="FC5_Motor" block="91" start="0" len="46" access="ReadWrite" remark="" isautoread="True">
         <Data>
           <Data name="DM1GDP01_ManualMode" runname="DM1GDP01_ManualMode" start="0" len="1" method="Default_Bit(0,1)" max="" issave="True" subtractor="" remark="手动模式" />
           <Data name="DM1GDP01_AutoMode" runname="DM1GDP01_AutoMode" start="0" len="1" method="Default_Bit(1,1)" max="" issave="True" subtractor="" remark="自动模式" />
@@ -6429,7 +6429,7 @@
           <Data name="DM1GDS12_ActSpeed" runname="DM1GDS12_ActSpeed" start="44" len="2" method="Default_Float()" max="" issave="False" subtractor="" remark="" />
         </Data>
       </Group>
-      <Group name="FC4_Valve" block="90" start="0" len="77" access="ReadWrite" remark="" isautoread="true">
+      <Group name="FC4_Valve" block="90" start="0" len="77" access="ReadWrite" remark="" isautoread="True">
         <Data>
           <Data name="BU3DBT06_ManualMode" runname="BU3DBT06_ManualMode" start="0" len="1" method="Default_Bit(0,1)" max="" issave="True" subtractor="" remark="手动模式" />
           <Data name="BU3DBT06_AutoMode" runname="BU3DBT06_AutoMode" start="0" len="1" method="Default_Bit(1,1)" max="" issave="True" subtractor="" remark="自动模式" />
@@ -7665,7 +7665,7 @@
           <Data name="SV1GDS01_P1" runname="SV1GDS01_P1" start="76" len="1" method="Default_Bit(15,1)" max="" issave="True" subtractor="" remark="" />
         </Data>
       </Group>
-      <Group name="FC16_Level" block="151" start="0" len="3" access="ReadWrite" remark="" isautoread="False">
+      <Group name="FC16_Level" block="91" start="0" len="3" access="ReadWrite" remark="" isautoread="True">
         <Data>
           <Data name="Atank1" runname="Atank1" start="0" len="1" method="Default_Bit(0,1)" max="" issave="True" subtractor="" remark="" />
           <Data name="Atank2" runname="Atank2" start="0" len="1" method="Default_Bit(1,1)" max="" issave="True" subtractor="" remark="" />

Main/MCEdit/Data/MCProject/nodeForm/FormPressureSetting.xml

@@ -3,7 +3,7 @@
     <Object type="Mesnac.Controls.Default.MCDataGridView, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCDataGridView1" children="Controls">
       <Property name="DisplayAllColumn">False</Property>
       <Property name="DgvColumn">
-        <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAABQAAAHwAAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAADQMFBAAAAChNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zAgAAAApfZmlsZWREYXRhDF9kaXNwbGF5TmFtZQEBAgAAAAYJAAAAAklkBgoAAAAG57yW5Y+3AQUAAAAEAAAABgsAAAAETmFtZQYMAAAABuWQjeensAEGAAAABAAAAAYNAAAACExvd0xpbWl0Bg4AAAAP5L2O5Y6L6K6+5a6a5YC8AQcAAAAEAAAABg8AAAAJSGlnaExpbWl0BhAAAAAP6auY5Y6L6K6+5a6a5YC8AQgAAAAEAAAABhEAAAAKQWxhcm1WYWx1ZQYSAAAADOi2heWOi+aKpeitpgs=</Binary>
+        <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAABgAAAIoAAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAACQkAAAANAgUEAAAAKE1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnMCAAAACl9maWxlZERhdGEMX2Rpc3BsYXlOYW1lAQECAAAABgoAAAACSWQGCwAAAAbnvJblj7cBBQAAAAQAAAAGDAAAAAROYW1lBg0AAAAG5ZCN56ewAQYAAAAEAAAABg4AAAALQWN0dWFsVmFsdWUGDwAAAAnlrp7pmYXlgLwBBwAAAAQAAAAGEAAAAAhMb3dMaW1pdAYRAAAAD+S9juWOi+iuvuWumuWAvAEIAAAABAAAAAYSAAAACUhpZ2hMaW1pdAYTAAAAD+mrmOWOi+iuvuWumuWAvAEJAAAABAAAAAYUAAAACkFsYXJtVmFsdWUGFQAAAAzotoXljovmiqXoraYL</Binary>
       </Property>
       <Property name="ClickActionList">
         <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAABAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>