From 92a92c2fc694810fdba050f1034ef107ad5c858f Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 07 十一月 2025 09:05:16 +0800
Subject: [PATCH] 那个作业本送货，查看明细或查看送货情况。这个列表中，比如说某个品种，它本来就没得的， 、那个格子里头不显零，格子里头就不要任何数据。不然，我们要要混乱好写了0的 ，我们才晓得这是有好已经送了的，就这样子修改，就某个品种，它本来就没得的格子头就是空白， 不不要写的，你这样子修改一下。
---
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.cs | 12 +++++++-----
1 files changed, 7 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 449b060..f333103 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.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);
@@ -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;
}
--
Gitblit v1.9.1