From 1cc69949f4fb123bc9e3b07d5bb1750f739a1250 Mon Sep 17 00:00:00 2001
From: duanluohua <duanluohua@bwp.com>
Date: Wed, 20 Dec 2017 21:03:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8D=95No.137643=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=93=81=E7=89=8C=E9=A1=B9=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E5=B8=A6=E5=85=A5=E5=88=B0=E6=98=8E=E7=BB=86=E4=B8=AD=20?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/B3YunKen/Dialogs/ProductionCompletionDialog.cs         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Dialogs/ProductionCompletionDialog.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Dialogs/ProductionCompletionDialog.cs
index 4ede035..c47a282 100644
--- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Dialogs/ProductionCompletionDialog.cs
+++ b/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"];

From 8da4c9cc77db25c7d0a902c947ac6e8067d8efd3 Mon Sep 17 00:00:00 2001
From: wugang <425674808@qq.com>
Date: Thu, 21 Dec 2017 14:51:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8D=95No.137726?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj    |  3 +++
 .../TypeIOCs/SaleGoodsBasePropertiesIOC.cs    | 20 +++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 BWP.B3_YunKen.Web/Pages/TypeIOCs/SaleGoodsBasePropertiesIOC.cs

diff --git a/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj b/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj
index 3a61a79..7949590 100644
--- a/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj
+++ b/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" />
diff --git a/BWP.B3_YunKen.Web/Pages/TypeIOCs/SaleGoodsBasePropertiesIOC.cs b/BWP.B3_YunKen.Web/Pages/TypeIOCs/SaleGoodsBasePropertiesIOC.cs
new file mode 100644
index 0000000..7c1299d
--- /dev/null
+++ b/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");
+    }
+  }
+}