From 59fb13fa4857f7e8b32d8e70746192483d334d79 Mon Sep 17 00:00:00 2001
From: nodyang <yangw@outlook.com>
Date: Mon, 7 Aug 2023 20:52:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=A9=E6=96=99=E5=92=8C?=
 =?UTF-8?q?=E5=A4=A7=E4=BB=93=E7=9A=84=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LjMetageFormula/FrmMetageFormula.cs               | 11 ++---------
 Main/MCEdit/Data/MCProject/nodeForm/FormStock.xml     |  4 ++--
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/FrmMetageFormula.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/FrmMetageFormula.cs
index eab7417..5189a63 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/FrmMetageFormula.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/FrmMetageFormula.cs
@@ -67,15 +67,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula
         private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
         {
             IList<MyNameValue> ls = null;
-            //表示大仓的物料
-            if (DrpType.SelectedValue.ToString() == "1")
-            {
-                ls = StockMaterialDb.GetStockByMtypIdMId(Convert.ToInt32(DrpType.SelectedValue), Convert.ToInt32(comboBox1.SelectedValue));
-            }
-            else
-            {
-                ls = DaybinMaterialDb.GetStockByMtypIdMId(Convert.ToInt32(DrpType.SelectedValue), Convert.ToInt32(comboBox1.SelectedValue));
-            }
+           
+            ls = StockMaterialDb.GetStockByMtypIdMId(Convert.ToInt32(DrpType.SelectedValue), Convert.ToInt32(comboBox1.SelectedValue));
 
             if (ls == null || ls.Count == 0)
             {
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormStock.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormStock.xml
index 4d46cd9..1ed7202 100644
--- a/Main/MCEdit/Data/MCProject/nodeForm/FormStock.xml
+++ b/Main/MCEdit/Data/MCProject/nodeForm/FormStock.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/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAACgAAAK0AAAAHAwAAAAABAAAAEAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAACQkAAAAJCgAAAAkLAAAACQwAAAAJDQAAAA0GBQQAAAAoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAKX2ZpbGVkRGF0YQxfZGlzcGxheU5hbWUBAQIAAAAGDgAAAAJpZAYPAAAABuW6j+WPtwEFAAAABAAAAAYQAAAABENvZGUGEQAAAAzmlpnku5PnvJbnoIEBBgAAAAQAAAAGEgAAAAlTdG9ja05hbWUGEwAAAAzmlpnku5PlkI3np7ABBwAAAAQAAAAGFAAAABBNYXRlcmlhbFR5cGVOYW1lBhUAAAAG54mp5paZAQgAAAAEAAAABhYAAAAESGlnaAYXAAAAEumrmOmAn+ensOmHj+mAn+W6pgEJAAAABAAAAAYYAAAABFNsb3cGGQAAABLmhaLpgJ/np7Dph4/pgJ/luqYBCgAAAAQAAAAGGgAAAAlTbG93U2NhbGUGGwAAAAnmhaLnp7DlgLwBCwAAAAQAAAAGHAAAAARMZWFkBh0AAAAJ5o+Q5YmN6YePAQwAAAAEAAAABh4AAAADSm9nBh8AAAAJ54K55Yqo5YC8AQ0AAAAEAAAABiAAAAANU3RvY2tUeXBlTmFtZQYhAAAABuexu+WIqws=</Binary>
+        <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAABgAAALsAAAAHAwAAAAABAAAAEAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAACQkAAAANCgUEAAAAKE1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnMCAAAACl9maWxlZERhdGEMX2Rpc3BsYXlOYW1lAQECAAAABgoAAAACaWQGCwAAAAbluo/lj7cBBQAAAAQAAAAGDAAAAARDb2RlBg0AAAAM5paZ5LuT57yW56CBAQYAAAAEAAAABg4AAAAJU3RvY2tOYW1lBg8AAAAM5paZ5LuT5ZCN56ewAQcAAAAEAAAABhAAAAAJTVR5cGVOYW1lBhEAAAAM54mp5paZ57G75YirAQgAAAAEAAAABhIAAAAFTU5hbWUGEwAAAAbnianmlpkBCQAAAAQAAAAGFAAAAAZSZW1hcmsGFQAAAAblpIfms6gL</Binary>
       </Property>
       <Property name="ClickActionList">
         <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
@@ -14,7 +14,7 @@
       <Property name="SelectionChangedActionList">
         <Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>
       </Property>
-      <Property name="MCKey">[DataSource1].[Stock]</Property>
+      <Property name="MCKey">[DataSource1].[lj_stock_material]</Property>
       <Property name="MCDataSourceID" />
       <Property name="IsDbControl">True</Property>
       <Property name="InitDataSource" />