From be3203181cf0dfdc66adda9c442a165d96fc9833 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 20 三月 2026 11:51:15 +0800
Subject: [PATCH] 已经派了工的学校的“送货时间”改为绿色，逾期为点完成送货操作的“送货时间”变为红色，这样以示区别 完成
---
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs | 16 ++++++++++++++--
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx | 2 +-
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs | 16 ++++++++++++++++
CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs | 2 +-
CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrder.cs | 4 ++++
CY_ECommercePlatform/CY.SQLDAL/OA/CoreDeliverOrderDAL.cs | 2 +-
6 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs
index 040e438..1f57378 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs
@@ -212,7 +212,7 @@
{
new Criterion("", Condition),
- new Criterion("orderBy"," MakeTime ")
+ new Criterion("orderBy"," DeliveryMoble asc,MakeTime asc ")
};
query.Criteria = criterias;
return _ICoreDeliverOrderDAL.SelectModelPage(query, pa);
diff --git a/CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrder.cs b/CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrder.cs
index 34388f4..055b440 100644
--- a/CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrder.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrder.cs
@@ -210,6 +210,10 @@
/// <summary>
/// 寤虹珛鏃堕棿
/// </summary>
+ public string Yanse { get; set; }
+ /// <summary>
+ /// 寤虹珛鏃堕棿
+ /// </summary>
public DateTime? createTime { get; set; }
/// <summary>
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/CoreDeliverOrderDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/CoreDeliverOrderDAL.cs
index 688fe68..835b460 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/CoreDeliverOrderDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/CoreDeliverOrderDAL.cs
@@ -28,7 +28,7 @@
/// <summary>
/// 鍒嗛〉榛樿鎺掑簭瀛楁
/// </summary>
- const string ORDERBY = " MakeTime";
+ const string ORDERBY = " DeliveryMoble asc,MakeTime asc ";
#endregion
public CoreDeliverOrderDAL()
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs
index e05b037..19d7e2e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookAnPaiList.aspx.cs
@@ -26,11 +26,12 @@
private static ICacheStrategy CACHE = null;//缂撳瓨鎺ュ彛瀵硅薄
public string biaotou = "";
public string biaowei = "";
-
+
CoreCmsPlanOrderBLL bll_CoreCmsPlanOrderBLL = null;
CoreCmsPlanOrderItemBLL bll_CoreCmsPlanOrderItemBLL = null;
EC_OrderPrintParameterBLL _eC_OrderPrintParameterBLL = null;
+ OA_CarManageBll _OA_CarManageBll = null;
//鍒濆鍖�
public DeliverWorkBookAnPaiList()
@@ -45,6 +46,7 @@
CacheFactory.InitializeCacheFactory(new DefaultCacheStrategy());//鍒濆鍖栫紦瀛樺伐鍘�
CACHE = CacheFactory.GetCacher();//鍒涘缓缂撳瓨
CACHE.TimeOut = 6000;
+ _OA_CarManageBll = new OA_CarManageBll();
}
//椤甸潰鍔犺浇
@@ -123,7 +125,7 @@
var cmsPlanOrderItems = bll_CoreCmsPlanOrderItemBLL.GetModelsByZongOrderid(this.selBuyerName.Value.Trim().ToInt32().Value).Where(x => ids.Contains(x.orderId));
var coreDeliverOrderItems = bll_CoreCmsPlanOrderItemBLL.GetDeliverModelsByZongOrderid(this.selBuyerName.Value.Trim().ToInt32().Value).Where(x => ids.Contains(x.PlanOrderId));
-
+ var oA_CarManages = _OA_CarManageBll.SelectListByFirmIdnotstaff(CurrentUser.MemberId);
foreach (var coreDeliverOrder in coreDeliverOrders)
{
if (coreDeliverOrder.DriverId.HasValue)
@@ -132,6 +134,11 @@
if (oA_Staff != null)
{
coreDeliverOrder.DriverName = oA_Staff.Name;
+ var carManage = oA_CarManages.Where(x => x.StaffID == oA_Staff.Keyid).FirstOrDefault();
+ if (carManage != null)
+ {
+ coreDeliverOrder.DriverName += "(" + carManage.CarNumber + ")";
+ }
}
}
else
@@ -140,6 +147,11 @@
if (oA_Staff1 != null)
{
coreDeliverOrder.DriverName = oA_Staff1.Name;
+ var carManage = oA_CarManages.Where(x => x.StaffID == oA_Staff1.Keyid).FirstOrDefault();
+ if (carManage != null)
+ {
+ coreDeliverOrder.DriverName += "(" + carManage.CarNumber + ")";
+ }
}
else
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx
index 6789853..416e5cf 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx
@@ -155,7 +155,7 @@
<td style="text-align: center">
<%#Eval("Bianhao")%> <%--<%#Container.ItemIndex + 1%>--%>
</td>
- <td style="text-align: center;white-space: nowrap;">
+ <td style="text-align: center;white-space: nowrap;<%#Eval("Yanse")%>">
<%#Eval("MakeTime")%>
</td>
<td style="text-align: center">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
index 731425b..3baf409 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
@@ -127,6 +127,22 @@
if (coreDeliverOrder != null)
{
coreCmsPlanOrder.MakeTime = coreDeliverOrder.MakeTime.Value.ToString("yyyy-MM-dd HH:mm");
+ if (coreDeliverOrder.MakeTime.HasValue)
+ {
+ var sssss = coreDeliverOrder.MakeTime.Value;
+ if (coreDeliverOrder.OrderState != 2 && sssss > DateTime.Now.Date)
+ {
+ coreCmsPlanOrder.Yanse = "color: green;";
+ }
+
+ if (coreDeliverOrder.OrderState != 2 && sssss < DateTime.Now.Date)
+ {
+ coreCmsPlanOrder.Yanse = "color: red;";
+ }
+
+ }
+
+
}
--
Gitblit v1.9.1