From dc6639a232f181970fa5291005f206fa34f1b1da Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 10 十一月 2025 09:29:33 +0800
Subject: [PATCH] 提交
---
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookfahuoqingkuang.aspx.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookfahuoqingkuang.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookfahuoqingkuang.aspx.cs
index 1f93abb..69f1448 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookfahuoqingkuang.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookfahuoqingkuang.aspx.cs
@@ -98,11 +98,11 @@
_inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
}
- var inquiryWorkBookModels = _inquiryCommonModel.InquiryWorkBookList.OrderBy(x=>x.WorkBookNameTxt).ThenBy(x=>x.WorkBookSizeTxt);
+ var inquiryWorkBookModels = _inquiryCommonModel.InquiryWorkBookList.OrderBy(x=>x.WorkBookSizeTxt).ThenBy(x=>x.WorkBookNameTxt);
if (string.IsNullOrEmpty(biaotou))
{
- string biaotou2 = " <th style=\"text-align:center\" > </th> <th style=\"text-align:center\" > </th> <th style=\"text-align:center\" > </th>";
+ string biaotou2 = " <th style=\"text-align:center\" > </th> <th style=\"text-align:center\" > </th> <th style=\"text-align:center\" >"+ corname + " </th>";
foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
{
biaotou += " <th style=\"text-align:center\" colspan=\"2\"> " + inquiryWorkBookModel.WorkBookSizeTxt + inquiryWorkBookModel.WorkBookNameTxt + " </th> ";
@@ -112,7 +112,7 @@
}
biaotou +="</tr><tr>"+ biaotou2+ "</tr>";
}
- biaowei = " <td style=\"text-align:center\"> 鍚堣 </td><td style=\"text-align:center\"> </td> <td style=\"text-align:center\"> </td> ";
+ biaowei = " <td style=\"text-align:center\"> 鍚堣 </td><td style=\"text-align:center\"> </td> <td style=\"text-align:center\"> " + corname + " </td> ";
foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
{
@@ -129,10 +129,10 @@
- var cmsPlanOrderFahuos = coreCmsPlanOrderFahuos.GroupBy(p => new { p.createTime.Value.Date }).Select(g => new CoreCmsPlanOrderFahuo
+ var cmsPlanOrderFahuos = coreCmsPlanOrderFahuos.GroupBy(p => new { p.createTime.Value }).Select(g => new CoreCmsPlanOrderFahuo
{
// 鍒嗙粍瀛楁
- createTime = g.Key.Date,
+ createTime = g.Key.Value,
}).OrderByDescending(x=>x.createTime).ToList();
@@ -141,7 +141,7 @@
cmsPlanOrderFahuo.name = corname;
- var cmsPlanOrderFahuos1 = coreCmsPlanOrderFahuos.Where(x => x.createTime.Value.Date == cmsPlanOrderFahuo.createTime);
+ var cmsPlanOrderFahuos1 = coreCmsPlanOrderFahuos.Where(x => x.createTime.Value == cmsPlanOrderFahuo.createTime);
foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
{
var nums = cmsPlanOrderFahuos1.Where(x => x.name == inquiryWorkBookModel.WorkBookNameTxt && x.specification == inquiryWorkBookModel.WorkBookSizeTxt).Sum(x=>x.nums);
--
Gitblit v1.9.1