已经派了工的学校的“送货时间”改为绿色，逾期为点完成送货操作的“送货时间”变为红色，这样以示区别 完成

username@email.com

2026-03-20 be3203181cf0dfdc66adda9c442a165d96fc9833

已经派了工的学校的“送货时间”改为绿色，逾期为点完成送货操作的“送货时间”变为红色，这样以示区别 完成

1、在司机后面把车牌号加上  完成
2、相同司机的送货学校显示在一起  完成

 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);

 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>

 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()
        {

 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
                    {

 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">

 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;";
                        }

                    }
                    
                   
                }