From cb3114063c3a34c898d2c528e9def9a64b9648fc Mon Sep 17 00:00:00 2001
From: wugang <425674808@qq.com>
Date: Mon, 10 Dec 2018 15:00:50 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8D=95No.141907?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 B3_QiLianMuGe.Web/B3_QiLianMuGe.Web.csproj    | 11 +++++---
 .../Pages/Overlays/OutputEdit_Ext.cs          | 18 +++++++++++++
 B3_QiLianMuGe.Web/PluginClass.cs              |  2 ++
 .../OutputAnalyseBeforeAddQueryControlsIOC.cs | 25 +++++++++++++++++++
 ...portDisplayOptionHelperAddOptionItemIOC.cs | 19 ++++++++++++++
 ...utputListBeforeAddDFBrowseGridColumnIOC.cs | 20 +++++++++++++++
 .../OutputListBeforeAddQueryControlsIOC.cs    | 20 +++++++++++++++
 7 files changed, 112 insertions(+), 3 deletions(-)
 create mode 100644 B3_QiLianMuGe.Web/Pages/Overlays/OutputEdit_Ext.cs
 create mode 100644 B3_QiLianMuGe.Web/TypeIOCs/OutputAnalyseBeforeAddQueryControlsIOC.cs
 create mode 100644 B3_QiLianMuGe.Web/TypeIOCs/OutputAnalyseReportDisplayOptionHelperAddOptionItemIOC.cs
 create mode 100644 B3_QiLianMuGe.Web/TypeIOCs/OutputListBeforeAddDFBrowseGridColumnIOC.cs
 create mode 100644 B3_QiLianMuGe.Web/TypeIOCs/OutputListBeforeAddQueryControlsIOC.cs

diff --git a/B3_QiLianMuGe.Web/B3_QiLianMuGe.Web.csproj b/B3_QiLianMuGe.Web/B3_QiLianMuGe.Web.csproj
index d0a0bb8..8ba230a 100644
--- a/B3_QiLianMuGe.Web/B3_QiLianMuGe.Web.csproj
+++ b/B3_QiLianMuGe.Web/B3_QiLianMuGe.Web.csproj
@@ -145,11 +145,18 @@
     <Compile Include="Pages\B3_QiLianMuGe\ToK3Cloud\SaleOutStoreToK3CloudList.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
+    <Compile Include="Pages\Overlays\OutputEdit_Ext.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
     <Compile Include="Pages\Overlays\SaleOutStoreEdit_Ext.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="PluginClass.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TypeIOCs\OutputAnalyseBeforeAddQueryControlsIOC.cs" />
+    <Compile Include="TypeIOCs\OutputAnalyseReportDisplayOptionHelperAddOptionItemIOC.cs" />
+    <Compile Include="TypeIOCs\OutputListBeforeAddDFBrowseGridColumnIOC.cs" />
+    <Compile Include="TypeIOCs\OutputListBeforeAddQueryControlsIOC.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Pages\B3_QiLianMuGe\ToK3Cloud\SaleOutStoreToK3CloudList.xml" />
@@ -164,9 +171,7 @@
   <ItemGroup>
     <EmbeddedResource Include="Pages\B3_QiLianMuGe\ToK3Cloud\PayToK3CloudList.xml" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="TypeIOCs\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/B3_QiLianMuGe.Web/Pages/Overlays/OutputEdit_Ext.cs b/B3_QiLianMuGe.Web/Pages/Overlays/OutputEdit_Ext.cs
new file mode 100644
index 0000000..227a070
--- /dev/null
+++ b/B3_QiLianMuGe.Web/Pages/Overlays/OutputEdit_Ext.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using BWP.Web.Layout;
+using BWP.Web.Pages.B3CowButcherManage.Bills.Output_;
+
+namespace BWP.Web.Pages.Overlays
+{
+  class OutputEdit_Ext: OutputEdit
+  {
+    protected override void AddCustomerBaseProperties(LayoutManager layoutManager, AutoLayoutConfig config)
+    {
+      base.AddCustomerBaseProperties(layoutManager, config);
+      config.Add("ProductType_ID");
+    }
+  }
+}
diff --git a/B3_QiLianMuGe.Web/PluginClass.cs b/B3_QiLianMuGe.Web/PluginClass.cs
index 7e4d63c..298abef 100644
--- a/B3_QiLianMuGe.Web/PluginClass.cs
+++ b/B3_QiLianMuGe.Web/PluginClass.cs
@@ -1,5 +1,6 @@
 using BWP.B3CowButcherManage;
 using BWP.B3Sale;
+using BWP.Web.Pages.B3CowButcherManage.Bills.Output_;
 using BWP.Web.Pages.B3Sale.Bills.SaleOutStore_;
 using TSingSoft.WebPluginFramework;
 using TSingSoft.WebPluginFramework.Pages;
