需求单No.137525

BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj

@@ -94,9 +94,15 @@
     <Compile Include="Pages\B3YunKen\Bill\GoodsPackageSet.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
+    <Compile Include="Pages\B3YunKen\Dialogs\ProductionCompletionDialog.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
     <Compile Include="Pages\B3YunKen\Overlays\OrderEdit_Ext.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
+    <Compile Include="Pages\B3YunKen\Overlays\ProduceFinishBtnExt.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
     <Compile Include="Pages\B3YunKen\Overlays\ProduceFinishEdit_Ext.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
@@ -172,13 +178,7 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Pages\B3YunKen\ProductTask_\SaleOrderToProductNoticePage.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Pages\B3YunKen\Reports\LogisticsAnalysisReport.xml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  </ItemGroup>  <Import Project="$(MSBuildBinPath)\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.
   <Target Name="BeforeBuild">

BWP.B3_YunKen.Web/Pages/B3YunKen/Dialogs/ProductionCompletionDialog.cs

@@ -0,0 +1,94 @@
+
+
+using System;
+using BWP.B3Butchery.BO;
+using Forks.EnterpriseServices.DataForm;
+using TSingSoft.WebControls2;
+using BWP.Web.Layout;
+using BWP.Web.Utils;
+using Forks.EnterpriseServices.DomainObjects2.DQuery;
+using Forks.EnterpriseServices.DomainObjects2;
+using Forks.Utils;
+using BWP.B3Frameworks.BO.MoneyTemplate;
+using BWP.B3Frameworks.BO.NamedValueTemplate;
+
+namespace BWP.Web.Pages.B3YunKen.Dialogs
+{
+  public class ProductionCompletionDialog : DmoMultiSelectDialog<ProduceFinish, ProductInStore_Detail>
+  {
+    protected override void CreateQuery(VLayoutPanel vPanel)
+    {
+      var manager = new LayoutManager("",mDFInfo,mQueryContainer);
+      manager.Add("Date", QueryCreator.TimeRange(mDFInfo.Fields["Date"], mQueryContainer, "MinDate", "MaxDate"));
+      var config = new AutoLayoutConfig();
+      config.Add("ID");
+      config.Add("ProductionUnit_ID");
+      config.Add("AccountingUnit_ID");
+      config.Add("Department_ID");
+      config.Add("Employee_ID");
+      config.Add("Date");
+      manager.Config = config;
+      vPanel.Add(manager.CreateLayout());
+      base.CreateQuery(vPanel);
+    }
+
+    protected override void CreateQueryGridColumns(DFBrowseGrid grid)
+    {
+      grid.Columns.Add(new DFBrowseGridColumn("ID","生产完工单号"));
+      grid.Columns.Add(new DFBrowseGridColumn("ProductionUnit_Name", "生产单位"));
+      grid.Columns.Add(new DFBrowseGridColumn("Date","单据日期"));
+      grid.Columns.Add(new DFBrowseGridColumn("Goods_Name", "存货名称"));
+      grid.Columns.Add(new DFBrowseGridColumn("Goods_Spec", "存货规格"));
+      grid.Columns.Add(new DFBrowseGridColumn("BrandItem_Name", "品牌项"));
+      grid.Columns.Add(new DFBrowseGridColumn("Goods_SecondUnit"));
+      grid.Columns.Add(new DFBrowseGridColumn("SecondNumber", "辅数量"));
+      grid.Columns.Add(new DFBrowseGridColumn("Goods_MainUnit"));
+      grid.Columns.Add(new DFBrowseGridColumn("Number", "主数量"));
+      //grid.Columns.Add(new DFBrowseGridColumn("ID","生产完工单号"));
+      grid.Columns.Add(new DFBrowseGridColumn("TechnicalDescribe"));
+      grid.ValueColumns.Add("BrandItem_ID");
+    }
+
+    protected override void SetResultFromDFDataRow(ProductInStore_Detail dmo, DFDataRow row)
+    {
+      dmo.ID = (long)row["ID"];
+      dmo.Goods_ID = (long)row["Goods_ID"];
+      dmo.Goods_Name = (string)row["Goods_Name"];
+      dmo.Goods_Spec = (string)row["Goods_Spec"];
+      dmo.Goods_Code = (string)row["Goods_Code"];
+      dmo.Goods_Code = (string)row["BrandItem_ID"];
+      dmo.ProductionDate =Convert.ToDateTime(row["Date"]);
+      dmo.Number = (Money<decimal>?)row["Number"];
+      dmo.Goods_MainUnit = (string)row["Goods_MainUnit"];
+      dmo.Goods_SecondUnit = (string)row["Goods_SecondUnit"];
+      dmo.SecondNumber = (Money<decimal>?)row["SecondNumber"];
+      dmo.Price = (Money<decimal>?)row["Price"];
+      dmo.Money = (Money<金额>?)row["Money"];
+    }
+
+    protected override DQueryDom GetQueryDom()
+    {
+      var detail = JoinAlias.Create("detail");
+      var dom = base.GetQueryDom();
+      dom.Where.Conditions.Add(DQCondition.EQ("BillState", 单据状态.已审核));
+      dom.Columns.Add(DQSelectColumn.Field("ID"));
+      dom.Columns.Add(DQSelectColumn.Field("ProductionUnit_ID"));
+      dom.Columns.Add(DQSelectColumn.Field("Date"));
+      dom.Columns.Add(DQSelectColumn.Field("TechnicalDescribe",detail));
+      dom.Columns.Add(DQSelectColumn.Field("Goods_ID", detail));
+      dom.Columns.Add(DQSelectColumn.Field("Goods_Name", detail));
+      dom.Columns.Add(DQSelectColumn.Field("Goods_Spec",detail));
+      dom.Columns.Add(DQSelectColumn.Field("Goods_Code",detail));
+      dom.Columns.Add(DQSelectColumn.Field("BrandItem_ID",detail));
+      dom.Columns.Add(DQSelectColumn.Field("BrandItem_Name",detail));
+      dom.Columns.Add(DQSelectColumn.Field("Goods_SecondUnit", detail));
+      dom.Columns.Add(DQSelectColumn.Field("SecondNumber", detail));
+      dom.Columns.Add(DQSelectColumn.Field("Goods_MainUnit", detail));
+      dom.Columns.Add(DQSelectColumn.Field("Number",detail));
+      dom.Columns.Add(DQSelectColumn.Field("Price",detail));
+      dom.Columns.Add(DQSelectColumn.Field("Money",detail));
+
+      return dom;
+    }
+  }
+}

