From d3205f4627ceb7af1344ce77715def28fee5545b Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 17 十二月 2025 08:56:19 +0800
Subject: [PATCH] 在“编号”和“片区”直接增加一列“送货时间”，该送货时间显示进行了“送货安排”操作的学校的时间，没有安排送货的学校就是空白 完成
---
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx.cs | 76 ++++++++++++++++++++++++++++++++------
1 files changed, 64 insertions(+), 12 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx.cs
index 95b8278..50ce60d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx.cs
@@ -24,7 +24,8 @@
OA_CarManageBll _OA_CarManageBll = null;
CoreDeliverOrderBLL _CoreDeliverOrderBLL = null;
CoreDeliverOrderItemBLL _CoreDeliverOrderItemBLL = null;
-
+ public string biaotou = "";
+ public string biaowei = "";
//鍒濆鍖�
@@ -65,17 +66,17 @@
//宸茬粡閫佽揣鏁伴噺
- var coreDeliverOrderItemssonghuo = _CoreCmsPlanOrderItemBLL.GetDeliverModelsByZongOrderid(coreCmsPlanOrder.orderkeyid.Value).Where(x=>x.PlanOrderId == coreCmsPlanOrder.id );
-
-
+ var coreDeliverOrderItemssssss = _CoreCmsPlanOrderItemBLL.GetDeliverModelsByplanOrderids(coreCmsPlanOrder.orderkeyid.Value).Where(x=>x.PlanOrderId == coreCmsPlanOrder.id ).OrderByDescending(x=>x.MakeTime);
-
-
-
-
+
+ var coreDeliverOrderItemssonghuo = coreDeliverOrderItemssssss.Where(x => x.OrderState == 2);
+
+
+
+
//閫佽揣鏁伴噺缁熻
var coreDeliverOrderItemsgroup = coreDeliverOrderItemssonghuo.GroupBy(p => new { p.ZYBName, p.ZYBSpecification }) // 澶氫釜瀛楁浣滀负鍖垮悕绫诲瀷鍒嗙粍閿�
@@ -103,6 +104,41 @@
+
+ //閫佽揣鏁伴噺缁熻
+ var coreDeliverOrderItemssssssgroup = coreDeliverOrderItemssssss.GroupBy(p => new {p.MakeTime }) // 澶氫釜瀛楁浣滀负鍖垮悕绫诲瀷鍒嗙粍閿�
+ .Select(g => new CoreDeliverOrderItem
+ {
+ // 鍒嗙粍瀛楁
+ MakeTime = g.Key.MakeTime
+ }).OrderByDescending(x=>x.MakeTime).ToList();
+ string biaotou2 = "";
+ foreach (var coreDeliverOrderItem1 in coreDeliverOrderItemssssssgroup)
+ {
+ biaotou += "<th style=\"text-align:center\" > "+ coreDeliverOrderItem1.MakeTime.Value.ToString("yyyy-MM-dd") + " </th>";
+ biaotou2 += "<th style=\"text-align:center\" > 鑺傜害锛�" + coreDeliverOrderItem1.MakeTime.Value.ToString("MM鏈坉d鏃�") + " 锛�</th>";
+ }
+
+ biaotou += biaotou2;
+
+
+ //閫佽揣鏁伴噺缁熻
+ var coreDeliverOrderItemssssssgroupxiangxi = coreDeliverOrderItemssssss.GroupBy(p => new { p.MakeTime, p.ZYBName, p.ZYBSpecification }) // 澶氫釜瀛楁浣滀负鍖垮悕绫诲瀷鍒嗙粍閿�
+ .Select(g => new CoreDeliverOrderItem
+ {
+ // 鍒嗙粍瀛楁
+ MakeTime = g.Key.MakeTime,
+ // 鍒嗙粍瀛楁
+ ZYBName = g.Key.ZYBName,
+ ZYBSpecification = g.Key.ZYBSpecification,
+ // 缁熻缁撴灉
+ //Count = g.Count(), // 姣忕粍浜烘暟
+ //AverageSalary = g.Average(p => p.Salary), // 骞冲潎宸ヨ祫
+ Number = g.Sum(p => p.Number), // 宸ヨ祫鎬诲拰
+ LessNumber = g.Sum(p => p.LessNumber)
+ }).OrderByDescending(x => x.MakeTime).ToList();
+
+
foreach (var coreDeliverOrderItem in coreDeliverOrderItems)
{
var deliverOrderItem = coreDeliverOrderItemsgroup.Where(x => x.ZYBName == coreDeliverOrderItem.ZYBName && x.ZYBSpecification == coreDeliverOrderItem.ZYBSpecification).FirstOrDefault();
@@ -122,17 +158,33 @@
}
}
-
+ biaowei += "<tr>";
-
+ biaowei += " <td style=\"text-align: center;\" > " + coreDeliverOrderItem.ZYBSpecification + coreDeliverOrderItem.ZYBName + " </td> ";
+ biaowei += " <td style=\"text-align: center;\" > " + coreDeliverOrderItem.DingdanNumber + " </td> ";
+ biaowei += " <td style=\"text-align: center;\" > " + coreDeliverOrderItem.WeisongNumber + " </td> ";
+
+ string biaowei2 = "";
+ foreach (var coreDeliverOrderItem1 in coreDeliverOrderItemssssssgroup)
+ {
+
+ var deliverOrderItemaaaaaaaa = coreDeliverOrderItemssssssgroupxiangxi.Where(x => x.ZYBName == coreDeliverOrderItem.ZYBName && x.ZYBSpecification == coreDeliverOrderItem.ZYBSpecification && x.MakeTime == coreDeliverOrderItem1.MakeTime).FirstOrDefault();
+
+ biaowei += " <td style=\"text-align: center;\" > " + deliverOrderItemaaaaaaaa.Number + " </td> ";
+ biaowei2 += " <td style=\"text-align: center;\" > " + deliverOrderItemaaaaaaaa.LessNumber + " </td> ";
+ }
+
+ biaowei += biaowei2;
+
+ biaowei += "</tr>";
+
}
- this.RepClientList.DataSource = coreDeliverOrderItems;
- this.RepClientList.DataBind();
+
}
--
Gitblit v1.9.1