急宰明细加合计。报表分析加过磅单号查询条件。

B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/HurryButcher_/HurryButcherEdit.cs

@@ -115,9 +115,9 @@ namespace BWP.Web.Pages.B3SheepButcherManage.Bills.HurryButcher_
         e.Control.DFDisplayField = "Livestock_Name";
         e.Control.Width = 160;
       };
-      _detailGrid.Columns.Add(new DFEditGridColumn<DFTextBox>("Number"));
-      _detailGrid.Columns.Add(new DFEditGridColumn<DFTextBox>("GrossWeight"));
-      _detailGrid.Columns.Add(new DFEditGridColumn<DFTextBox>("Weight"));
+      _detailGrid.Columns.Add(new DFEditGridColumn<DFTextBox>("Number") { SumMode = SumMode.Sum });
+      _detailGrid.Columns.Add(new DFEditGridColumn<DFTextBox>("GrossWeight") { SumMode = SumMode.Sum });
+      _detailGrid.Columns.Add(new DFEditGridColumn<DFTextBox>("Weight") { SumMode = SumMode.Sum });
 
       _detailGrid.Columns.Add(new DFEditGridColumn("Destroy"));
       _detailGrid.Columns.Add(new DFEditGridColumn<DFTextBox>("Remark"));

B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/HurryButcherAnalyse_/HurryButcherAnalyse.cs

@@ -50,6 +50,8 @@ namespace BWP.Web.Pages.B3SheepButcherManage.Reports.HurryButcherAnalyse_
 
       layout.Add("Supplier_ID", new SimpleLabel("供应商"), QueryCreator.DFChoiceBox(mDFInfo.Fields["Supplier_ID"], B3ProcurementInterfaceDataSources.供应商用于屠宰场));
 
+      layout.Add("Weigh_ID", new SimpleLabel("过磅单号"), QueryCreator.DFTextBox(mDFInfo.Fields["ID"]));
+
       layout.Add("Date", new SimpleLabel("日期"), QueryCreator.TimeRange(mDFInfo.Fields["Date"], mQueryContainer, "MinDate", "MaxDate"));
       layout["Date"].NotAutoAddToContainer = true;
 
@@ -63,6 +65,7 @@ namespace BWP.Web.Pages.B3SheepButcherManage.Reports.HurryButcherAnalyse_
       config.Add("Department_ID");
       config.Add("Employee_ID");
       config.Add("Supplier_ID");
+      config.Add("Weigh_ID");
       config.Add("Date");
       config.Add("BillState");
 
@@ -101,9 +104,7 @@ namespace BWP.Web.Pages.B3SheepButcherManage.Reports.HurryButcherAnalyse_
       var bill = dom.From.RootSource.Alias;
       mDisplayHelper.AddAlias("bill", JoinAlias.Create("bill"));
 
-      var HurryButcher_Detail = new JoinAlias("HurryButcher_Detail", typeof(HurryButcher_Detail));
       mDisplayHelper.AddAlias("HurryButcher_Detail", JoinAlias.Create("HurryButcher_Detail"));
-      dom.From.AddJoin(JoinType.Left, new DQDmoSource(HurryButcher_Detail), DQCondition.EQ(bill, "ID", HurryButcher_Detail, "HurryButcher_ID"));
 
       mDisplayHelper.AddSelectColumns(dom, (name) => OptionIsSelected("选项", name), SumColumnIndexs);
 

B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/HurryButcherAnalyse_/HurryButcherAnalyse.xml

@@ -4,8 +4,16 @@
 
   </Columns>
   <From>
-    <DmoClass class="BWP.B3SheepButcherManage.BO.HurryButcher, B3SheepButcherManage" alias="bill"/>
-
+    <Join type="Left">
+      <DmoClass class="BWP.B3SheepButcherManage.BO.HurryButcher, B3SheepButcherManage" alias="bill"/>
+      <DmoClass class="BWP.B3SheepButcherManage.BO.HurryButcher_Detail, B3SheepButcherManage" alias="HurryButcher_Detail"/>
+      <Condition>
+        <EQ>
+          <Field name="ID" alias="bill"/>
+          <Field name="HurryButcher_ID" alias="HurryButcher_Detail"/>
+        </EQ>
+      </Condition>
+    </Join>
   </From>
   <Where>
     <And>
@@ -49,6 +57,11 @@
         <Field name="Date" alias="bill"/>
         <QBE paramName="MaxDate"/>
       </LessThanOrEqual>
+
+      <EQ>
+        <Field name="Weigh_ID" alias="HurryButcher_Detail"/>
+        <QBE paramName="Weigh_ID"/>
+      </EQ>
     </And>
   </Where>
 </Select>