diff --git a/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj b/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj
index 4788927..98bb6f5 100644
--- a/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj
+++ b/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj
@@ -90,6 +90,7 @@
ASPXCodeBehind
+
ASPXCodeBehind
diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/ProductNoticeEdit_Ext.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/ProductNoticeEdit_Ext.cs
index 0c72768..bf57e6e 100644
--- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/ProductNoticeEdit_Ext.cs
+++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/ProductNoticeEdit_Ext.cs
@@ -10,8 +10,9 @@ namespace BWP.Web.Pages.B3YunKen.Overlays
{
public class ProductNoticeEdit_Ext: ProductNoticeEdit
{
- protected override void AddYunKenGridColumns(DFEditGrid _detailGrid)
+ protected override void AddGridColumnsByBrandItem_ID(DFEditGrid _detailGrid)
{
+
_detailGrid.Columns.Add(new DFEditGridColumn("OrderByID"));
if (GlobalFlags.get(B3UnitedInfosConsts.GlobalFlags.库存支持品牌项))
{
@@ -19,7 +20,7 @@ namespace BWP.Web.Pages.B3YunKen.Overlays
}
_detailGrid.Columns.Add(new DFEditGridColumn("Detail_Customer_ID"));
}
- protected override DFCollectionEditor AddYunKenGridOrderByID()
+ protected override DFCollectionEditor AddGridByOrderByID()
{
return new DFCollectionEditor(() => Dmo.Details.OrderBy(x => x.OrderByID).ToList());
}
diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/ProductNoticeReport_Ext.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/ProductNoticeReport_Ext.cs
new file mode 100644
index 0000000..13db915
--- /dev/null
+++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/ProductNoticeReport_Ext.cs
@@ -0,0 +1,25 @@
+using BWP.Web.Pages.B3Butchery.Reports.ProductNoticeReport_;
+using BWP.Web.Utils;
+using BWP.Web.WebControls;
+using System.Web.UI.WebControls;
+using TSingSoft.WebControls2;
+using BWP.Web.Layout;
+using Forks.EnterpriseServices.DataForm;
+using BWP.B3UnitedInfos;
+
+namespace BWP.Web.Pages.B3YunKen.Overlays
+{
+ public class ProductNoticeReport_Ext : ProductNoticeReport
+ {
+ protected override void AddQueryPanelByBrandItem_Name(CheckBoxListWithReverseSelect _checkbox)
+ {
+ _checkbox.Items.Add(new ListItem("品牌项", "BrandItem_Name"));
+ }
+
+ protected override void AddQueryControlsByBrandItem_ID(LayoutManager manager, DFInfo info)
+ {
+ manager.Add("BrandItem_ID", new SimpleLabel("品牌项"), QueryCreator.DFChoiceBoxEnableMultiSelection(info.Fields["BrandItem_ID"], mQueryContainer, "BrandItem_ID", B3UnitedInfosConsts.DataSources.品牌项));
+ manager["BrandItem_ID"].NotAutoAddToContainer = true;
+ }
+ }
+}
diff --git a/BWP.B3_YunKen.Web/PluginClass.cs b/BWP.B3_YunKen.Web/PluginClass.cs
index 30313b3..bc18598 100644
--- a/BWP.B3_YunKen.Web/PluginClass.cs
+++ b/BWP.B3_YunKen.Web/PluginClass.cs
@@ -7,6 +7,7 @@ using BWP.Web.Pages.B3YunKen.Overlays;
using BWP.Web.Pages.B3Sale.Bills.SaleOutStore_;
using BWP.Web.Pages.B3Sale.Bills.SaleForecast_;
using BWP.Web.Pages.B3Butchery.Bills.ProductNotice_;
+using BWP.Web.Pages.B3Butchery.Reports.ProductNoticeReport_;
namespace BWP.B3_YunKen.Web
{
@@ -23,7 +24,8 @@ namespace BWP.B3_YunKen.Web
WpfPageFactory.RegisterPageOverlay(typeof(OrderEdit).FullName, typeof(OrderEdit_Ext).FullName);
WpfPageFactory.RegisterPageOverlay(typeof(SaleOutStoreEdit).FullName, typeof(SaleOutStoreEdit_Ext).FullName);
WpfPageFactory.RegisterPageOverlay(typeof(SaleForecastEdit).FullName, typeof(SaleForecastEdit_Ext).FullName);
- WpfPageFactory.RegisterPageOverlay(typeof(ProductNoticeEdit).FullName, typeof(ProductNoticeEdit_Ext).FullName);
+ WpfPageFactory.RegisterPageOverlay(typeof(ProductNoticeEdit).FullName, typeof(ProductNoticeEdit_Ext).FullName);
+ WpfPageFactory.RegisterPageOverlay(typeof(ProductNoticeReport).FullName, typeof(ProductNoticeReport_Ext).FullName);
}
public void OnUnitInit()