From a7e05ebe00fdcb649c012e5afc4a42a8d631e824 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 02 四月 2025 08:38:24 +0800
Subject: [PATCH] 删除客户管理查询条件中的“客户编号” 完成 新增订单---黑白印件 的后道工序最右边增加一个“口 竖式”，同前面套号、压痕一样，默认不勾选，是竖式的业务经理自己下单时勾选 完成提交外协付款申请时，增加上传审批证明的上传图片功能，可以添加多张图片；查询列表中增加“付款状态：全部、已付款、未付款”查询条件，默认全部；“完工状态”改为默认未完工 完成请示批复----付款申请 中也要向上面的需求一样，增加上传审批证明的上传图片功能，可以添加多张图片 完成在“请示批复”中进行“批复”操作的时候要能查看上传的审批图片 完成包装要求”要显示在打印的订单中 完成包装要求”要显示在打印的订单中 完成收据联单的新增订单中，纸张选无碳纸时，不显示“品牌”、“克重”，在联数的后面增加颜色选择：“颜色：上白下红”（匹配联数）订单管理中的“订单状态”删除，删除后新增两个状态：“完工状态：全部、未完工、已完工”和“送货状态：全部、已送货、未送货” 完成请示批复中默认“未批复” 完成请示批复中默认“未批复” 完成
---
CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs | 84 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 81 insertions(+), 3 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs
index 6db6161..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,22 +167,86 @@
/// <param name="pa"></param>
/// <returns></returns>
public IEnumerable<OA_DeliverPlan> SelectModelPage(Pagination pa, Guid FirmId, string DeliveredTime,
- string CarId, string DriverId,string trueMemberId ="")
+ string CarId, string DriverId,string trueMemberId ="", string CustormerName = "", string BusinessManager = "", string Paiche = "")
{
string Condition = " and od.FirmId ='" + FirmId + "' and od.shifouDelivery = 1 ";
-
+ string sort = " Dizhi asc ";
if (!string.IsNullOrEmpty(DeliveredTime) )
{
if(DeliveredTime != "閫炬湡")
{
Condition += " and DATEDIFF(day,od.[DeliverTime],'" + DeliveredTime + "')=0 ";
+
}
else
{
- Condition += " and DATEDIFF(day,GETDATE(),od.[DeliverTime])<=0 ";
+ Condition += " and DATEDIFF(day,GETDATE(),od.[DeliverTime])<0 ";
+ sort = " DeliverTime desc,Dizhi asc ";
}
}
+
+ if (!string.IsNullOrEmpty(CarId))
+ Condition += " and od.CarId = '" + CarId + "'";
+ if (!string.IsNullOrEmpty(DriverId))
+ Condition += " and od.DriverId = '" + DriverId + "'";
+ if (!string.IsNullOrEmpty(trueMemberId))
+ Condition += " and oss.MemberId = '" + trueMemberId + "'";
+ if (!string.IsNullOrEmpty(BusinessManager))
+ 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>()
+ {
+ new Criterion("", Condition),
+
+ new Criterion("orderBy",sort)
+ };
+ query.Criteria = criterias;
+ return _IOA_DeliverPlanDAL.SelectModelPage(query, pa);
+ }
+
+
+
+ /// <summary>
+ /// 鏌ヨ鍚堜綔瀹㈡埛鍒嗛〉鍒楄〃
+ /// </summary>
+ /// <param name="pa"></param>
+ /// <returns></returns>
+ public IEnumerable<OA_DeliverPlan> SelectModelPageLishi(Pagination pa, Guid FirmId, string DeliveredTimestart, string DeliveredTimeend,
+ string CarId, string DriverId, string trueMemberId = "")
+ {
+ string Condition = " and od.FirmId ='" + FirmId + "' and od.shifouDelivery = 1 ";
+
+ if (!string.IsNullOrEmpty(DeliveredTimestart))
+ {
+
+ Condition += " and DATEDIFF(day,'"+ DeliveredTimestart + "',od.[DeliverTime])>=0 ";
+
+ }
+
+ if (!string.IsNullOrEmpty(DeliveredTimeend))
+ {
+
+ Condition += " and DATEDIFF(day,'" + DeliveredTimeend + "',od.[DeliverTime])<=0 ";
+
+ }
+
if (!string.IsNullOrEmpty(CarId))
Condition += " and od.CarId = '" + CarId + "'";
@@ -190,6 +267,7 @@
}
+
/// <summary>
/// 鏌ヨ鍚堜綔瀹㈡埛鍒嗛〉鍒楄〃
/// </summary>
--
Gitblit v1.9.1