From 125c9d6cb96b1bc9ecacc052ea09c9aba38b2c31 Mon Sep 17 00:00:00 2001
From: wugang <425674808@qq.com>
Date: Fri, 16 Mar 2018 15:33:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8D=95No.139063?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 B3QingDaoWanFu.Web/B3QingDaoWanFu.Web.csproj  |  6 +--
 .../Pages/TypeIOCs/CarLoadingTypeIOC.cs       | 37 ++++++++++++++++++-
 B3QingDaoWanFu/B3QingDaoWanFu.csproj          |  4 +-
 3 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/B3QingDaoWanFu.Web/B3QingDaoWanFu.Web.csproj b/B3QingDaoWanFu.Web/B3QingDaoWanFu.Web.csproj
index 83b204f..136e4b1 100644
--- a/B3QingDaoWanFu.Web/B3QingDaoWanFu.Web.csproj
+++ b/B3QingDaoWanFu.Web/B3QingDaoWanFu.Web.csproj
@@ -69,11 +69,11 @@
     <Reference Include="B3Sale, Version=1.0.0.0, Culture=neutral, PublicKeyToken=3a973053c7ebf11c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\tsref\Debug\B3Sale.dll</HintPath>
-    </Reference>
+    <Private>False</Private></Reference>
     <Reference Include="B3Sale.Web, Version=1.0.0.0, Culture=neutral, PublicKeyToken=3a973053c7ebf11c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\tsref\Debug\B3Sale.Web.dll</HintPath>
-    </Reference>
+    <Private>False</Private></Reference>
     <Reference Include="B3UnitedInfos, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a04fa581c0f74d43, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>D:\BwpB3Project\tsref\Debug\B3UnitedInfos.dll</HintPath>
@@ -176,7 +176,7 @@
     <ProjectReference Include="..\B3QingDaoWanFu\B3QingDaoWanFu.csproj">
       <Project>{b47ce3c3-c269-48b8-84a7-32360e5a9e8e}</Project>
       <Name>B3QingDaoWanFu</Name>
-    </ProjectReference>
+    <Private>False</Private></ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Pages\B3QingDaoWanFu\Reports\ComprehensiveReport.xml" />
diff --git a/B3QingDaoWanFu.Web/Pages/TypeIOCs/CarLoadingTypeIOC.cs b/B3QingDaoWanFu.Web/Pages/TypeIOCs/CarLoadingTypeIOC.cs
index be99900..2820beb 100644
--- a/B3QingDaoWanFu.Web/Pages/TypeIOCs/CarLoadingTypeIOC.cs
+++ b/B3QingDaoWanFu.Web/Pages/TypeIOCs/CarLoadingTypeIOC.cs
@@ -14,6 +14,7 @@ using Forks.EnterpriseServices.DataForm;
 using Forks.Utils;
 using TSingSoft.WebControls2.BillReports;
 using TSingSoft.WebPluginFramework;
+using Forks.EnterpriseServices.BusinessInterfaces;
 
 namespace BWP.Web.Pages.TypeIOCs
 {
@@ -27,10 +28,44 @@ namespace BWP.Web.Pages.TypeIOCs
       AddParameterss(dic, dmo);
     }
 
+    public class CarLoadingGoodsSumDetailData
+    {
+      public string Goods_Name { get; set; }
+      public string Goods_Code { get; set; }
+      public string Goods_Spec { get; set; }
+      public Money<decimal>? Number { get; set; }
+      public string Goods_MainUnit { get; set; }
+      public Money<decimal>? SecondNumber { get; set; }
+      public string Goods_SecondUnit { get; set; }
+      public string Remark { get; set; }
+    }
+
     //定制打印格式【装车单】
     protected void AddParameterss(IDictionary<string, object> dic, CarLoading Dmo)
     {
-
+      var list = new List<CarLoadingGoodsSumDetailData>();
+      if (Dmo.BillDetails.Count > 0) {
+        var billInfo = Dmo.BillDetails.Select(detail => new Tuple<short, long>(detail.BillTypeID, detail.BillID)).ToList();
+        var query = CarLoadingUtil.GoodsSumDetailQuery(billInfo);
+
+        using (var context = new TransactionContext()) {
+          using (var reader = context.Session.ExecuteReader(query)) {
+            while (reader.Read()) {
+              var data = new CarLoadingGoodsSumDetailData();
+              data.Goods_Name = (string)reader[0];
+              data.Goods_Code = (string)reader[1];
+              data.Goods_Spec = (string)reader[2];
+              data.Number = (Money<decimal>?)reader[3];
+              data.Goods_MainUnit = (string)reader[4];
+              data.SecondNumber = (Money<decimal>?)reader[5];
+              data.Goods_SecondUnit = (string)reader[6];
+              data.Remark = (string)reader[7];
+              list.Add(data);
+            }
+          }
+        }
+      }
+      dic.Add("$DetailInfo3", list);
       PageSize = 100;
       dic.Add("$DetailInfo2", new Func<object>(() => GetPrintStyle(Dmo)));
 
diff --git a/B3QingDaoWanFu/B3QingDaoWanFu.csproj b/B3QingDaoWanFu/B3QingDaoWanFu.csproj
index 1ef3550..c39bf0e 100644
--- a/B3QingDaoWanFu/B3QingDaoWanFu.csproj
+++ b/B3QingDaoWanFu/B3QingDaoWanFu.csproj
@@ -69,11 +69,11 @@
     <Reference Include="B3Sale, Version=1.0.0.0, Culture=neutral, PublicKeyToken=3a973053c7ebf11c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\tsref\Debug\B3Sale.dll</HintPath>
-    </Reference>
+    <Private>False</Private></Reference>
     <Reference Include="b3saleinterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=3a973053c7ebf11c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\tsref\Debug\b3saleinterface.dll</HintPath>
-    </Reference>
+    <Private>False</Private></Reference>
     <Reference Include="B3UnitedInfos, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a04fa581c0f74d43, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>D:\BwpB3Project\tsref\Debug\B3UnitedInfos.dll</HintPath>