修复物料和大仓的关系

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)
             {

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" />