From 68ff182a8b7cffaead3e3f89d8e123d7a6821557 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 26 十一月 2025 13:02:14 +0800
Subject: [PATCH] 提交
---
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookfahuoqingkuang.aspx.cs | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 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..c32b284 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookfahuoqingkuang.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookfahuoqingkuang.aspx.cs
@@ -57,8 +57,8 @@
this.hideOrderId.Value = orderIdStr;
//var coreCmsPlanOrders = bll_CoreCmsPlanOrderBLL.GetModelByorderid(orderIdStr.ToInt32().Value);
+ var coreCmsPlanOrderFahuosssssss = bll_coreCmsPlanOrderFahuoBLL.GetModelsByOrderid(orderIdStr.ToInt32().Value);
-
var coreCmsPlanOrderFahuos = bll_coreCmsPlanOrderFahuoBLL.GetModelsByOrderid(orderIdStr.ToInt32().Value);
var BeginDate = this.txtBeginDate.Value.Trim();
@@ -72,6 +72,7 @@
{
var sss = EndDate.ToDateTime2().Value.AddDays(1);
coreCmsPlanOrderFahuos = coreCmsPlanOrderFahuos.Where(x => x.createTime <= sss);
+ coreCmsPlanOrderFahuosssssss = coreCmsPlanOrderFahuosssssss.Where(x => x.createTime <= sss);
}
@@ -98,11 +99,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,27 +113,28 @@
}
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)
{
var nums = coreCmsPlanOrderFahuos.Where(x => x.name == inquiryWorkBookModel.WorkBookNameTxt && x.specification == inquiryWorkBookModel.WorkBookSizeTxt).Sum(x => x.nums);
-
+ var numsyifa = coreCmsPlanOrderFahuosssssss.Where(x => x.name == inquiryWorkBookModel.WorkBookNameTxt && x.specification == inquiryWorkBookModel.WorkBookSizeTxt).Sum(x => x.nums);
+
var ssss = 0;
int.TryParse(inquiryWorkBookModel.WorkBookCount, out ssss);
- biaowei += " <td style=\"text-align:center\"> " + nums + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (ssss - nums) + " </span></td>";
+ biaowei += " <td style=\"text-align:center\"> " + nums + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (ssss - numsyifa) + " </span></td>";
}
- 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,15 +143,15 @@
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);
-
+ var numsyifa = coreCmsPlanOrderFahuosssssss.Where(x => x.name == inquiryWorkBookModel.WorkBookNameTxt && x.specification == inquiryWorkBookModel.WorkBookSizeTxt && x.createTime.Value <= cmsPlanOrderFahuo.createTime).Sum(x => x.nums);
var ssss = 0;
int.TryParse(inquiryWorkBookModel.WorkBookCount, out ssss);
- cmsPlanOrderFahuo.biaoge += " <td style=\"text-align:center\"> " + nums + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (ssss - nums) + " </span></td>";
+ cmsPlanOrderFahuo.biaoge += " <td style=\"text-align:center\"> " + nums + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (ssss - numsyifa) + " </span></td>";
//if (cmsPlanOrderItem != null)
//{
--
Gitblit v1.9.1