diff --git a/.gitignore b/.gitignore index a3256cd..9843952 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,7 @@ *.user *.suo *.tmp +*.exe +*.msi bin obj \ No newline at end of file diff --git a/ButcherFactory.Form/CarcassInStore_/CarcassInStoreForm.cs b/ButcherFactory.Form/CarcassInStore_/CarcassInStoreForm.cs index 1ad1799..d4b02c1 100644 --- a/ButcherFactory.Form/CarcassInStore_/CarcassInStoreForm.cs +++ b/ButcherFactory.Form/CarcassInStore_/CarcassInStoreForm.cs @@ -58,14 +58,14 @@ namespace ButcherFactory.CarcassInStore_ if (workUnitSelect.SelectedValue == null) workUnitID = null; else - workUnitID = ((WorkUnit)workUnitSelect.SelectedValue).ID; + workUnitID = (long)workUnitSelect.SelectedValue; }; productBatchSelect.SelectedIndexChanged += delegate { if (productBatchSelect.SelectedValue == null) batchID = null; else - batchID = ((ProductBatch)productBatchSelect.SelectedValue).ID; + batchID = (long)productBatchSelect.SelectedValue; }; } @@ -135,21 +135,18 @@ namespace ButcherFactory.CarcassInStore_ var goods = CarcassInStoreBL.GetGoodsList(); foreach (var item in goods) { - for (var i = 0; i < 10; i++) + var btn = new UButton() { Width = 90, Height = 50, Text = item.Goods_Name, Tag = item.Goods_ID, Font = new Font("宋体", 15), Margin = new Padding(8, 14, 8, 0), PlaySound = true }; + btn.Click += (sender, e) => { - var btn = new UButton() { Width = 90, Height = 50, Text = item.Goods_Name, Tag = item.Goods_ID, Font = new Font("宋体", 15), Margin = new Padding(8, 14, 8, 0), PlaySound = true }; - btn.Click += (sender, e) => - { - if (string.IsNullOrEmpty(uScanPanel1.TextBox.Text)) - throw new Exception("请先扫码"); - if (uScanPanel1.TextBox.Text.Length != 23) - throw new Exception("条码格式不正确"); - var c = sender as UButton; - var list = CarcassInStoreBL.InsertOrUpdate(workUnitID, batchID, (long)c.Tag, uScanPanel1.TextBox.Text); - AfterUpdateOrInsert(list); - }; - flowLayoutPanel1.Controls.Add(btn); - } + if (string.IsNullOrEmpty(uScanPanel1.TextBox.Text)) + throw new Exception("请先扫码"); + if (uScanPanel1.TextBox.Text.Length != 23) + throw new Exception("条码格式不正确"); + var c = sender as UButton; + var list = CarcassInStoreBL.InsertOrUpdate(workUnitID, batchID, (long)c.Tag, uScanPanel1.TextBox.Text); + AfterUpdateOrInsert(list); + }; + flowLayoutPanel1.Controls.Add(btn); } } diff --git a/ButcherFactory.Form/Utils/ControlsUtil.cs b/ButcherFactory.Form/Utils/ControlsUtil.cs index 12eda71..ec64918 100644 --- a/ButcherFactory.Form/Utils/ControlsUtil.cs +++ b/ButcherFactory.Form/Utils/ControlsUtil.cs @@ -14,9 +14,9 @@ namespace ButcherFactory.Utils public static void EBindComboBox(this ComboBox box) where T : BaseInfo, new() { - box.DataSource = BaseInfoBL.GetList(); box.DisplayMember = "Name"; box.ValueMember = "ID"; + box.DataSource = BaseInfoBL.GetList(); box.Refresh(); } } diff --git a/ButcherFactory.Login/ButcherFactory.Login.csproj b/ButcherFactory.Login/ButcherFactory.Login.csproj index 20e3ab8..d510357 100644 --- a/ButcherFactory.Login/ButcherFactory.Login.csproj +++ b/ButcherFactory.Login/ButcherFactory.Login.csproj @@ -31,6 +31,9 @@ prompt 4 + + app.ico + @@ -116,6 +119,9 @@ + + +