username@email.com
2 天以前 e4ee60ed94d24e394a7895daa9fb98df813e5953
CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs
@@ -207,7 +207,7 @@
        /// <param name="pa"></param>
        /// <returns></returns>
        public IEnumerable<CoreDeliverOrder> SelectModelPageLishi(Pagination pa, Guid FirmId, int? DriverId, string shipAddress,
            string BuyerName, string createTimeStart, string createTimeEnd,string OrderState)
            string BuyerName, string createTimeStart, string createTimeEnd,string OrderState,string shifou)
        {
            string Condition = " and b.FirmId ='" + FirmId + "'  ";
@@ -217,7 +217,16 @@
            }
            else
            {
                Condition += " and a.OrderState  in( 0,1,2 ) ";
                if (!string.IsNullOrEmpty(shifou))
                {
                    Condition += " and a.OrderState  in( 0,1 ) ";
                }
                else
                {
                    Condition += " and a.OrderState  in( 0,1,2 ) ";
                }
            }
            if (DriverId.HasValue)
            {