From 91630884d699f90a8dec5348c2124468dc6f5324 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 06 十一月 2025 08:45:21 +0800
Subject: [PATCH] 很多修改

---
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPandian.aspx.cs |    4 ++--
 1 files changed, 2 insertions(+), 2 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..286130f 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)

--
Gitblit v1.9.1