From 1a36f1bb85e956daee5a188927f3246df773e0e8 Mon Sep 17 00:00:00 2001
From: duanluohua <duanluohua@bwp.com>
Date: Mon, 16 Apr 2018 15:37:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProductionNotificationPrint.cs            | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Bills/ProductionNotification_/ProductionNotificationPrint.cs b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Bills/ProductionNotification_/ProductionNotificationPrint.cs
index 2946c84..dba8874 100644
--- a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Bills/ProductionNotification_/ProductionNotificationPrint.cs
+++ b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Bills/ProductionNotification_/ProductionNotificationPrint.cs
@@ -15,8 +15,11 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Bills.ProductionNotification_
     protected override void AddParameters(IDictionary<string, object> dic)
     {
       dic.Add("$Details", Dmo.Details);
+      dic.Add("$OutDetails", Dmo.OutDetails);
       dic.Add("$DetailType", typeof(ProductionNotification_Detail));
+      dic.Add("$OutDetailType", typeof(ProductionNotificationOutStore_Detail));
       dic.Add("$相同产品并行显示", Get相同产品并行显示());
+      dic.Add("$其他出库相同产品并行显示", Get其他出库相同产品并行显示());
     }
     void AddSolidSType(StringBuilder str)
     {
@@ -50,5 +53,26 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Bills.ProductionNotification_
       str.Append("</div>");
       return str.ToString();
     }
+
+    private string Get其他出库相同产品并行显示()
+    {
+      var str = new StringBuilder();
+      str.Append("<div id='binghang'>");
+      AddSolidSType(str);
+      str.Append(@"<table border='1' width='100%'>");
+
+      str.Append("<tr><td>其他出库单号</td><td>存货</td><td>规格</td><td>主单位</td><td>辅单位</td><td>批号</td><td>税率</td><td>单价</td><td>往来金额</td><td>数量</td><td>辅单位数量</td></tr>");
+
+      foreach (IGrouping<string, ProductionNotificationOutStore_Detail> grouping in Dmo.OutDetails.GroupBy(x => x.Goods_Name))
+      {
+        foreach (ProductionNotificationOutStore_Detail detail in grouping)
+        {
+          str.Append("<tr><td>" + detail.OtherOutStore_ID + "</td><td>" + detail.Goods_Name +"</td><td>" + detail.Goods_Spec + "</td><td>" + detail.Goods_MainUnit + "</td><td>" + detail.Goods_SecondUnit + "</td><td>" + detail.GoodsBatch_Name + "</td><td>" + detail.TaxRate + "</td><td>" + detail.Price + "</td><td>" + detail.AccountMoney + "</td><td>" + detail.Number + "</td><td>" + detail.SecondNumber + "</td></tr>");
+        }
+        str.Append("<tr><td colspan='8'>合计</td><td>" + (Money<二位小数>?)grouping.Sum(x => (x.AccountMoney ?? 0).Value) + "</td><td>" + (Money<二位小数>?)grouping.Sum(x => (x.Number ?? 0).Value) + "</td><td>" + (Money<二位小数>?)grouping.Sum(x => (x.SecondNumber ?? 0).Value) + "</td></tr>");
+      }
+      str.Append("</div>");
+      return str.ToString();
+    }
   }
 }