From dba6dec96796891f6f9933ff72fad3e71a2ef3f4 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 10 十一月 2025 14:09:55 +0800
Subject: [PATCH] no message
---
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.cs | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.cs
index 5566d8d..7f31a0d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.cs
@@ -93,7 +93,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)
@@ -134,7 +134,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();
@@ -153,13 +154,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;
}
@@ -206,7 +208,7 @@
for (int i = 0; i < fahuos.Length; i++)
{
var fahuo = fahuos[i].ToInt32();
- if (fahuo.HasValue && fahuo.Value > 0)
+ if (fahuo.HasValue && fahuo.Value != 0)
{
yanzheng = true;
}
@@ -224,6 +226,7 @@
JavaScript.MessageBox( "娌℃湁濉啓鍙戣揣鏁伴噺", this);
return;
}
+ var createtimea = DateTime.Now;
var ssss = false;
for (int i = 0; i < fahuos.Length; i++)
{
@@ -232,7 +235,7 @@
coreCmsPlanOrder.name = names[i];
coreCmsPlanOrder.specification = specifications[i];
coreCmsPlanOrder.nums = fahuos[i].ToInt32().Value;
- coreCmsPlanOrder.createTime = DateTime.Now;
+ coreCmsPlanOrder.createTime = createtimea;
coreCmsPlanOrder.upDataTime = coreCmsPlanOrder.createTime;
coreCmsPlanOrder.createBy = CurrentUser.ShortName;
coreCmsPlanOrder.upDataBy = CurrentUser.ShortName;
--
Gitblit v1.9.1