diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/ProduceFinishEdit_Ext.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/ProduceFinishEdit_Ext.cs index c245ad6..5140ca5 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/ProduceFinishEdit_Ext.cs +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/ProduceFinishEdit_Ext.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using BWP.B3Butchery.BO; +using BWP.B3Frameworks.Utils; using BWP.B3Sale.BO; using BWP.Web.Pages.B3Butchery.Bills.ProduceFinish_; using Forks.EnterpriseServices.DomainObjects2; @@ -16,7 +17,7 @@ namespace BWP.Web.Pages.B3YunKen.Overlays { protected override void AddCustomerToolBar(HLayoutPanel hPanel) { - var btn = new TSButton("载人生产存货"); + var btn = new TSButton("载入生产存货"); btn.Click += Btn_Click; hPanel.Add(btn); } @@ -42,17 +43,23 @@ namespace BWP.Web.Pages.B3YunKen.Overlays query.Where.Conditions.Add(DQCondition.EQ("ProductionUnit_ID", Dmo.ProductionUnit_ID)); query.Columns.Add(DQSelectColumn.Field("SaleGoods_ID", detail)); query.Columns.Add(DQSelectColumn.Field("Goods_Name", detail)); + query.Columns.Add(DQSelectColumn.Field("Goods_Brand", detail)); using (var session = Forks.EnterpriseServices.DomainObjects2.Dmo.NewSession()) { using (var reader = session.ExecuteReader(query)) { while (reader.Read()) { - list.Add(new ProduceFinish_Detail() { Goods_ID = (long)reader[0], Goods_Name = (string)reader[1] }); + list.Add(new ProduceFinish_Detail() { Goods_ID = (long)reader[0], Goods_Name = (string)reader[1],Goods_Brand = (string)reader[2]}); } } } + foreach (ProduceFinish_Detail forecastDetail in list) + { + DmoUtil.RefreshDependency(forecastDetail, "Goods_ID"); + } + return list; } } diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleForecastEdit_Ext.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleForecastEdit_Ext.cs index 796e699..350e12a 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleForecastEdit_Ext.cs +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleForecastEdit_Ext.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; +using BWP.B3Frameworks.Utils; using BWP.B3Sale.BO; using BWP.Web.Layout; using Forks.EnterpriseServices.DomainObjects2; @@ -21,7 +22,7 @@ namespace BWP.Web.Pages.B3YunKen.Overlays protected override void AddCustomerToolBar(HLayoutPanel toobar) { - var btn=new TSButton("载人存货"); + var btn=new TSButton("载入存货"); btn.Click += Btn_Click; toobar.Add(btn); } @@ -48,16 +49,29 @@ namespace BWP.Web.Pages.B3YunKen.Overlays query.Where.Conditions.Add(DQCondition.EQ("Customer_ID", Dmo.Customer_ID)); query.Columns.Add(DQSelectColumn.Field("SaleGoods_ID", detail)); query.Columns.Add(DQSelectColumn.Field("Goods_Name", detail)); + query.Columns.Add(DQSelectColumn.Field("Goods_Brand", detail)); using (var session=Forks.EnterpriseServices.DomainObjects2.Dmo.NewSession()) { using (var reader=session.ExecuteReader(query)) { while (reader.Read()) { - list.Add(new SaleForecast_Detail(){SaleGoods_ID = (long)reader[0],Goods_Name = (string)reader[1]}); + var dmodetail = new SaleForecast_Detail() + { + SaleGoods_ID = (long) reader[0], + Goods_Name = (string) reader[1], + Goods_Brand = (string) reader[2] + }; + list.Add(dmodetail); } } } + + foreach (SaleForecast_Detail forecastDetail in list) + { + DmoUtil.RefreshDependency(forecastDetail, "SaleGoods_ID"); + } + return list; }