diff --git a/ButcherFactory.Form/CarcassSaleOut_/CarcassSaleOutForm.cs b/ButcherFactory.Form/CarcassSaleOut_/CarcassSaleOutForm.cs index 1919e55..aab0f54 100644 --- a/ButcherFactory.Form/CarcassSaleOut_/CarcassSaleOutForm.cs +++ b/ButcherFactory.Form/CarcassSaleOut_/CarcassSaleOutForm.cs @@ -157,7 +157,7 @@ namespace ButcherFactory.CarcassSaleOut_ if (orderGridView.CurrentRow == null) throw new Exception("请选择配货明细"); var detail = orderGridView.CurrentRow.DataBoundItem as SaleOutStore_Detail; - var dg = new WeightRecordDialog(details.First(x => x.ID == detail.ID), already); + var dg = new WeightRecordDialog(details.First(x => x.ID == detail.ID), already, batchID); dg.ShowDialog(); if (dg.Changed) BindOrderGrid(detail.SaleOutStore_ID); diff --git a/ButcherFactory.Form/Dialogs/AddWeightRecord.cs b/ButcherFactory.Form/Dialogs/AddWeightRecord.cs index 5e42c32..db43c71 100644 --- a/ButcherFactory.Form/Dialogs/AddWeightRecord.cs +++ b/ButcherFactory.Form/Dialogs/AddWeightRecord.cs @@ -16,11 +16,13 @@ namespace ButcherFactory.Dialogs public partial class AddWeightRecord : Form { SaleOutStore_Detail mDetail; + long? mBatchID = null; decimal number = 1; - public AddWeightRecord(SaleOutStore_Detail detail) + public AddWeightRecord(SaleOutStore_Detail detail,long? batchID) { InitializeComponent(); mDetail = detail; + mBatchID = batchID; goodsLabel.Text = mDetail.Goods_Name; } @@ -34,6 +36,7 @@ namespace ButcherFactory.Dialogs record.BillID = mDetail.SaleOutStore_ID; record.DetailID = mDetail.ID; record.Filled = true; + record.ProductBatch_ID = mBatchID; record.Goods_Code = mDetail.Goods_Code; record.Goods_ID = mDetail.Goods_ID; record.Goods_Name = mDetail.Goods_Name; diff --git a/ButcherFactory.Form/Dialogs/WeightRecordDialog.cs b/ButcherFactory.Form/Dialogs/WeightRecordDialog.cs index 472bbc1..9d1b692 100644 --- a/ButcherFactory.Form/Dialogs/WeightRecordDialog.cs +++ b/ButcherFactory.Form/Dialogs/WeightRecordDialog.cs @@ -16,11 +16,13 @@ namespace ButcherFactory.Dialogs { BindingList list; SaleOutStore_Detail mDetail; + long? mBatchID = null; public bool Changed = false; - public WeightRecordDialog(SaleOutStore_Detail detail, bool readOnly) + public WeightRecordDialog(SaleOutStore_Detail detail, bool readOnly,long? batchID) { InitializeComponent(); mDetail = detail; + mBatchID = batchID; if (readOnly) { addBtn.Enabled = false; @@ -40,7 +42,7 @@ namespace ButcherFactory.Dialogs private void addBtn_Click(object sender, EventArgs e) { - if (new AddWeightRecord(mDetail).ShowDialog() == DialogResult.OK) + if (new AddWeightRecord(mDetail,mBatchID).ShowDialog() == DialogResult.OK) { BindGrid(); Changed = true;