diff --git a/ButcherFactory.Form/CarcassInStore_/CarcassInStoreForm.cs b/ButcherFactory.Form/CarcassInStore_/CarcassInStoreForm.cs index e2c1f9e..aa79c0b 100644 --- a/ButcherFactory.Form/CarcassInStore_/CarcassInStoreForm.cs +++ b/ButcherFactory.Form/CarcassInStore_/CarcassInStoreForm.cs @@ -126,7 +126,8 @@ namespace ButcherFactory.CarcassInStore_ var arr = strErrorWeight.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(x => int.Parse(x)).OrderBy(x => x); errorWeight.AddRange(arr); } - workUnitSelect.EBindComboBox(x => x.ID == config.WorkUnitID); + var m = config.WorkUnitID; + workUnitSelect.EBindComboBox(x => x.ID == m, top: 100); BindGoods(); BindGrid(); diff --git a/ButcherFactory.Form/CarcassTakeOut_/CarcassTakeOutForm.cs b/ButcherFactory.Form/CarcassTakeOut_/CarcassTakeOutForm.cs index 3d80efa..e3fcaf6 100644 --- a/ButcherFactory.Form/CarcassTakeOut_/CarcassTakeOutForm.cs +++ b/ButcherFactory.Form/CarcassTakeOut_/CarcassTakeOutForm.cs @@ -98,7 +98,8 @@ namespace ButcherFactory.CarcassTakeOut_ productBatchSelect.EBindComboBox(x => x.Date == DateTime.Today, 6, "Date"); var config = XmlUtil.DeserializeFromFile(); - workUnitSelect.EBindComboBox(x => x.ID == config.WorkUnitID); + var m = config.WorkUnitID; + workUnitSelect.EBindComboBox(x => x.ID == m, top: 100); BindGoods(); BindGrid(); diff --git a/ButcherFactory.Form/SegmentInStore_/SegmentInStoreForm.cs b/ButcherFactory.Form/SegmentInStore_/SegmentInStoreForm.cs index c098338..cf5e509 100644 --- a/ButcherFactory.Form/SegmentInStore_/SegmentInStoreForm.cs +++ b/ButcherFactory.Form/SegmentInStore_/SegmentInStoreForm.cs @@ -81,7 +81,8 @@ namespace ButcherFactory.SegmentInStore_ BaseInfoSyncRpc.SyncBaseInfo(); } var config = XmlUtil.DeserializeFromFile(); - storeSelect.EBindComboBox(x => x.ID == config.StoreID); + var m = config.StoreID; + storeSelect.EBindComboBox(x => x.ID == m); BindInStoreGrid(); BindExceptionGrid(); BindBackGrid(); diff --git a/ButcherFactory.Form/SegmentPickUp_/SegmentPickUpForm.cs b/ButcherFactory.Form/SegmentPickUp_/SegmentPickUpForm.cs index 328523a..4a5fc7f 100644 --- a/ButcherFactory.Form/SegmentPickUp_/SegmentPickUpForm.cs +++ b/ButcherFactory.Form/SegmentPickUp_/SegmentPickUpForm.cs @@ -98,7 +98,8 @@ namespace ButcherFactory.SegmentPickUp_ productBatchSelect.EBindComboBox(x => x.Date == DateTime.Today, 6, "Date"); var config = XmlUtil.DeserializeFromFile(); - workUnitSelect.EBindComboBox(x => x.ID == config.WorkUnitID); + var m = config.WorkUnitID; + workUnitSelect.EBindComboBox(x => x.ID == m, top: 100); BindGoods(); BindGrid(); diff --git a/ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.cs b/ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.cs index 218a941..7dcaa3b 100644 --- a/ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.cs +++ b/ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.cs @@ -100,9 +100,10 @@ namespace ButcherFactory.SegmentProductionAuto_ BaseInfoSyncRpc.SyncBaseInfo(); BaseInfoSyncRpc.SyncProductBatch(1); } - productBatchSelect.EBindComboBox(x => x.Date == DateTime.Today, 6, "Date"); + productBatchSelect.EBindComboBox(null, 6, "Date"); config = XmlUtil.DeserializeFromFile(); - workUnitSelect.EBindComboBox(x => x.ID == config.WorkUnitID, top: 100); + var m = config.WorkUnitID; + workUnitSelect.EBindComboBox(x => x.ID == m, top: 100); BindGoods(); BindGrid(); @@ -279,7 +280,7 @@ namespace ButcherFactory.SegmentProductionAuto_ { if (historyDataGrid.CurrentRow == null) return; - if (MessageBox.Show( "确定删除选中记录？","删除确认", MessageBoxButtons.OKCancel) != DialogResult.OK) + if (MessageBox.Show("确定删除选中记录？", "删除确认", MessageBoxButtons.OKCancel) != DialogResult.OK) return; var item = historyDataGrid.CurrentRow.DataBoundItem as SegmentProduction; SegmentProductionBL.SetAsDelete(item.ID, item.BarCode); diff --git a/ButcherFactory.Form/SegmentProduction_/SegmentProductionForm.cs b/ButcherFactory.Form/SegmentProduction_/SegmentProductionForm.cs index c62913a..46d881d 100644 --- a/ButcherFactory.Form/SegmentProduction_/SegmentProductionForm.cs +++ b/ButcherFactory.Form/SegmentProduction_/SegmentProductionForm.cs @@ -100,7 +100,8 @@ namespace ButcherFactory.SegmentProduction_ } productBatchSelect.EBindComboBox(x => x.Date == DateTime.Today, 6, "Date"); var config = XmlUtil.DeserializeFromFile(); - workUnitSelect.EBindComboBox(x => x.ID == config.WorkUnitID); + var m = config.WorkUnitID; + workUnitSelect.EBindComboBox(x => x.ID == m, top: 100); BindGoods(); BindGrid(); @@ -161,7 +162,7 @@ namespace ButcherFactory.SegmentProduction_ historyDataGrid.FirstDisplayedScrollingRowIndex = 0; historyDataGrid.Refresh(); if (barPrintCheck.Checked) - SegmentProductionPrint.Print(entity, batchDate,""); + SegmentProductionPrint.Print(entity, batchDate, ""); } void BindGrid() diff --git a/ButcherFactory.Form/SegmentProduction_/SegmentProductionPrint.cs b/ButcherFactory.Form/SegmentProduction_/SegmentProductionPrint.cs index 77ec3d0..9ec3b8a 100644 --- a/ButcherFactory.Form/SegmentProduction_/SegmentProductionPrint.cs +++ b/ButcherFactory.Form/SegmentProduction_/SegmentProductionPrint.cs @@ -23,7 +23,8 @@ namespace ButcherFactory.SegmentProduction_ dt = DateTime.Today; var dic = new Dictionary(); dic.Add("$Goods_Name", entity.Goods_Name); - dic.Add("$Goods_Spec", entity.Goods_Spec); + //dic.Add("$Goods_Spec", entity.Goods_Spec); + dic.Add("$Weight", entity.Weight.ToString("#0.##")); dic.Add("$Date", dt.Value.ToString("yyyy/MM/dd")); var imgUrl = string.Format(IMGFILE, id); var url = string.Format(AppContext.ConnectInfo.TraceBackUrl + "?code={0}", entity.BarCode); diff --git a/ButcherFactory.Form/SegmentProduction_/SegmentProductionPrint.html b/ButcherFactory.Form/SegmentProduction_/SegmentProductionPrint.html index a054446..22c7393 100644 --- a/ButcherFactory.Form/SegmentProduction_/SegmentProductionPrint.html +++ b/ButcherFactory.Form/SegmentProduction_/SegmentProductionPrint.html @@ -16,7 +16,7 @@
品名：$Goods_Name
-
规格：$Goods_Spec   生产日期：$Date
+
重量：$Weight KG   生产日期：$Date
diff --git a/ButcherFactory.Form/SegmentProduction_/SegmentProductionPrint1.html b/ButcherFactory.Form/SegmentProduction_/SegmentProductionPrint1.html index 4dda980..1595a26 100644 --- a/ButcherFactory.Form/SegmentProduction_/SegmentProductionPrint1.html +++ b/ButcherFactory.Form/SegmentProduction_/SegmentProductionPrint1.html @@ -16,7 +16,7 @@
品名：$Goods_Name
-
规格：$Goods_Spec   生产日期：$Date
+
重量：$Weight KG   生产日期：$Date
执行标准：GB/T9959.2-2008
储存条件：0～4℃保存
执行标准：GB/T9959.2-2008
储存条件：-18℃以下保存