diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/FrmTankNum.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/FrmTankNum.cs index 3a7f727..d8b3197 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/FrmTankNum.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/FrmTankNum.cs @@ -198,8 +198,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjTanNum } #endregion - - + _tankNumCodingView.MTypeId = Convert.ToInt32(this.comboBox1.SelectedValue); _tankNumCodingView.High = Convert.ToSingle(High.Text); _tankNumCodingView.Slow = Convert.ToSingle(Slow.Text); diff --git a/Main/MCEdit/Data/MCProject/nodeDevice.xml b/Main/MCEdit/Data/MCProject/nodeDevice.xml index eb2bcbf..08833b9 100644 --- a/Main/MCEdit/Data/MCProject/nodeDevice.xml +++ b/Main/MCEdit/Data/MCProject/nodeDevice.xml @@ -13,7 +13,7 @@ - + @@ -1421,7 +1421,7 @@ - + @@ -3273,7 +3273,7 @@ - + diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormMaterialInfoType.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormMaterialInfoType.xml index d3fa854..92318c8 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/FormMaterialInfoType.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/FormMaterialInfoType.xml @@ -155,7 +155,7 @@ Control 712, 426 WindowsDefaultLocation - 物料大类 + 物料 Normal Tile diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormStock.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormStock.xml index a0e1b77..4d46cd9 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/FormStock.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/FormStock.xml @@ -3,7 +3,7 @@ False - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAACQAAAJcAAAAHAwAAAAABAAAAEAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAACQkAAAAJCgAAAAkLAAAACQwAAAANBwUEAAAAKE1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnMCAAAACl9maWxlZERhdGEMX2Rpc3BsYXlOYW1lAQECAAAABg0AAAACaWQGDgAAAAbluo/lj7cBBQAAAAQAAAAGDwAAAARDb2RlBhAAAAAM5paZ5LuT57yW56CBAQYAAAAEAAAABhEAAAAJU3RvY2tOYW1lBhIAAAAM5paZ5LuT5ZCN56ewAQcAAAAEAAAABhMAAAAQTWF0ZXJpYWxUeXBlTmFtZQYUAAAABueJqeaWmQEIAAAABAAAAAYVAAAABEhpZ2gGFgAAABLpq5jpgJ/np7Dph4/pgJ/luqYBCQAAAAQAAAAGFwAAAARTbG93BhgAAAAS5oWi6YCf56ew6YeP6YCf5bqmAQoAAAAEAAAABhkAAAAJU2xvd1NjYWxlBhoAAAAJ5oWi56ew5YC8AQsAAAAEAAAABhsAAAAETGVhZAYcAAAACeaPkOWJjemHjwEMAAAABAAAAAYdAAAAA0pvZwYeAAAACeeCueWKqOWAvAs= + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAACgAAAK0AAAAHAwAAAAABAAAAEAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAACQkAAAAJCgAAAAkLAAAACQwAAAAJDQAAAA0GBQQAAAAoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAKX2ZpbGVkRGF0YQxfZGlzcGxheU5hbWUBAQIAAAAGDgAAAAJpZAYPAAAABuW6j+WPtwEFAAAABAAAAAYQAAAABENvZGUGEQAAAAzmlpnku5PnvJbnoIEBBgAAAAQAAAAGEgAAAAlTdG9ja05hbWUGEwAAAAzmlpnku5PlkI3np7ABBwAAAAQAAAAGFAAAABBNYXRlcmlhbFR5cGVOYW1lBhUAAAAG54mp5paZAQgAAAAEAAAABhYAAAAESGlnaAYXAAAAEumrmOmAn+ensOmHj+mAn+W6pgEJAAAABAAAAAYYAAAABFNsb3cGGQAAABLmhaLpgJ/np7Dph4/pgJ/luqYBCgAAAAQAAAAGGgAAAAlTbG93U2NhbGUGGwAAAAnmhaLnp7DlgLwBCwAAAAQAAAAGHAAAAARMZWFkBh0AAAAJ5o+Q5YmN6YePAQwAAAAEAAAABh4AAAADSm9nBh8AAAAJ54K55Yqo5YC8AQ0AAAAEAAAABiAAAAANU3RvY2tUeXBlTmFtZQYhAAAABuexu+WIqws= AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL