需求单No.140086

1、付款单数据分析 “付款对象”查询条件，可以默认选择空，查询所有的付款单；
4、结算单-养殖户信息-重量保留2位小数，四舍五入。

B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Overlays/PayAnalyse_Ext.cs

@@ -25,7 +25,6 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Overlays
     {
       base.AddCustomerCondition(layout);
       payTag = layout.Add("PayTarget", QueryCreator.DFNameValueInput<付款对象>(mDFInfo.Fields["PayTarget"]));
-      payTag.EnableTopItem = false;
       payTag.Fill("0", "供应商");
       var c = layout.Config as AutoLayoutConfig;
       c.Add("PayTarget");
@@ -35,21 +34,19 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Overlays
     {
       var query = base.GetQueryDom();
       var tag = DQSelectColumn.Create(DQExpression.Field("Supplier_Name"), "供应商");
-      if (payTag.Value == 付款对象.养殖户)
+      var detail = new JoinAlias(typeof(Pay_FarmerDetail));
+      query.From.AddJoin(JoinType.Left, new DQDmoSource(detail), DQCondition.EQ(query.From.RootSource.Alias, "ID", detail, "Pay_ID"));
+      tag = DQSelectColumn.Create(DQExpression.Field(detail, "Farmer_Name"), "养殖户");
+      var last = query.Columns.Last();
+      if (last.Name == "付款金额")
       {
-        var detail = new JoinAlias(typeof(Pay_FarmerDetail));
-        query.From.AddJoin(JoinType.Left, new DQDmoSource(detail), DQCondition.EQ(query.From.RootSource.Alias, "ID", detail, "Pay_ID"));
-        tag = DQSelectColumn.Create(DQExpression.Field(detail, "Farmer_Name"), "养殖户");
-        var last = query.Columns.Last();
-        if (last.Name == "付款金额")
-        {
-          query.Columns.Remove(last);
-          query.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.Field(detail, "Money")), "付款金额"));
-        }
+        query.Columns.Remove(last);
+        query.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.LogicCase(DQCondition.EQ("PayTarget", 付款对象.供应商), DQExpression.Field("Money"), DQExpression.Field(detail, "Money"))), "付款金额"));
       }
       query.Columns.Insert(0, tag);
       query.GroupBy.Expressions.Add(tag.Expression);
-      query.Where.Conditions.Add(DQCondition.EQ("PayTarget", payTag.Value));
+      if (!payTag.IsEmpty)
+        query.Where.Conditions.Add(DQCondition.EQ("PayTarget", payTag.Value));
       if (query.Columns.Last().Name == "付款金额")
       {
         SumColumnIndexs.Clear();

B3QingDaoWanFu/TypeIOCs/StatPayBLTypeIoc.cs

@@ -41,6 +41,8 @@ namespace BWP.B3QingDaoWanFu.TypeIOCs
         if ((dmo.RealNumber ?? 0) != 0)
         {
           detail.ExeWeight = dmo.RealWeight * detail.Number / dmo.RealNumber;
+          if (detail.ExeWeight.HasValue)
+            detail.ExeWeight = decimal.Round(detail.ExeWeight.Value, 2);
           var money = detail.Money;
           if (dmo.PurchaseType_Name == "业务" && dmo.PayTarget == 付款对象.供应商)
           {
@@ -113,6 +115,8 @@ namespace BWP.B3QingDaoWanFu.TypeIOCs
         if ((dmo.RealNumber ?? 0) != 0)
         {
           detail.ExeWeight = dmo.RealWeight * detail.Number / dmo.RealNumber;
+          if (detail.ExeWeight.HasValue)
+            detail.ExeWeight = decimal.Round(detail.ExeWeight.Value, 2);
           var money = detail.Money;
           if (dmo.PurchaseType_Name == "业务" && dmo.PayTarget == 付款对象.供应商)
           {