From 120215455f4fb2e5a1447f3ecda87f36aca1f38f Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 27 二月 2026 08:54:22 +0800
Subject: [PATCH] 1）有到期时间的，到期前3个月变成红色（像人事管理那样）；没有到期时间的，从建档时间起算，9个月后变成红色。完成 （2）建档后1个月没有下单，变成血红色。 完成 （3）列表中删除“完结状态”；操作中删除“订单关联” 完成 （4）在“应收款订单”后面增加“未收款金额” 、“逾期收款”完成
---
CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs
index 418b40b..2b8837c 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs
@@ -119,6 +119,19 @@
return _IOA_DeliverPlanDAL.GetModelByformid(formid);
}
+
+
+ /// <summary>
+ /// 鏍规嵁deliverPlanPaicheid鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="deliverPlanPaicheid">缂栧彿</param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_DeliverPlan> GetModelByDeliverPlanPaicheid(Guid deliverPlanPaicheid)
+ {
+
+ return _IOA_DeliverPlanDAL.GetModelByDeliverPlanPaicheid(deliverPlanPaicheid);
+ }
+
/// <summary>
/// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
/// </summary>
@@ -154,10 +167,10 @@
/// <param name="pa"></param>
/// <returns></returns>
public IEnumerable<OA_DeliverPlan> SelectModelPage(Pagination pa, Guid FirmId, string DeliveredTime,
- string CarId, string DriverId,string trueMemberId ="", string CustormerName = "", string BusinessManager = "")
+ string CarId, string DriverId,string trueMemberId ="", string CustormerName = "", string BusinessManager = "", string Paiche = "")
{
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 ";
+ string sort = " Dizhi asc ";
if (!string.IsNullOrEmpty(DeliveredTime) )
{
if(DeliveredTime != "閫炬湡")
@@ -167,8 +180,8 @@
}
else
{
- Condition += " and DATEDIFF(day,GETDATE(),od.[DeliverTime])<0 and od.[DeliveredTime] is null ";
- sort = " DeliverTime desc,Sort asc ";
+ Condition += " and DATEDIFF(day,GETDATE(),od.[DeliverTime])<0 ";
+ sort = " DeliverTime desc,Dizhi asc ";
}
}
@@ -183,6 +196,19 @@
Condition += " and od.BusinessManagerId = '" + BusinessManager + "'";
if (!string.IsNullOrEmpty(CustormerName))
Condition += " and od.CompanyName like '%" + CustormerName + "%'";
+ if (!string.IsNullOrEmpty(Paiche))
+ {
+ if(Paiche == "1")
+ {
+ Condition += " and od.CarId >0";
+ }
+ else
+ {
+ Condition += " and ( od.CarId = 0 or od.CarId is null )";
+ }
+
+ }
+
Query query = new Query();
IList<Criterion> criterias = new List<Criterion>()
--
Gitblit v1.9.1