送货管理 增加查询 业务经理 客户名称 完成 查询送货安排的历史 完成

username@email.com

2025-03-07 2fee7b9b90c1acf7a17aef84ee22c2a31b801fe2

 CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs

@@ -154,22 +154,73 @@
        /// <param name="pa"></param>
        /// <returns></returns>
        public IEnumerable<OA_DeliverPlan> SelectModelPage(Pagination pa, Guid FirmId,  string DeliveredTime,
  string CarId, string DriverId,string trueMemberId ="")
  string CarId, string DriverId,string trueMemberId ="", string CustormerName = "", string BusinessManager = "")
        {
            string Condition = " and od.FirmId ='" + FirmId + "' and od.shifouDelivery = 1 ";

            string sort = " case when Sort is null then 1 else 0 end asc,Sort asc   ";
            if (!string.IsNullOrEmpty(DeliveredTime) )
            {
                if(DeliveredTime != "逾期")
                {
                    Condition += " and DATEDIFF(day,od.[DeliverTime],'" + DeliveredTime + "')=0 ";
                  
                }
                else
                {
                    Condition += " and DATEDIFF(day,GETDATE(),od.[DeliverTime])<=0 ";
                    Condition += " and DATEDIFF(day,GETDATE(),od.[DeliverTime])<0 and od.[DeliveredTime] is null  ";
                    sort = "  DeliverTime desc,Sort asc   ";
                }
            }
           

            if (!string.IsNullOrEmpty(CarId))
                Condition += " and  od.CarId = '" + CarId + "'";
            if (!string.IsNullOrEmpty(DriverId))
                Condition += " and  od.DriverId = '" + DriverId + "'";
            if (!string.IsNullOrEmpty(trueMemberId))
                Condition += " and  oss.MemberId = '" + trueMemberId + "'";
            if (!string.IsNullOrEmpty(BusinessManager))
                Condition += " and  od.BusinessManagerId = '" + BusinessManager + "'";
            if (!string.IsNullOrEmpty(CustormerName))
                Condition += " and  od.CompanyName like '%" + CustormerName + "%'";

            Query query = new Query();
            IList<Criterion> criterias = new List<Criterion>()
            {
                new Criterion("", Condition),

                new Criterion("orderBy",sort)
            };
            query.Criteria = criterias;
            return _IOA_DeliverPlanDAL.SelectModelPage(query, pa);
        }



        /// <summary>
        /// 查询合作客户分页列表
        /// </summary>
        /// <param name="pa"></param>
        /// <returns></returns>
        public IEnumerable<OA_DeliverPlan> SelectModelPageLishi(Pagination pa, Guid FirmId, string DeliveredTimestart, string DeliveredTimeend,
  string CarId, string DriverId, string trueMemberId = "")
        {
            string Condition = " and od.FirmId ='" + FirmId + "' and od.shifouDelivery = 1 ";

            if (!string.IsNullOrEmpty(DeliveredTimestart))
            {
                
                    Condition += " and DATEDIFF(day,'"+ DeliveredTimestart + "',od.[DeliverTime])>=0 ";
                 
            }

            if (!string.IsNullOrEmpty(DeliveredTimeend))
            {

                Condition += " and DATEDIFF(day,'" + DeliveredTimeend + "',od.[DeliverTime])<=0 ";

            }


            if (!string.IsNullOrEmpty(CarId))
                Condition += " and  od.CarId = '" + CarId + "'";
@@ -190,6 +241,7 @@
        }



        /// <summary>
        /// 查询合作客户分页列表
        /// </summary>