From 66a1290f368df2f5f543e14fe6abf8b31bf76490 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 18 十二月 2025 14:20:24 +0800
Subject: [PATCH] 提交
---
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs | 2 +-
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx | 8 ++++----
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx.cs | 2 +-
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetailsongdao.aspx.cs | 2 +-
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs | 6 +++---
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx.cs
index 50ce60d..9434002 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetail.aspx.cs
@@ -61,7 +61,7 @@
var coreDeliverOrder = _CoreDeliverOrderBLL.GetModelByKeyid(orderIdStr);
var coreCmsPlanOrder = _CoreCmsPlanOrderBLL.GetModelByKeyid(coreDeliverOrder.OrderId.Value);
var cmsPlanOrderItems = _CoreCmsPlanOrderItemBLL.GetModelsByOrderid(coreDeliverOrder.OrderId.Value);
- var coreDeliverOrderItems = _CoreDeliverOrderItemBLL.GetModelsByOrderid(orderIdStr);
+ var coreDeliverOrderItems = _CoreDeliverOrderItemBLL.GetModelsByOrderid(orderIdStr).OrderBy(x=>x.ZYBSpecification).ThenBy(x=>x.ZYBName);
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetailsongdao.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetailsongdao.aspx.cs
index b8c57b1..3d8094e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetailsongdao.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiDetailsongdao.aspx.cs
@@ -61,7 +61,7 @@
var coreDeliverOrder = _CoreDeliverOrderBLL.GetModelByKeyid(orderIdStr);
var coreCmsPlanOrder = _CoreCmsPlanOrderBLL.GetModelByKeyid(coreDeliverOrder.OrderId.Value);
var cmsPlanOrderItems = _CoreCmsPlanOrderItemBLL.GetModelsByOrderid(coreDeliverOrder.OrderId.Value);
- var coreDeliverOrderItems = _CoreDeliverOrderItemBLL.GetModelsByOrderid(orderIdStr);
+ var coreDeliverOrderItems = _CoreDeliverOrderItemBLL.GetModelsByOrderid(orderIdStr).OrderBy(x => x.ZYBSpecification).ThenBy(x => x.ZYBName); ;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs
index 289ec45..bfc4073 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs
@@ -60,7 +60,7 @@
this.selDriver.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
- this.selBuyerName.DataSource = bll_EC_OrderBasicBLL.GetOrderByPrintTypeId(37).Where(x => x.OrderState == 4 || x.OrderState == 2 || x.OrderState == 3).OrderByDescending(x => x.CreateTime); ;
+ this.selBuyerName.DataSource = bll_EC_OrderBasicBLL.GetOrderByPrintTypeId(37).Where(x => x.OrderState == 4 || x.OrderState == 2 || x.OrderState == 3).OrderBy(x => x.CreateTime);
this.selBuyerName.DataTextField = "BuyerName";
this.selBuyerName.DataValueField = "Keyid";
this.selBuyerName.DataBind();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx
index 84c7209..6d74d81 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx
@@ -178,9 +178,9 @@
<th style="text-align: center">
鍙告満
</th>
- <th style="text-align: center">
+ <%-- <th style="text-align: center">
閫佽揣鐘舵��
- </th>
+ </th>--%>
<%=biaotou %>
<%-- <th style="text-align: center">
@@ -211,9 +211,9 @@
<td style="text-align: center">
<%#Eval("DriverName")%>
</td>
- <td style="text-align: center">
+ <%-- <td style="text-align: center">
<%#Eval("OrderStateName")%>
- </td>
+ </td>--%>
<%#Eval("biaoge")%>
<td class="Operate " style="text-align: center">
<span onclick="onViewCarInsurance('<%#Eval("id")%>')">鏌ョ湅鏄庣粏</span>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs
index d24faa5..c3fc7df 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookLiShiAnPaiList.aspx.cs
@@ -60,7 +60,7 @@
this.selDriver.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
- this.selBuyerName.DataSource = bll_EC_OrderBasicBLL.GetOrderByPrintTypeId(37).Where(x => x.OrderState == 4 || x.OrderState == 2 || x.OrderState == 3).OrderByDescending(x=>x.CreateTime);
+ this.selBuyerName.DataSource = bll_EC_OrderBasicBLL.GetOrderByPrintTypeId(37).Where(x => x.OrderState == 4 || x.OrderState == 2 || x.OrderState == 3).OrderBy(x => x.CreateTime);
this.selBuyerName.DataTextField = "BuyerName";
this.selBuyerName.DataValueField = "Keyid";
this.selBuyerName.DataBind();
@@ -110,7 +110,7 @@
if (string.IsNullOrEmpty(biaotou))
{
- string biaotou2 = "<th style=\"text-align:center\" > </th> <th style=\"text-align:center\" > </th><th style=\"text-align:center\" > </th><th style=\"text-align:center\" > </th> <th style=\"text-align:center\" > </th> <th style=\"text-align:center\" > </th>";
+ string biaotou2 = "<th style=\"text-align:center\" > </th><th style=\"text-align:center\" > </th><th style=\"text-align:center\" > </th> <th style=\"text-align:center\" > </th> <th style=\"text-align:center\" > </th>";
foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
{
biaotou += " <th style=\"text-align:center\" colspan=\"3\"> " + inquiryWorkBookModel.WorkBookSizeTxt + inquiryWorkBookModel.WorkBookNameTxt + " </th> ";
@@ -219,7 +219,7 @@
}
- biaowei = "<td></td> <td></td> <td></td> <td style=\"text-align:center\"> </td> <td style=\"color: grey;text-align: center;\" > " + coreDeliverOrders.Count() + " </td><td style=\"text-align:center\"> </td> ";
+ biaowei = " <td></td> <td></td> <td style=\"text-align:center\"> </td> <td style=\"color: grey;text-align: center;\" > " + coreDeliverOrders.Count() + " </td><td style=\"text-align:center\"> </td> ";
foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
{
var nums = cmsPlanOrderItems.Where(x => x.name == inquiryWorkBookModel.WorkBookNameTxt && x.specification == inquiryWorkBookModel.WorkBookSizeTxt && ids.Contains(x.orderId)).Sum(x => x.nums);
--
Gitblit v1.9.1