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 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(""); return str.ToString(); } + + private string Get其他出库相同产品并行显示() + { + var str = new StringBuilder(); + str.Append("
"); + AddSolidSType(str); + str.Append(@""); + + str.Append(""); + + foreach (IGrouping grouping in Dmo.OutDetails.GroupBy(x => x.Goods_Name)) + { + foreach (ProductionNotificationOutStore_Detail detail in grouping) + { + str.Append(""); + } + str.Append(""); + } + str.Append(""); + return str.ToString(); + } } }
其他出库单号存货规格主单位辅单位批号税率单价往来金额数量辅单位数量
" + detail.OtherOutStore_ID + "" + detail.Goods_Name +"" + detail.Goods_Spec + "" + detail.Goods_MainUnit + "" + detail.Goods_SecondUnit + "" + detail.GoodsBatch_Name + "" + detail.TaxRate + "" + detail.Price + "" + detail.AccountMoney + "" + detail.Number + "" + detail.SecondNumber + "
合计" + (Money<二位小数>?)grouping.Sum(x => (x.AccountMoney ?? 0).Value) + "" + (Money<二位小数>?)grouping.Sum(x => (x.Number ?? 0).Value) + "" + (Money<二位小数>?)grouping.Sum(x => (x.SecondNumber ?? 0).Value) + "