From 2b08cbb520f41e93545754a6b7d5d24ffd82e3c1 Mon Sep 17 00:00:00 2001
From: xueyingcheng <xueyingcheng@bwpsoft.com>
Date: Tue, 12 Dec 2017 16:04:51 +0800
Subject: [PATCH] =?UTF-8?q?/=E9=9C=80=E6=B1=82=E5=8D=95No.137672?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj                | 8 +++++++-
 .../Pages/B3YunKen/Overlays/SaleOutStoreEdit_Ext.cs       | 3 +++
 BWP.B3_YunKen/TypeIoc/SaleOutStoreFreightBearTypeIoc.cs   | 4 ++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj b/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj
index 0dfe3af..ff5b089 100644
--- a/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj
+++ b/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj
@@ -178,7 +178,13 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Pages\B3YunKen\ProductTask_\SaleOrderToProductNoticePage.xml" />
-  </ItemGroup>  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Pages\B3YunKen\Reports\LogisticsAnalysisReport.xml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </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">
diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleOutStoreEdit_Ext.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleOutStoreEdit_Ext.cs
index aee915f..21f714f 100644
--- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleOutStoreEdit_Ext.cs
+++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleOutStoreEdit_Ext.cs
@@ -30,6 +30,9 @@ namespace BWP.Web.Pages.B3YunKen.Overlays
       config.Add("FreightUnitPrice");
       config.Add("FreightPrice");
       config.Add("FreightPayment");
+
+      //需求单No.137672 【销售出库】‘基本属性’增加字段｛承运方｝
+      config.Add("Carrier_ID");
     }
 
     protected override void AddLayOutManagerScript(LayoutManager layoutPanel)
diff --git a/BWP.B3_YunKen/TypeIoc/SaleOutStoreFreightBearTypeIoc.cs b/BWP.B3_YunKen/TypeIoc/SaleOutStoreFreightBearTypeIoc.cs
index 0dac7fe..09fab43 100644
--- a/BWP.B3_YunKen/TypeIoc/SaleOutStoreFreightBearTypeIoc.cs
+++ b/BWP.B3_YunKen/TypeIoc/SaleOutStoreFreightBearTypeIoc.cs
@@ -10,6 +10,10 @@ namespace BWP.B3_YunKen.TypeIoc
     public void GetFreightBear(Order order, SaleOutStore outstore)
     {
       outstore.FreightBear=order.FreightBear;
+
+      //需求单No.137672 【销售出库】‘基本属性’增加字段｛承运方｝
+      outstore.Carrier_ID = order.Carrier_ID;
+      outstore.Carrier_Name = order.Carrier_Name;
     }
   }
 }