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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -13,52 +29,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -67,10 +40,6 @@
-
-
-
-