From 051ff4b9e7302ba99a10cb4595987a2290a97b86 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 24 十一月 2025 08:55:33 +0800
Subject: [PATCH] 提交
---
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPandian.aspx.cs | 43 +++++++++++++++++++++++++++++++++++++------
1 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPandian.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPandian.aspx.cs
index c12e2af..06e9352 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPandian.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPandian.aspx.cs
@@ -94,7 +94,7 @@
_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);
var cmsPlanOrderItemsgroup = new List<CoreCmsPlanOrderItem>();
foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
@@ -136,13 +136,14 @@
// 缁熻缁撴灉
//Count = g.Count(), // 姣忕粍浜烘暟
//AverageSalary = g.Average(p => p.Salary), // 骞冲潎宸ヨ祫
- Number = g.Sum(p => p.Number) // 宸ヨ祫鎬诲拰
+ Number = g.Sum(p => p.Number), // 宸ヨ祫鎬诲拰
+ LessNumber = g.Sum(p => p.LessNumber)
}).ToList();
+
-
- foreach(var cmsPlanOrderItem in cmsPlanOrderItemsgroup)
+ foreach (var cmsPlanOrderItem in cmsPlanOrderItemsgroup)
{
var coreCmsPlanOrderFahuo = coreCmsPlanOrderFahuosgroup.FirstOrDefault(x => x.name == cmsPlanOrderItem.name && x.specification == cmsPlanOrderItem.specification);
if (coreCmsPlanOrderFahuo != null)
@@ -155,15 +156,43 @@
if (coreDeliverOrderItem != null)
{
cmsPlanOrderItem.songhuonums = coreDeliverOrderItem.Number;
+ cmsPlanOrderItem.LessNumber = coreDeliverOrderItem.LessNumber;
}
cmsPlanOrderItem.kucunnums = cmsPlanOrderItem.fahuonums - cmsPlanOrderItem.songhuonums;
- cmsPlanOrderItem.weisonghuonums = cmsPlanOrderItem.nums - cmsPlanOrderItem.songhuonums;
+ cmsPlanOrderItem.weisonghuonums = cmsPlanOrderItem.nums - cmsPlanOrderItem.songhuonums - cmsPlanOrderItem.LessNumber;
+
+
+ cmsPlanOrderItem.DaishengchanNumber = cmsPlanOrderItem.weisonghuonums - cmsPlanOrderItem.kucunnums;
}
+ var cmsPlanOrderItemsgroupsssss = new List<CoreCmsPlanOrderItem>();
+ for (int i = 0; i < cmsPlanOrderItemsgroup.Count; i++)
+ {
+ cmsPlanOrderItemsgroupsssss.Add(cmsPlanOrderItemsgroup[i]);
+ if (i == (cmsPlanOrderItemsgroup.Count - 1) || cmsPlanOrderItemsgroup[i].specification != cmsPlanOrderItemsgroup[i + 1].specification)
+ {
+ var coreCmsPlanOrderItem = new CoreCmsPlanOrderItem();
+ coreCmsPlanOrderItem.specification = cmsPlanOrderItemsgroup[i].specification;
+ coreCmsPlanOrderItem.name = "鍚堣";
+ var coreCmsPlanOrderItems = cmsPlanOrderItemsgroup.Where(x => x.specification == cmsPlanOrderItemsgroup[i].specification);
+ coreCmsPlanOrderItem.nums = coreCmsPlanOrderItems.Sum(x => x.nums);
+ coreCmsPlanOrderItem.fahuonums = coreCmsPlanOrderItems.Sum(x => x.fahuonums);
+ coreCmsPlanOrderItem.weifahuonums = coreCmsPlanOrderItems.Sum(x => x.weifahuonums);
+ coreCmsPlanOrderItem.songhuonums = coreCmsPlanOrderItems.Sum(x => x.songhuonums);
+ coreCmsPlanOrderItem.kucunnums = coreCmsPlanOrderItems.Sum(x => x.kucunnums);
+ coreCmsPlanOrderItem.weisonghuonums = coreCmsPlanOrderItems.Sum(x => x.weisonghuonums);
+ coreCmsPlanOrderItem.LessNumber = coreCmsPlanOrderItems.Sum(x => x.LessNumber);
+ coreCmsPlanOrderItem.DaishengchanNumber = coreCmsPlanOrderItems.Sum(x => x.DaishengchanNumber);
+ cmsPlanOrderItemsgroupsssss.Add(coreCmsPlanOrderItem);
+ }
+ }
+
+
+
@@ -172,7 +201,9 @@
- this.RepClientList.DataSource = cmsPlanOrderItemsgroup;
+
+
+ this.RepClientList.DataSource = cmsPlanOrderItemsgroupsssss;
this.RepClientList.DataBind();
}
--
Gitblit v1.9.1