diff --git a/B3_QiLianMuGe.Web/B3_QiLianMuGe.Web.csproj b/B3_QiLianMuGe.Web/B3_QiLianMuGe.Web.csproj
index 1ffd7b5..2479595 100644
--- a/B3_QiLianMuGe.Web/B3_QiLianMuGe.Web.csproj
+++ b/B3_QiLianMuGe.Web/B3_QiLianMuGe.Web.csproj
@@ -151,15 +151,21 @@
ASPXCodeBehind
+
+ ASPXCodeBehind
+
ASPXCodeBehind
+
+
+
diff --git a/B3_QiLianMuGe.Web/Pages/Overlays/PickingEdit_Ext.cs b/B3_QiLianMuGe.Web/Pages/Overlays/PickingEdit_Ext.cs
new file mode 100644
index 0000000..3b01926
--- /dev/null
+++ b/B3_QiLianMuGe.Web/Pages/Overlays/PickingEdit_Ext.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using BWP.Web.Pages.B3CowButcherManage.Bills.Picking_;
+using TSingSoft.WebControls2;
+
+namespace BWP.Web.Pages.Overlays
+{
+ class PickingEdit_Ext: PickingEdit
+ {
+ protected override void AddCustomerDetailColumns(DFEditGrid detailGrid)
+ {
+ detailGrid.Columns.Add(new DFEditGridColumn("CowBatch"));
+ }
+ }
+}
diff --git a/B3_QiLianMuGe.Web/PluginClass.cs b/B3_QiLianMuGe.Web/PluginClass.cs
index 4b0aa48..7338b99 100644
--- a/B3_QiLianMuGe.Web/PluginClass.cs
+++ b/B3_QiLianMuGe.Web/PluginClass.cs
@@ -2,6 +2,7 @@
using BWP.B3Sale;
using BWP.Web.Pages.B3CowButcherManage.Bills.CostShare_;
using BWP.Web.Pages.B3CowButcherManage.Bills.Output_;
+using BWP.Web.Pages.B3CowButcherManage.Bills.Picking_;
using BWP.Web.Pages.B3Sale.Bills.SaleOutStore_;
using TSingSoft.WebPluginFramework;
using TSingSoft.WebPluginFramework.Pages;
@@ -19,6 +20,7 @@ namespace BWP.B3_QiLianMuGe.Web
WpfPageFactory.RegisterPageOverlay(typeof(SaleOutStoreEdit).FullName, typeof(BWP.Web.Pages.Overlays.SaleOutStoreEdit_Ext).FullName);
WpfPageFactory.RegisterPageOverlay(typeof(OutputEdit).FullName, typeof(BWP.Web.Pages.Overlays.OutputEdit_Ext).FullName);
WpfPageFactory.RegisterPageOverlay(typeof(CostShareEdit).FullName, typeof(BWP.Web.Pages.Overlays.CostShareEdit_Ext).FullName);
+ WpfPageFactory.RegisterPageOverlay(typeof(PickingEdit).FullName, typeof(BWP.Web.Pages.Overlays.PickingEdit_Ext).FullName);
}
}
}
diff --git a/B3_QiLianMuGe.Web/TypeIOCs/InputAnalyseReportBeforeAddQueryControls.cs b/B3_QiLianMuGe.Web/TypeIOCs/InputAnalyseReportBeforeAddQueryControls.cs
new file mode 100644
index 0000000..3b59804
--- /dev/null
+++ b/B3_QiLianMuGe.Web/TypeIOCs/InputAnalyseReportBeforeAddQueryControls.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using BWP.B3CowButcherManage;
+using BWP.B3Frameworks;
+using BWP.Web.Layout;
+using BWP.Web.Pages.B3CowButcherManage.Reports;
+using BWP.Web.Utils;
+using Forks.EnterpriseServices.DataForm;
+using TSingSoft.WebControls2;
+
+namespace BWP.Web.TypeIOCs
+{
+ [TypeIOC(typeof(InputAnalyse), typeof(InputAnalyse.BeforeAddQueryControls))]
+ public class InputAnalyseReportBeforeAddQueryControls : InputAnalyse.BeforeAddQueryControls
+ {
+ public void Invoke(LayoutManager panel, AutoLayoutConfig config, IDFInfo dFInfo, QueryContainer queryContainer)
+ {
+ var batch = QueryCreator.DFChoiceBoxEnableMultiSelection(dFInfo.Fields["Code"], queryContainer, "ButcherBatch", B3CowButcherManageConsts.DataSources.屠宰批次);
+ panel.Add("ButcherBatch", new SimpleLabel("屠宰批次"), batch);
+ panel["ButcherBatch"].NotAutoAddToContainer = true;
+ config.Add("ButcherBatch");
+ }
+ }
+}
diff --git a/B3_QiLianMuGe.Web/TypeIOCs/PickingAnalyseBeforeAddQueryControls.cs b/B3_QiLianMuGe.Web/TypeIOCs/PickingAnalyseBeforeAddQueryControls.cs
new file mode 100644
index 0000000..8264216
--- /dev/null
+++ b/B3_QiLianMuGe.Web/TypeIOCs/PickingAnalyseBeforeAddQueryControls.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using BWP.B3CowButcherManage;
+using BWP.B3Frameworks;
+using BWP.Web.Layout;
+using BWP.Web.Pages.B3CowButcherManage.Reports;
+using BWP.Web.Utils;
+using Forks.EnterpriseServices.DataForm;
+using TSingSoft.WebControls2;
+
+namespace BWP.Web.TypeIOCs
+{
+ [TypeIOC(typeof(PickingAnalyse), typeof(PickingAnalyse.BeforeAddQueryControls))]
+ public class PickingAnalyseBeforeAddQueryControls : PickingAnalyse.BeforeAddQueryControls
+ {
+ public void Invoke(LayoutManager panel, AutoLayoutConfig config, IDFInfo dFInfo, QueryContainer queryContainer)
+ {
+ var batch = QueryCreator.DFChoiceBoxEnableMultiSelection(dFInfo.Fields["Code"], queryContainer, "CowBatch", B3CowButcherManageConsts.DataSources.屠宰批次);
+ panel.Add("CowBatch", new SimpleLabel("屠宰批次"), batch);
+ panel["CowBatch"].NotAutoAddToContainer = true;
+ config.Add("CowBatch");
+ }
+ }
+}
diff --git a/B3_QiLianMuGe.Web/TypeIOCs/PickingAnalyseReportDisplayOptionHelperAddOptionItem.cs b/B3_QiLianMuGe.Web/TypeIOCs/PickingAnalyseReportDisplayOptionHelperAddOptionItem.cs
new file mode 100644
index 0000000..5dedb0a
--- /dev/null
+++ b/B3_QiLianMuGe.Web/TypeIOCs/PickingAnalyseReportDisplayOptionHelperAddOptionItem.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using BWP.B3Frameworks;
+using BWP.Web.Pages.B3CowButcherManage.Reports;
+using BWP.Web.Utils;
+
+namespace BWP.Web.TypeIOCs
+{
+ [TypeIOC(typeof(PickingAnalyse), typeof(PickingAnalyse.ReportDisplayOptionHelperAddOptionItem))]
+ public class PickingAnalyseReportDisplayOptionHelperAddOptionItem : PickingAnalyse.ReportDisplayOptionHelperAddOptionItem
+ {
+ public void Invoke(ReportDisplayOptionHelper helper)
+ {
+ helper.AddOptionItem("屠宰批次", "detail", "CowBatch", false);
+ }
+ }
+}