From 04830f32c6f7ed596810c85ee613c452c2dd6a02 Mon Sep 17 00:00:00 2001 From: duanluohua Date: Tue, 10 Apr 2018 13:57:05 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8D=95No.139429=20?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=B0=83=E6=95=B4=E7=AC=AC=E4=BA=8C=E4=B8=AA?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=9A=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E2=80=9C=E8=BE=85=E6=95=B0=E9=87=8F=E2=80=9D=E2=80=9C=E8=BE=85?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E2=80=9D=E2=80=9C=E5=8D=95=E4=BB=B7=E2=80=9D?= =?UTF-8?q?=E2=80=9C=E5=A4=87=E6=B3=A8=E2=80=9D=EF=BC=9B=E5=87=8F=E5=B0=91?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=9A=E2=80=9C=E9=87=91=E9=A2=9D=E2=80=9D?= =?UTF-8?q?=EF=BC=9B=E8=AE=A2=E8=B4=A7=E6=97=B6=E9=97=B4=E5=92=8C=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E6=97=B6=E9=97=B4=E4=BD=8D=E7=BD=AE=E4=BA=92=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tools/SaleOrderUpdateEdit.cs | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs index 5a78304..d8ae5f7 100644 --- a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs +++ b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs @@ -261,7 +261,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools { _goodsGrid.Columns.Add(new DFEditGridColumn("Goods_Name")); _goodsGrid.Columns.Add(new DFEditGridColumn("Goods_Spec")); - + var col = new DFEditGridColumn("UnitNum"); col.InitEditControl += (sender, e) => { e.Control.Attributes["onchange"] = @"SetSumInfo();this.dfContainer.setValue('ChangeFlag','true'); "; @@ -270,11 +270,14 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools { _goodsGrid.Columns.EAdd(col).SumMode = SumMode.Sum; _goodsGrid.Columns.Add(new DFEditGridColumn("Unit")); + _goodsGrid.Columns.EAdd(new DFEditGridColumn("SecondNumber")).SumMode = SumMode.Sum; + _goodsGrid.Columns.Add(new DFEditGridColumn("Goods_SecondUnit")); + _goodsGrid.Columns.Add(new DFEditGridColumn("Price")); - _goodsGrid.Columns.EAdd(new DFEditGridColumn("Money")).SumMode = SumMode.Sum; - _goodsGrid.Columns.Add(new DFEditGridColumn("OrderDate")); _goodsGrid.Columns.Add(new DFEditGridColumn("LoadTime")); - _goodsGrid.Columns.Add(new DFEditGridColumn("ChangeFlag")); + _goodsGrid.Columns.Add(new DFEditGridColumn("OrderDate")); + //_goodsGrid.Columns.Add(new DFEditGridColumn("ChangeFlag")); + _goodsGrid.Columns.Add(new DFEditGridColumn("Remark")); _goodsGrid.ValueColumns.Add("SaleGoods_ID"); _goodsGrid.ValueColumns.Add("Goods_UnitConvertDirection"); @@ -481,6 +484,8 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools { dom.Columns.Add(DQSelectColumn.Field("GoodsBatch_Name", detailAlias)); dom.Columns.Add(DQSelectColumn.Field("LoadTime", order)); dom.Columns.Add(DQSelectColumn.Field("OrderDate", order)); + dom.Columns.Add(DQSelectColumn.Field("Goods_SecondUnit", detailAlias)); + dom.Columns.Add(DQSelectColumn.Field("Remark", detailAlias)); //dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(storeDetail, "Number").EAdd(DQExpression.Field(output, "Number")), "Number1")); var condition = (IList)ViewStateUtil.Current.LoadFromPersistenceMedium(uint.Parse(Request.QueryString["cacheid"]), true); foreach (var expression in condition) { @@ -509,7 +514,9 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools { GoodsBatch_ID = (long?)reader[11], GoodsBatch_Name = (string)reader[12], LoadTime = (DateTime?)reader[13], - OrderDate = (DateTime?)reader[14] + OrderDate = (DateTime?)reader[14], + Goods_SecondUnit = (string)reader[15], + Remark = (string)reader[16] }; Details.Add(detail); }