From 43b9bc5e59892f29a1d8a3fd80271c9a65ced49c Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Sat, 27 Jan 2018 11:58:56 +0800
Subject: [PATCH] .

---
 .../SubKillGathering_/SelectStatPayDialog.cs  | 12 ++--
 .../SubKillGathering_/SelectStatPayDialog.xml | 65 +++++--------------
 2 files changed, 24 insertions(+), 53 deletions(-)

diff --git a/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/SubKillGathering_/SelectStatPayDialog.cs b/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/SubKillGathering_/SelectStatPayDialog.cs
index 1b4b916..f564f5d 100644
--- a/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/SubKillGathering_/SelectStatPayDialog.cs
+++ b/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/SubKillGathering_/SelectStatPayDialog.cs
@@ -11,6 +11,7 @@ using Forks.EnterpriseServices.DomainObjects2.DQuery;
 using Forks.Utils;
 using Forks.Utils.Collections;
 using TSingSoft.WebControls2;
+using Forks.EnterpriseServices.DomainObjects2;
 
 namespace BWP.Web.Pages.B3SubstituteKill.Bills.SubKillGathering_
 {
@@ -28,7 +29,7 @@ namespace BWP.Web.Pages.B3SubstituteKill.Bills.SubKillGathering_
       var tablePanel = new TableLayoutPanel(10, 1);
 
       tablePanel.Add(0, 1, 0, 1, new SimpleLabel("过磅单号"));
-      tablePanel.Add(1, 2, 0, 1, mQueryContainer.Add(new DFTextBox(mDFInfo.Fields["Weigh_ID"]), "Weigh_ID"));
+      tablePanel.Add(1, 2, 0, 1, mQueryContainer.Add(new DFTextBox(mDFInfo.Fields["ID"]), "Weigh_ID"));
 
       tablePanel.Add(2, 3, 0, 1, new SimpleLabel("结算单号"));
       tablePanel.Add(3, 4, 0, 1, mQueryContainer.Add(new DFTextBox(mDFInfo.Fields["ID"]), "ID"));
@@ -46,7 +47,9 @@ namespace BWP.Web.Pages.B3SubstituteKill.Bills.SubKillGathering_
       var bill = query.From.RootSource.Alias;
 
       query.Where.Conditions.Add(DQCondition.GreaterThan(DQExpression.Field("ReceiveMoney"), DQExpression.IfNull(DQExpression.Field("AlreadyReceiveMoney"), DQExpression.ConstValue(0))));
-
+      var weight = JoinAlias.Create("weight");
+      query.Columns.Add(DQSelectColumn.Create(DQExpression.Field(weight, "ID"), "Weigh_ID"));
+      query.Columns.Add(DQSelectColumn.Create(DQExpression.Field(weight, "Date"), "WeighTime"));
       query.Where.Conditions.Add(DQCondition.EQ("Supplier_ID", _supplierID));
       query.EAddCheckedCondition(bill);
       query.Where.Conditions.Add(DQCondition.EQ("Domain_ID", DomainContext.Current.ID));
@@ -69,9 +72,8 @@ namespace BWP.Web.Pages.B3SubstituteKill.Bills.SubKillGathering_
       grid.Columns.EAdd(new DFBrowseGridColumn("ID")).HeaderText = "结算单";
       grid.Columns.EAdd(new DFBrowseGridColumn("Supplier_Name"));
       grid.Columns.EAdd(new DFBrowseGridColumn("Date")).HeaderText = "结算日期";
-      grid.Columns.Add(new DFBrowseGridColumn("Weigh_ID"));
-      grid.Columns.Add(new DFBrowseGridColumn("WeighTime"));
-
+      grid.Columns.Add(new DFBrowseGridColumn("Weigh_ID", "过磅单号"));
+      grid.Columns.Add(new DFBrowseGridColumn("WeighTime", "过磅时间"));
       grid.Columns.Add(new DFBrowseGridColumn("ReceiveMoney"));
       grid.Columns.Add(new DFBrowseGridColumn("AlreadyReceiveMoney"));
       grid.Columns.Add(new DFBrowseGridColumn("Remark"));
diff --git a/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/SubKillGathering_/SelectStatPayDialog.xml b/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/SubKillGathering_/SelectStatPayDialog.xml
index cde0824..c49a303 100644
--- a/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/SubKillGathering_/SelectStatPayDialog.xml
+++ b/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/SubKillGathering_/SelectStatPayDialog.xml
@@ -4,7 +4,23 @@
     <Field name="ID"/>
   </Columns>
   <From>
+    <Join type="Left">
     <DmoClass class="BWP.B3SubstituteKill.BO.StatPay, B3SubstituteKill"/>
+      <DmoClass class="BWP.B3SubstituteKill.BO.SubKillWeightBill, B3SubstituteKill" alias="weight"/>
+      <Condition>
+        <And>
+          <EQ>
+            <Field name="SourceBillID"/>
+            <Field name="ID" alias="weight"/>
+          </EQ>
+          <EQ>
+            <Field name="ShourceBillType"/>
+            <Int16 value="4034"/>
+            <!--过磅单单据类型ID-->
+          </EQ>
+        </And>
+      </Condition>
+    </Join>
   </From>
   <Where>
     <And>
@@ -13,52 +29,9 @@
         <QBE paramName="ID"/>
       </EQ>
       <EQ>
-        <Field name="Supplier_ID"/>
-        <QBE paramName="Supplier_ID"/>
-      </EQ>
-      <EQ>
-        <Field name="AccountingUnit_ID"/>
-        <QBE paramName="AccountingUnit_ID"/>
-      </EQ>
-      <EQ>
-        <Field name="Department_ID"/>
-        <QBE paramName="Department_ID"/>
-      </EQ>
-      <EQ>
-        <Field name="Employee_ID"/>
-        <QBE paramName="Employee_ID"/>
-      </EQ>
-
-      <EQ>
-        <Field name="IsLocked"/>
-        <QBE paramName="IsLocked"/>
-      </EQ>
-
-      <EQ>
-        <Field name="Weigh_ID"/>
+        <Field name="ID" alias="weight"/>
         <QBE paramName="Weigh_ID"/>
       </EQ>
-      <Contains>
-        <Field name="Remark"/>
-        <QBE paramName="Remark"/>
-      </Contains>
-      <Contains>
-        <Field name="CreateUser_Name"/>
-        <QBE paramName="CreateUser_Name"/>
-      </Contains>
-      <Contains>
-        <Field name="CheckUser_Name"/>
-        <QBE paramName="CheckUser_Name"/>
-      </Contains>
-
-      <GreaterThanOrEqual>
-        <Field name="CreateTime"/>
-        <QBE paramName="MinCreateTime" />
-      </GreaterThanOrEqual>
-      <LessThanOrEqual>
-        <Field name="CreateTime"/>
-        <QBE paramName="MaxCreateTime"/>
-      </LessThanOrEqual>
       <GreaterThanOrEqual>
         <Field name="Date"/>
         <QBE paramName="MinDate" />
@@ -67,10 +40,6 @@
         <Field name="Date"/>
         <QBE paramName="MaxDate"/>
       </LessThanOrEqual>
-      <EQ>
-        <Field name="BillState"/>
-        <QBE paramName ="BillState"/>
-      </EQ>
     </And>
   </Where>
 </Select>