BWP.B3_YunKen.Web/Pages/B3YunKen/Dialogs/ProductionCompletionDialog.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Select xmlns="urn:XDQuery">
+  <Columns>
+    <Field name="ID"/>
+  </Columns>
+  <From>
+        <Join type="Left">
+          <DmoClass class="BWP.B3Butchery.BO.ProduceFinish,B3Butchery" alias="bill"/>
+          <DmoClass class="BWP.B3Butchery.BO.ProduceFinish_Detail,B3Butchery" alias="detail"/>
+          <Condition>
+            <EQ>
+              <Field name="ID" alias="bill"/>
+              <Field name="ProduceFinish_ID" alias="detail"/>
+            </EQ>
+          </Condition>
+        </Join>
+  </From>
+  <Where>
+    <And>
+      <EQ>
+        <Field name="ID"/>
+        <QBE paramName="ID"/>
+      </EQ>
+      <EQ>
+        <Field name="ProductionUnit_ID"/>
+        <QBE paramName="ProductionUnit_ID"/>
+      </EQ>
+      <EQ>
+        <Field name="AccountingUnit_ID"/>
+        <QBE paramName="AccountingUnit_ID"/>
+      </EQ>
+      <EQ>
+        <Field name="Department_ID"/>
+        <QBE paramName="Department_ID"/>
+      </EQ>
+      <EQ>
+        <Field name="Employee_ID"/>
+        <QBE paramName="Employee_ID"/>
+      </EQ>
+      <Contains>
+        <Field name="Date"/>
+        <QBE paramName="Date"/>
+      </Contains>
+    </And>
+  </Where>
+</Select>

BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/ProduceFinishBtnExt.cs

@@ -0,0 +1,31 @@
+using BWP.B3Butchery.BO;
+using BWP.Web.Pages.B3Butchery.Bills.ProductInStore_;
+using BWP.Web.Utils;
+using BWP.Web.WebControls;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using TSingSoft.WebControls2;
+
+namespace BWP.Web.Pages.B3YunKen.Overlays
+{
+  public class ProduceFinishBtnExt: ProductInStoreEdit
+  {
+    protected override void ProduceFinishBtn(HLayoutPanel hPanel, ProductInStoreEdit page)
+    {
+      var productioncompletion = hPanel.Add(new DialogButton { Text = "选择生产完工单" });
+      productioncompletion.Url = "/B3YunKen/Dialogs/ProductionCompletionDialog.aspx";
+      productioncompletion.Click += delegate
+      {
+        GetFromUI();
+        var details = DialogUtil.GetCachedObj<ProductInStore_Detail>(page);
+        foreach (var item in details)
+        {
+          Dmo.Details.Add(item);
+        }
+        detailGrid.DataBind();
+      };
+    }
+  }
+}

BWP.B3_YunKen.Web/PluginClass.cs

@@ -9,6 +9,7 @@ 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_;
+using BWP.Web.Pages.B3Butchery.Bills.ProductInStore_;
 
 namespace BWP.B3_YunKen.Web
 {
@@ -28,6 +29,7 @@ namespace BWP.B3_YunKen.Web
       WpfPageFactory.RegisterPageOverlay(typeof(ProductNoticeEdit).FullName, typeof(ProductNoticeEdit_Ext).FullName); 
       WpfPageFactory.RegisterPageOverlay(typeof(ProductNoticeReport).FullName, typeof(ProductNoticeReport_Ext).FullName);
       WpfPageFactory.RegisterPageOverlay(typeof(ProduceFinishEdit).FullName, typeof(ProduceFinishEdit_Ext).FullName);
+      WpfPageFactory.RegisterPageOverlay(typeof(ProductInStoreEdit).FullName, typeof(ProduceFinishBtnExt).FullName);
     }
 
     public void OnUnitInit()