From 374ce108d737c1e4d6608989090195a7346d10ad Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 26 二月 2026 08:47:21 +0800
Subject: [PATCH] 优化格式美观度。 完成 （1）“印刷、打包、送货要求”放在右边的格子里面；右边格子拉通 （2）“单价”和“总价”的格子比例要调整适中 （3）把“印件名称”放在第一格 （1）操作中增加“问题处理”，进行处理操作 完成 （2）问题反馈除了生成在这个列表中，还要自动推送给对应订单的下单人或者送货安排（发起工作安排）的安排人，显示在他们的“工作提醒”中，处理完了就在列表中变成已完成问题处理，显示“√”，点“√”进去就显示谁处理的、什么时候处理的。 完成 生产施工单中，选“轮转印刷机”的，删除“纸张数量（张）”和“开料规格” 完成
---
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