Merge branch 'master' of http://47.108.235.38:8080/r/chuanyin-group-project

LR-20210131IOQH\Administrator

2021-09-13 1435b5b13b3857a20292d5c869f95e0c2ae5ffea

 CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs

@@ -159,7 +159,17 @@
            string Condition = " and od.FirmId ='" + FirmId + "' and od.shifouDelivery = 1 ";

            if (!string.IsNullOrEmpty(DeliveredTime))
            {
                if(DeliveredTime != "逾期")
                {
                Condition += " and DATEDIFF(day,od.[DeliverTime],'" + DeliveredTime + "')=0 ";
                }
                else
                {
                    Condition += " and DATEDIFF(day,GETDATE(),od.[DeliverTime])<=0 ";
                }
            }
           

            if (!string.IsNullOrEmpty(CarId))
                Condition += " and  od.CarId = '" + CarId + "'";