diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/ProductTask_/SaleOrderToProductNoticePage.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/ProductTask_/SaleOrderToProductNoticePage.cs index e6cfcba..f1135ba 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/ProductTask_/SaleOrderToProductNoticePage.cs +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/ProductTask_/SaleOrderToProductNoticePage.cs @@ -281,7 +281,7 @@ namespace BWP.Web.Pages.B3YunKen.ProductTask_ manager.Add("AccountingUnit_ID", QueryCreator.DFChoiceBox(mDFInfo.Fields["AccountingUnit_ID"], B3FrameworksConsts.DataSources.授权会计单位全部)); manager.Add("BillState", QueryCreator.一般单据状态(mDFInfo.Fields["BillState"])); manager.Add("BrandItem_ID", new SimpleLabel("品牌项"), QueryCreator.DFChoiceBox(mDetailDFInfo.Fields["BrandItem_ID"], B3UnitedInfosConsts.DataSources.品牌项)); - manager.Add("GoodsProperty_ID", new SimpleLabel("存货属性"), QueryCreator.DFChoiceBoxEnableMultiSelection(mGoodsDFInfo.Fields["GoodsProperty_ID"], mQueryContainer, "GoodsProperty_ID", B3UnitedInfosConsts.DataSources.存货属性全部)); + manager.Add("GoodsProperty_ID", new SimpleLabel("存货属性"), QueryCreator.DFChoiceBox(mGoodsDFInfo.Fields["GoodsProperty_ID"], B3UnitedInfosConsts.DataSources.存货属性全部)); cbxHideAlready = new DFCheckBox() { Text = "隐藏已转明细", Checked = true }; manager.Add("隐藏已转明细", cbxHideAlready); manager["隐藏已转明细"].NoLabel = true; diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport.cs index b56c6d2..33d5419 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport.cs +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport.cs @@ -282,18 +282,23 @@ B3SaleDataSources.结账客户), s => long.Parse(s)), "AccountCustomer_ID")); break; case "FreightMoney": dom.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(freightMoney),item.Text)); + SumColumnIndexs.Add(dom.Columns.Count - 1); break; case "Money": dom.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.Field(main, field)), item.Text)); + SumColumnIndexs.Add(dom.Columns.Count - 1); break; case "UnitNum": - dom.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.Field(main, field)), item.Text)); + dom.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.Field(detail, field)), item.Text)); + SumColumnIndexs.Add(dom.Columns.Count - 1); break; case "SecondNumber": dom.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.Field(main, field)), item.Text)); + SumColumnIndexs.Add(dom.Columns.Count - 1); break; case "PackingMoney": dom.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.Multiply(DQExpression.Field(packageData, "Price"), DQExpression.Field(detail, "SecondNumber"))), item.Text)); + SumColumnIndexs.Add(dom.Columns.Count - 1); break; case "NetPrice": dom.Columns.Add(DQSelectColumn.Create(DQExpression.Divide(DQExpression.Sum(DQExpression.Subtract(DQExpression.Field(detail, "Money"), DQExpression.IfNull(freightMoney, DQExpression.Value(0))).ESubtract(DQExpression.IfNull(DQExpression.Field(packageData, "Price"), DQExpression.Value(0)))), DQExpression.NullIfZero(DQExpression.Sum(DQExpression.Field(detail, "UnitNum")))), item.Text));