From 641ddf669ad57fb544e13a6433aa5905551b3bba Mon Sep 17 00:00:00 2001
From: CB2-20200827ONU\Administrator <liaoxujun@qq.com>
Date: 星期三, 22 九月 2021 09:04:14 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/chuanyin-group-project
---
CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs
index 21b3821..6db6161 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs
@@ -158,8 +158,18 @@
{
string Condition = " and od.FirmId ='" + FirmId + "' and od.shifouDelivery = 1 ";
- if (!string.IsNullOrEmpty(DeliveredTime))
- Condition += " and DATEDIFF(day,od.[DeliverTime],'" + DeliveredTime + "')=0 ";
+ 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 + "'";
--
Gitblit v1.9.1