需求单No.142002

B3_QiLianMuGe.Web/B3_QiLianMuGe.Web.csproj

@@ -151,15 +151,21 @@
     <Compile Include="Pages\Overlays\OutputEdit_Ext.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
+    <Compile Include="Pages\Overlays\PickingEdit_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\InputAnalyseReportBeforeAddQueryControls.cs" />
     <Compile Include="TypeIOCs\OutputAnalyseBeforeAddQueryControlsIOC.cs" />
     <Compile Include="TypeIOCs\OutputAnalyseReportDisplayOptionHelperAddOptionItemIOC.cs" />
     <Compile Include="TypeIOCs\OutputListBeforeAddDFBrowseGridColumnIOC.cs" />
     <Compile Include="TypeIOCs\OutputListBeforeAddQueryControlsIOC.cs" />
+    <Compile Include="TypeIOCs\PickingAnalyseBeforeAddQueryControls.cs" />
+    <Compile Include="TypeIOCs\PickingAnalyseReportDisplayOptionHelperAddOptionItem.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Pages\B3_QiLianMuGe\ToK3Cloud\SaleOutStoreToK3CloudList.xml" />

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<DFTextBox>("CowBatch"));
+    }
+  }
+}

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);
     }
   }
 }

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");
+    }
+  }
+}

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");
+    }
+  }
+}

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);
+    }
+  }
+}