From 4a9cc5c48086d9332fc19ea6ba3302d201aa7383 Mon Sep 17 00:00:00 2001
From: wangsr <gxhsoulstar@163.com>
Date: Mon, 28 Aug 2023 13:47:44 +0800
Subject: [PATCH] change - delete sql change

---
 .../LjMetageFormula/StockMaterialDb.cs                         | 2 +-
 .../MCEdit/Data/MCProject/nodeForm/FormProportionalSetting.xml | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/StockMaterialDb.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/StockMaterialDb.cs
index 62ec751..c9a92eb 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/StockMaterialDb.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/StockMaterialDb.cs
@@ -83,7 +83,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula
 
         public static void SoftDel(string id)
         {
-            string sql = $"delete from lj_metage where IsEnable=0 where id='{id}'";
+            string sql = $"delete from lj_metage where IsEnable=0 and id='{id}'";
             ExecuteNonQuery(sql);
         }
 
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormProportionalSetting.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormProportionalSetting.xml
index 94d2de6..eca2d88 100644
--- a/Main/MCEdit/Data/MCProject/nodeForm/FormProportionalSetting.xml
+++ b/Main/MCEdit/Data/MCProject/nodeForm/FormProportionalSetting.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/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAAAwAAAH8AAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAANBQUEAAAAKE1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnMCAAAACl9maWxlZERhdGEMX2Rpc3BsYXlOYW1lAQECAAAABgcAAAACSWQGCAAAAAbnvJblj7cBBQAAAAQAAAAGCQAAAAROYW1lBgoAAAAG5ZCN56ewAQYAAAAEAAAABgsAAAACU1YGDAAAAAnorr7nva7lgLwL</Binary>
+        <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAABAAAAI4AAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAA0EBQQAAAAoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAKX2ZpbGVkRGF0YQxfZGlzcGxheU5hbWUBAQIAAAAGCAAAAAJJZAYJAAAABue8luWPtwEFAAAABAAAAAYKAAAABE5hbWUGCwAAAAblkI3np7ABBgAAAAQAAAAGDAAAAAJQVgYNAAAACeWunumZheWAvAEHAAAABAAAAAYOAAAAAlNWBg8AAAAJ6K6+572u5YC8Cw==</Binary>
       </Property>
       <Property name="ClickActionList">
         <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAABAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
@@ -25,6 +25,7 @@
       <Property name="DbOptionType">None</Property>
       <Property name="MCVisible">True</Property>
       <Property name="MCEnabled">True</Property>
+      <Property name="AutoGenerateColumns">False</Property>
       <Property name="BackgroundColor">ControlLightLight</Property>
       <Property name="ColumnHeadersHeight">30</Property>
       <Property name="MultiSelect">False</Property>