@@ -14,6 +15,7 @@ namespace BWP.B3_QiLianMuGe.Web
       GlobalFlags.On(B3SaleConsts.Flags.SaleOutStoreListOrderByID);
       GlobalFlags.On(B3CowButcherManageConsts.GlobalFlags.投入产出成品入库按过磅单屠宰批次生成单据);
       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);
     }
   }
 }
diff --git a/B3_QiLianMuGe.Web/TypeIOCs/OutputAnalyseBeforeAddQueryControlsIOC.cs b/B3_QiLianMuGe.Web/TypeIOCs/OutputAnalyseBeforeAddQueryControlsIOC.cs
new file mode 100644
index 0000000..c069fe3
--- /dev/null
+++ b/B3_QiLianMuGe.Web/TypeIOCs/OutputAnalyseBeforeAddQueryControlsIOC.cs
@@ -0,0 +1,25 @@
+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(OutputAnalyse), typeof(OutputAnalyse.BeforeAddQueryControls))]
+  public class OutputAnalyseBeforeAddQueryControlsIOC : OutputAnalyse.BeforeAddQueryControls
+  {
+    public void Invoke(LayoutManager panel, AutoLayoutConfig config, IDFInfo dFInfo, QueryContainer queryContainer)
+    {
+      panel.Add("ProductType_ID", new SimpleLabel("生产类型"), QueryCreator.DFChoiceBoxEnableMultiSelection(dFInfo.Fields["ID"], queryContainer, "ProductType_ID", B3CowButcherManageConsts.DataSources.生产类型));
+      panel["ProductType_ID"].NotAutoAddToContainer = true;
+      config.Add("ProductType_ID");
+    }
+  }
+}
diff --git a/B3_QiLianMuGe.Web/TypeIOCs/OutputAnalyseReportDisplayOptionHelperAddOptionItemIOC.cs b/B3_QiLianMuGe.Web/TypeIOCs/OutputAnalyseReportDisplayOptionHelperAddOptionItemIOC.cs
new file mode 100644
index 0000000..4349112
--- /dev/null
+++ b/B3_QiLianMuGe.Web/TypeIOCs/OutputAnalyseReportDisplayOptionHelperAddOptionItemIOC.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(OutputAnalyse), typeof(OutputAnalyse.ReportDisplayOptionHelperAddOptionItem))]
+  public class OutputAnalyseReportDisplayOptionHelperAddOptionItemIOC : OutputAnalyse.ReportDisplayOptionHelperAddOptionItem
+  {
+    public void Invoke(ReportDisplayOptionHelper helper)
+    {
+      helper.AddOptionItem("生产类型", "bill", "ProductType_Name", false);
+    }
+  }
+}
diff --git a/B3_QiLianMuGe.Web/TypeIOCs/OutputListBeforeAddDFBrowseGridColumnIOC.cs b/B3_QiLianMuGe.Web/TypeIOCs/OutputListBeforeAddDFBrowseGridColumnIOC.cs
new file mode 100644
index 0000000..658aab8
--- /dev/null
+++ b/B3_QiLianMuGe.Web/TypeIOCs/OutputListBeforeAddDFBrowseGridColumnIOC.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using BWP.B3Frameworks;
+using BWP.Web.Layout;
+using BWP.Web.Pages.B3CowButcherManage.Bills.Output_;
+
+namespace BWP.Web.TypeIOCs
+{
+  [TypeIOC(typeof(OutputList), typeof(OutputList.BeforeAddDFBrowseGridColumn))]
+  public class OutputListBeforeAddDFBrowseGridColumnIOC : OutputList.BeforeAddDFBrowseGridColumn
+  {
+    public void Invoke(List<string> list)
+    {
+      list.Add("ProductType_ID");
+    }
+
+  }
+}
diff --git a/B3_QiLianMuGe.Web/TypeIOCs/OutputListBeforeAddQueryControlsIOC.cs b/B3_QiLianMuGe.Web/TypeIOCs/OutputListBeforeAddQueryControlsIOC.cs
new file mode 100644
index 0000000..1f1d7f0
--- /dev/null
+++ b/B3_QiLianMuGe.Web/TypeIOCs/OutputListBeforeAddQueryControlsIOC.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using BWP.B3Frameworks;
+using BWP.Web.Layout;
+using BWP.Web.Pages.B3CowButcherManage.Bills.Output_;
+
+namespace BWP.Web.TypeIOCs
+{
+
+  [TypeIOC(typeof(OutputList), typeof(OutputList.BeforeAddQueryControls))]
+  public class OutputListBeforeAddQueryControlsIOC : OutputList.BeforeAddQueryControls
+  {
+    public void Invoke(LayoutManager panel, AutoLayoutConfig config)
+    {
+      config.Add("ProductType_ID");
+    }
+  }
+}