调整字段显示

BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/DynamicPriceReport.cs

@@ -91,22 +91,21 @@ namespace BWP.Web.Pages.B3YunKen.Reports
     ReportDisplayOptionHelper mDisplayHelper = new ReportDisplayOptionHelper();
     protected override void AddQueryOptions(VLayoutPanel vPanel)
     {
-      //mDisplayHelper.AddOptionItem("会计单位", "bill", "AccountingUnit_Name", false);
+      mDisplayHelper.AddOptionItem("会计单位", "accountingUnit", "Name", false);
       //mDisplayHelper.AddOptionItem("部门", "bill", "Department_Name", false);
       //mDisplayHelper.AddOptionItem("经办人", "bill", "Employee_Name", false);
       //mDisplayHelper.AddOptionItem("客户", "bill", "Customer_Name", false);
-      mDisplayHelper.AddOptionItem("存货属性", "detail", "GoodsProperty_Name", false);
+      mDisplayHelper.AddOptionItem("存货属性", "convert", "GoodsProperty_Name", false);
       //mDisplayHelper.AddOptionItem("品牌项", "detail", "BrandItem_Name", false);
       mDisplayHelper.AddOptionItem("产品线", "goods", "ProductLine_Name", false);
-      mDisplayHelper.AddOptionItem("存货编号", "detail", "Goods_Code", false);
-      mDisplayHelper.AddOptionItem("存货名称", "detail", "Goods_Name", false);
-      mDisplayHelper.AddOptionItem("规格", "detail", "Goods_Spec", false);
-      mDisplayHelper.AddOptionItem("报价单位", "detail", "Unit", false);
-      mDisplayHelper.AddOptionItem("单价", "detail", "Price", false);
-      mDisplayHelper.AddOptionItem("非标准件", "convert", "Goods_Name", false);
-      mDisplayHelper.AddOptionItem("单价（非标准件）", () => {
-        return DQExpression.Add(DQExpression.Multiply(DQExpression.Field(JoinAlias.Create("detail"), "Price"), DQExpression.IfNull(DQExpression.Field(JoinAlias.Create("convert"), "Multiplier"), DQExpression.Value(1))),DQExpression.IfNull(DQExpression.Field(JoinAlias.Create("convert"), "Diff"),DQExpression.Value(0)));
-      },true);
+      mDisplayHelper.AddOptionItem("存货编号", "convert", "Goods_Code", false);
+      mDisplayHelper.AddOptionItem("存货名称", "convert", "Goods_Name", false);
+      mDisplayHelper.AddOptionItem("主单位", "convert", "Goods_MainUnit", false);
+      mDisplayHelper.AddOptionItem("单价", () => {
+        return DQExpression.Add(DQExpression.Multiply(DQExpression.Field(JoinAlias.Create("detail"), "Price"), DQExpression.IfNull(DQExpression.Field(JoinAlias.Create("convert"), "Multiplier"), DQExpression.Value(1))), DQExpression.IfNull(DQExpression.Field(JoinAlias.Create("convert"), "Diff"), DQExpression.Value(0)));
+      }, true);
+      mDisplayHelper.AddOptionItem("标准件", "detail", "Goods_Name", false);
+      mDisplayHelper.AddOptionItem("标准单价", "detail", "Price", false);
       AddQueryOption("选项", mDisplayHelper.GetAllDisplayNames(), mDisplayHelper.GetDefaultSelelectedDisplayNames());
       base.AddQueryOptions(vPanel);
     }
@@ -142,12 +141,13 @@ namespace BWP.Web.Pages.B3YunKen.Reports
       mDisplayHelper.AddAlias("detail", JoinAlias.Create("detail"));
       mDisplayHelper.AddAlias("convert", JoinAlias.Create("convert"));
       mDisplayHelper.AddAlias("goods", JoinAlias.Create("goods"));
+      mDisplayHelper.AddAlias("accountingUnit", JoinAlias.Create("accountingUnit"));
       dom.RegisterQueryTable(typeof(PriceBillID), new string[] { "AccountingUnit_ID","ID" }, GetMaxPriceBillID());
       dom.From.AddJoin(JoinType.Inner, new DQDmoSource(priceBillID), DQCondition.EQ(bill, "ID", priceBillID, "ID"));
       dom.From.AddJoin(JoinType.Left, new DQDmoSource(accountingUnit), DQCondition.EQ(priceBillID, "AccountingUnit_ID", accountingUnit, "ID"));
       dom.From.AddJoin(JoinType.Left, new DQDmoSource(detail), DQCondition.EQ(bill, "ID", detail, "PriceBill_ID"));
       dom.From.AddJoin(JoinType.Left, new DQDmoSource(convert), DQCondition.EQ(detail, "SaleGoods_ID", convert, "StandardGoods_ID"));
-      dom.From.AddJoin(JoinType.Left, new DQDmoSource(goods), DQCondition.EQ(detail, "SaleGoods_ID", goods, "ID"));
+      dom.From.AddJoin(JoinType.Left, new DQDmoSource(goods), DQCondition.EQ(convert, "Goods_ID", goods, "ID"));
       var goodsChb = mQueryContainer.GetControl<DFChoiceBox>("Goods_ID");
       var standChb = mQueryContainer.GetControl<DFChoiceBox>("StandardGoods_ID");
       var lineChb = mQueryContainer.GetControl<DFChoiceBox>("ProductLine_ID");