diff --git a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/SaleOutStore_/SaleOutStoreSimpleAnayse.cs b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/SaleOutStore_/SaleOutStoreSimpleAnayse.cs index 0e930de..7f306f6 100644 --- a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/SaleOutStore_/SaleOutStoreSimpleAnayse.cs +++ b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/SaleOutStore_/SaleOutStoreSimpleAnayse.cs @@ -49,19 +49,6 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.SaleOutStore_ } } - //已经查询 - private object SearchFlag - { - set - { - ViewState["SearchFlag"] = value; - } - - get - { - return ViewState["SearchFlag"]; - } - } private QueryResult GetQueryResult(LoadArguments arg) @@ -97,14 +84,6 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.SaleOutStore_ var group = new ButtonGroup(); previewAction = new CustomPriviewAction(); printAction = new CustomPrintAction(); - if (SearchFlag != null) - { - printAction.Url = "SaleOutStoreSimpleAnaysePrint.aspx"; - previewAction.Url = "SaleOutStoreSimpleAnaysePrint.aspx"; - } - - - var billReportSelect = new BillReportSelectAction(PrintUtil.GetTemplateFile(PluginName, "SaleOutStoreSimpleAnaysePrint.xml")); group.Actions.Add(previewAction); @@ -144,7 +123,7 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.SaleOutStore_ vPanel.Add(layout.CreateLayout(), new VLayoutOption(HorizontalAlign.Left)); } - private Dictionary fieldInfo = new Dictionary() { {"Customer_Name", "购货客户" }, { "Goods_Name", "存货名称" },{ "Goods_Spec", "存货规格" }, { "Order_Detail_UnitNum", "订单数量" } }; + private Dictionary fieldInfo = new Dictionary() { {"Customer_Name", "购货客户" }, { "Goods_Name", "存货名称" },{ "Goods_Spec", "存货规格" }, { "Order_Detail_UnitNum", "订单数量" }, { "SecondNumber", "辅数量" }, { "Goods_SecondUnit", "辅单位" } }; protected override void PrepareData() @@ -180,7 +159,6 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.SaleOutStore_ info.Save(); printAction.Url = "SaleOutStoreSimpleAnaysePrint.aspx"; previewAction.Url = "SaleOutStoreSimpleAnaysePrint.aspx"; - SearchFlag = "1"; } protected override DQueryDom GetQueryDom() @@ -202,9 +180,11 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.SaleOutStore_ break; case "Goods_Name": case "Goods_Spec": + case "Goods_SecondUnit": dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(detail, item.Key), item.Value)); dom.GroupBy.Expressions.Add(DQExpression.Field(detail, item.Key)); break; + case "SecondNumber": case "Order_Detail_UnitNum": dom.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.Field(detail, item.Key)), item.Value)); SumColumnIndexs.Add(dom.Columns.Count - 1); diff --git a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/SaleOutStore_/SaleOutStoreSimpleAnaysePrint.cs b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/SaleOutStore_/SaleOutStoreSimpleAnaysePrint.cs index 251062d..b92f9be 100644 --- a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/SaleOutStore_/SaleOutStoreSimpleAnaysePrint.cs +++ b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/SaleOutStore_/SaleOutStoreSimpleAnaysePrint.cs @@ -122,6 +122,8 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.SaleOutStore_ item.Goods_Name = (string)reader[i++]; item.Goods_Spec = (string)reader[i++]; item.OrderNumber = (Money?)reader[i++]; + item.SecondNumber = (Money?)reader[i++]; + item.Goods_SecondUnit = (string)reader[i++]; list.Add(item); } @@ -186,7 +188,7 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.SaleOutStore_ - private string[] fieldInfo = new string[] { "Customer_Name", "Goods_Name", "Goods_Spec", "Order_Detail_UnitNum" }; + private string[] fieldInfo = new string[] { "Customer_Name", "Goods_Name", "Goods_Spec", "Order_Detail_UnitNum", "SecondNumber", "Goods_SecondUnit" }; private DQueryDom GetQueryDom() { @@ -205,9 +207,11 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.SaleOutStore_ break; case "Goods_Name": case "Goods_Spec": + case "Goods_SecondUnit": dom.Columns.Add(DQSelectColumn.Field(item, detail)); dom.GroupBy.Expressions.Add(DQExpression.Field(detail, item)); break; + case "SecondNumber": case "Order_Detail_UnitNum": dom.Columns.Add(DQSelectColumn.Sum( detail, item)); break; @@ -322,7 +326,7 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.SaleOutStore_ public string PrintName { - get { return "班组包材领用测算表"; } + get { return "万福销售分析"; } } diff --git a/B3QingDaoWanFu/BO/SaleOutStorePrint/SaleOutStoreSimpleAnayse.cs b/B3QingDaoWanFu/BO/SaleOutStorePrint/SaleOutStoreSimpleAnayse.cs index d9a8995..b112d68 100644 --- a/B3QingDaoWanFu/BO/SaleOutStorePrint/SaleOutStoreSimpleAnayse.cs +++ b/B3QingDaoWanFu/BO/SaleOutStorePrint/SaleOutStoreSimpleAnayse.cs @@ -28,6 +28,12 @@ namespace BWP.B3QingDaoWanFu.BO [LogicName("订单数量")] public Money? OrderNumber { get; set; } + [LogicName("辅数量")] + public Money? SecondNumber { get; set; } + + [LogicName("辅单位")] + public string Goods_SecondUnit { get; set; } + }