From c5c50cb12d7954679a6d521d95cef844edf0bd35 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 27 十一月 2025 16:59:41 +0800
Subject: [PATCH] 提交
---
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx | 8 ++++----
CY_ECommercePlatform/CY.Model/OA/CoreDeliverOrderItem.cs | 12 +++++++++++-
CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderItemDAL.cs | 2 +-
3 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/CY_ECommercePlatform/CY.Model/OA/CoreDeliverOrderItem.cs b/CY_ECommercePlatform/CY.Model/OA/CoreDeliverOrderItem.cs
index 95744de..7294030 100644
--- a/CY_ECommercePlatform/CY.Model/OA/CoreDeliverOrderItem.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/CoreDeliverOrderItem.cs
@@ -68,7 +68,17 @@
/// 閫佽揣鏃堕棿
/// </summary>
public System.DateTime? MakeTime { get; set; }
-
+
+ /// <summary>
+ /// 閫佽揣鏃堕棿
+ /// </summary>
+ public System.DateTime? StartTime { get; set; }
+
+ /// <summary>
+ /// 閫佽揣鏃堕棿
+ /// </summary>
+ public System.DateTime? OverTime { get; set; }
+
#endregion Model
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderItemDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderItemDAL.cs
index 92a993a..7d3fbc6 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderItemDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderItemDAL.cs
@@ -192,7 +192,7 @@
/// <returns></returns>
public IEnumerable<Model.CoreDeliverOrderItem> GetDeliverModelsByZongOrderid(int orderkeyid)
{
- return _dataBase.SelectModel<Model.CoreDeliverOrderItem>(" a.*,b.[OrderId] as PlanOrderId,b.[MakeTime],b.[OrderState] ", " [CoreDeliverOrderItem] a Inner Join [CoreDeliverOrder] as b On(a.[OrderID]=b.[id] ) Inner Join [CoreCmsPlanOrder] as c On(b.[OrderID]=c.[id] ) ", " c.[orderkeyid] = " + orderkeyid + " and ( b.[OrderState] = 1 or b.[OrderState] = 2)") as IList<Model.CoreDeliverOrderItem>;//鎵ц鏌ヨ
+ return _dataBase.SelectModel<Model.CoreDeliverOrderItem>(" a.*,b.[OrderId] as PlanOrderId,b.[MakeTime],b.[OrderState] ", " [CoreDeliverOrderItem] a Inner Join [CoreDeliverOrder] as b On(a.[OrderID]=b.[id] ) Inner Join [CoreCmsPlanOrder] as c On(b.[OrderID]=c.[id] ) ", " c.[orderkeyid] = " + orderkeyid + " and b.[OrderState] = 2 ") as IList<Model.CoreDeliverOrderItem>;//鎵ц鏌ヨ
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx
index 12d3e7a..123e790 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx
@@ -168,9 +168,9 @@
<th style="text-align: center">
瀹㈡埛鍚嶇О
</th>
- <th style="text-align: center">
+ <%-- <th style="text-align: center">
鍗颁欢鍚嶇О
- </th>
+ </th>--%>
<th style="text-align: center">
鏁伴噺
</th>
@@ -202,9 +202,9 @@
<a href='javascript:void(0)' title='<%#Eval("BuyerName").ToString()%>' class='a_under' onclick='View("<%#Eval("BuyerId")%>")'><%#Eval("BuyerName").ToString().Length > 22 ? (Eval("BuyerName").ToString().Substring(0, 22) + "..") : Eval("BuyerName").ToString()%></a>
</div>
</td>
- <td style="text-align: center">
+ <%-- <td style="text-align: center">
<%#Eval("DocumentName")%>
- </td>
+ </td>--%>
<td style="text-align: center">
<%#Eval("OrderExtend.PrintNum")%>
</td>
--
Gitblit v1.9.1