| | |
| | | /// <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 + "' "; |
| | | |
| | |
| | | } |
| | | 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) |
| | | { |