From 556c6f8e225932462065eaee6c76e2dcff80ba40 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 06 十一月 2025 12:28:20 +0800
Subject: [PATCH] 送货统计修改
---
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPandian.aspx.cs | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPandian.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPandian.aspx.cs
index f756ade..b7bc5e1 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPandian.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPandian.aspx.cs
@@ -64,7 +64,7 @@
//var cmsPlanOrderItems = bll_CoreCmsPlanOrderItemBLL.GetModelsByZongOrderid(orderIdStr.ToInt32().Value);
- var coreDeliverOrderItems = bll_CoreCmsPlanOrderItemBLL.GetDeliverModelsByZongOrderid(orderIdStr.ToInt32().Value).Where(x=>x.OrderState == 2);
+ var coreDeliverOrderItems = bll_CoreCmsPlanOrderItemBLL.GetDeliverModelsByZongOrderid(orderIdStr.ToInt32().Value);
var coreCmsPlanOrderFahuos = bll_coreCmsPlanOrderFahuoBLL.GetModelsByOrderid(orderIdStr.ToInt32().Value);
@@ -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,7 +136,8 @@
// 缁熻缁撴灉
//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();
@@ -155,13 +156,14 @@
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;
}
--
Gitblit v1.9.1