Merge branch 'master' of 192.168.1.5:BWPB3/B3YunKen

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

@@ -144,6 +144,9 @@
     <Compile Include="Pages\TypeIOCs\CustomerEditAddBasePropertiesIOC.cs" />
     <Compile Include="Pages\TypeIOCs\GatheringPrintTypeIOC.cs" />
     <Compile Include="Pages\TypeIOCs\GoodsApplyBasePropertiesIOC.cs" />
+    <Compile Include="Pages\TypeIOCs\SaleGoodsBasePropertiesIOC.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Pages\Utils\Second_ConvertRatioRowManager.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PluginClass.cs" />

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

@@ -57,6 +57,7 @@ namespace BWP.Web.Pages.B3YunKen.Dialogs
       dmo.Goods_Spec = (string)row["Goods_Spec"];
       dmo.Goods_Code = (string)row["Goods_Code"];
       dmo.BrandItem_ID = (long?)row["BrandItem_ID"];
+      dmo.BrandItem_Name = (string)row["BrandItem_Name"];
       dmo.ProductionDate =Convert.ToDateTime(row["Date"]);
       dmo.Number = (Money<decimal>?)row["Number"];
       dmo.Goods_MainUnit = (string)row["Goods_MainUnit"];

BWP.B3_YunKen.Web/Pages/TypeIOCs/SaleGoodsBasePropertiesIOC.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using BWP.B3Frameworks;
+using BWP.Web.Pages.B3Sale.BaseInfos;
+using BWP.Web.Pages.B3Sale.Bills.GoodsApply_;
+
+namespace BWP.Web.Pages.TypeIOCs
+{
+  [TypeIOC(typeof(SaleGoodsEdit), typeof(SaleGoodsEdit.BaseDmoEditPageIOCs.BeforeBasePropertiesApplyLayout))]
+  public class SaleGoodsBasePropertiesIOC : SaleGoodsEdit.BaseDmoEditPageIOCs.BeforeBasePropertiesApplyLayout
+  {
+    public void Invoke(System.Web.UI.Page page, Web.Layout.LayoutManager manager, Web.Layout.AutoLayoutConfig config, Web.CustomPageLayout.PageLayoutSection section)
+    {
+      config.AddAfter("StandardGoods_ID", "IsStandard");
+      config.AddAfter("Diff", "StandardGoods_ID");
+    }
+  }
+}