From 29edef5f06de5dee7b02ed317cf568aa6524cc70 Mon Sep 17 00:00:00 2001
From: luanhui <1029149336@qq.com>
Date: Sun, 10 Dec 2017 16:27:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=B4=B9=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../B3_DongFangWanQi.Web.csproj | 63 +++++++++++++++----
.../Overlays/SaleOutStoreAnalyse_Ext.cs | 34 ++++++++++
B3_DongFangWanQi.Web/PluginClass.cs | 8 ++-
B3_DongFangWanQi/B3_DongFangWanQi.csproj | 30 ++++-----
4 files changed, 107 insertions(+), 28 deletions(-)
create mode 100644 B3_DongFangWanQi.Web/Overlays/SaleOutStoreAnalyse_Ext.cs
diff --git a/B3_DongFangWanQi.Web/B3_DongFangWanQi.Web.csproj b/B3_DongFangWanQi.Web/B3_DongFangWanQi.Web.csproj
index 6488d40..8cad3f1 100644
--- a/B3_DongFangWanQi.Web/B3_DongFangWanQi.Web.csproj
+++ b/B3_DongFangWanQi.Web/B3_DongFangWanQi.Web.csproj
@@ -34,43 +34,83 @@
AllRules.ruleset
-
-
+
+ False
+ False
+
+
+ False
+ False
+
False
..\..\..\tsref\Debug\B3Sale.dll
+ False
False
..\..\..\tsref\Debug\B3Sale.Web.dll
+ False
+
+
+ False
+ False
+
+
+ False
+ False
+
+
+ False
+ False
-
-
-
False
..\..\..\TsingSoft2\TSREF\Forks.Utils.dll
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
-
-
-
-
-
False
..\..\..\TsingSoft2\TSREF\TSingSoft.WebControls2.dll
+ False
+
+
+ False
+ False
-
False
..\..\..\tsref\Debug\Wpf.System.dll
+ False
False
..\..\..\tsref\Debug\Wpf.System.Web.dll
+ False
+
+ Customer_version.cs
+
+
+ ASPXCodeBehind
+
ASPXCodeBehind
@@ -97,6 +137,7 @@
{87cf591a-d1d7-4c3c-a890-38cf99b36ff2}
B3_DongFangWanQi
+ False
diff --git a/B3_DongFangWanQi.Web/Overlays/SaleOutStoreAnalyse_Ext.cs b/B3_DongFangWanQi.Web/Overlays/SaleOutStoreAnalyse_Ext.cs
new file mode 100644
index 0000000..20119f9
--- /dev/null
+++ b/B3_DongFangWanQi.Web/Overlays/SaleOutStoreAnalyse_Ext.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Web.UI.WebControls;
+using BWP.Web.Pages.B3Sale.Reports;
+using Forks.EnterpriseServices.DataForm;
+using Forks.EnterpriseServices.DomainObjects2;
+using Forks.EnterpriseServices.DomainObjects2.DQuery;
+
+namespace BWP.Web.Overlays
+{
+ class SaleOutStoreAnalyse_Ext: SaleOutStoreAnalyse
+ {
+ protected override bool AddCustomerSelfColumns(JoinAlias alias, DQueryDom dom, ListItem field)
+ {
+// return base.AddCustomerSelfColumns(alias, dom, field);
+ if (field.Text == "FreightPrice")
+ {
+ dom.Columns.Add(DQSelectColumn.Field("FreightPrice", alias));
+ dom.GroupBy.Expressions.Add(DQExpression.Field(alias, field.Value));
+ ColumnNames.Add(field.Value);
+ return true;
+ }
+
+ return false;
+ }
+
+ protected override void AddCustomerShowFields(Dictionary fileInfo, DFInfo mainInfo, DFInfo detailInfo, List spec)
+ {
+ _fileInfo.Add("FreightPrice", mainInfo);
+ }
+ }
+}
diff --git a/B3_DongFangWanQi.Web/PluginClass.cs b/B3_DongFangWanQi.Web/PluginClass.cs
index 120a63d..72bcbab 100644
--- a/B3_DongFangWanQi.Web/PluginClass.cs
+++ b/B3_DongFangWanQi.Web/PluginClass.cs
@@ -1,5 +1,8 @@
-using TSingSoft.WebPluginFramework;
-
+using BWP.Web.Overlays;
+using BWP.Web.Pages.B3Sale.Reports;
+using TSingSoft.WebPluginFramework;
+using TSingSoft.WebPluginFramework.Pages;
+
namespace B3_DongFangWanQi.Web
{
public class PluginClass : IPluginClass
@@ -9,6 +12,7 @@ namespace B3_DongFangWanQi.Web
public void OnInit()
{
+ WpfPageFactory.RegisterPageOverlay(typeof(SaleOutStoreAnalyse).FullName, typeof(SaleOutStoreAnalyse_Ext).FullName);
}
public void OnUnitInit()
diff --git a/B3_DongFangWanQi/B3_DongFangWanQi.csproj b/B3_DongFangWanQi/B3_DongFangWanQi.csproj
index 280a834..3aa682a 100644
--- a/B3_DongFangWanQi/B3_DongFangWanQi.csproj
+++ b/B3_DongFangWanQi/B3_DongFangWanQi.csproj
@@ -37,41 +37,41 @@
False
..\..\..\tsref\Debug\B3Frameworks.dll
-
+ False
False
..\..\..\tsref\Debug\B3Frameworks.Web.dll
-
-
-
-
+ False
+ FalseFalse
+ FalseFalse
+ FalseFalse
False
..\..\..\TsingSoft2\TSREF\Forks.Utils.dll
-
-
-
-
-
+ False
+ False
+ False
+ False
+ False
False
..\..\..\TsingSoft2\TSREF\TSingSoft.WebControls2.dll
-
+ False
False
..\..\..\tsref\Debug\Wpf.dll
-
+ False
False
..\..\..\tsref\Debug\Wpf.System.dll
-
+ False
False
..\..\..\..\tsref\Debug\Wpf.System.Web.dll
-
+ False
-
+ Customer_version.cs