From af6314620f71884158bd61f868879fcbf4b29eff Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Mon, 19 Nov 2018 10:42:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=80=A5=E5=AE=B0=E6=98=8E=E7=BB=86=E5=8A=A0?=
 =?UTF-8?q?=E5=90=88=E8=AE=A1=E3=80=82=E6=8A=A5=E8=A1=A8=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=E5=8A=A0=E8=BF=87=E7=A3=85=E5=8D=95=E5=8F=B7=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Bills/HurryButcher_/HurryButcherEdit.cs     |  6 +++---
 .../HurryButcherAnalyse_/HurryButcherAnalyse.cs |  5 +++--
 .../HurryButcherAnalyse.xml                     | 17 +++++++++++++++--
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/HurryButcher_/HurryButcherEdit.cs b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/HurryButcher_/HurryButcherEdit.cs
index 212f0e2..89dce22 100644
--- a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/HurryButcher_/HurryButcherEdit.cs
+++ b/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"));
diff --git a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/HurryButcherAnalyse_/HurryButcherAnalyse.cs b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/HurryButcherAnalyse_/HurryButcherAnalyse.cs
index 48b804f..21ee86e 100644
--- a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/HurryButcherAnalyse_/HurryButcherAnalyse.cs
+++ b/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);
 
diff --git a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/HurryButcherAnalyse_/HurryButcherAnalyse.xml b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/HurryButcherAnalyse_/HurryButcherAnalyse.xml
index f8942ec..47c24b5 100644
--- a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/HurryButcherAnalyse_/HurryButcherAnalyse.xml
+++ b/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>
\ No newline at end of file