From 50d433602441964d905abe6e516ad258ba66627d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 21 十一月 2025 12:06:16 +0800
Subject: [PATCH] 送货单修改这几个地方，第一个，那个表格最上面那根线条和左边那根线条看粗细不一致，太细了， 感觉像打出来像断笔画。这是一个。第二个， 中间空的太多。我刚才打印打了两张送货单，他都打印的是两页， 相当于说跳了一行一行空白的第二页，第二页是白字的嘛，中间空的太多，中间不空那么多。 好，第三，那个左右的页边距，你们可能只有。
---
CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanPaicheBLL.cs | 63 ++++++++++++++++++++++++++++++-
1 files changed, 61 insertions(+), 2 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanPaicheBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanPaicheBLL.cs
index bd02330..3a079a2 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanPaicheBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanPaicheBLL.cs
@@ -238,9 +238,68 @@
-
-
+
+
+ /// <summary>
+ /// 鏌ヨ鍚堜綔瀹㈡埛鍒嗛〉鍒楄〃
+ /// </summary>
+ /// <param name="pa"></param>
+ /// <returns></returns>
+ public IEnumerable<OA_DeliverPlan> SelectModelPageWenti(Pagination pa, Guid FirmId,
+ string DeliveredTimeStart, string DeliveredTimeEnd, string DriverId, string Zerenren , string CustormerName , string Wanjiestatus )
+ {
+ string Condition = " and od.FirmId ='" + FirmId + "' and od.DeliveredTime is not null and od.wentifankui is not null and od.wentifankui!='' "; // and od.shifouDelivery = 1
+ string sort = "DeliveredTime desc ";
+
+
+ if (!string.IsNullOrEmpty(DeliveredTimeStart))
+ {
+ Condition += " and DATEDIFF(day,'" + DeliveredTimeStart + "',od.[DeliveredTime]) >= 0 ";
+ }
+
+ if (!string.IsNullOrEmpty(DeliveredTimeEnd))
+ {
+ Condition += " and DATEDIFF(day,'" + DeliveredTimeEnd + "',od.[DeliveredTime]) <= 0 ";
+ }
+
+ if (!string.IsNullOrEmpty(DriverId))
+ Condition += " and od.DriverId = '" + DriverId + "'";
+
+ if (!string.IsNullOrEmpty(Zerenren))
+ Condition += " and od.Zerenren = '" + Zerenren + "'";
+ if (!string.IsNullOrEmpty(CustormerName))
+ Condition += " and od.CompanyName like '%" + CustormerName + "%'";
+
+
+
+
+ if (!string.IsNullOrEmpty(Wanjiestatus))
+ {
+ if (Wanjiestatus == "1")
+ {
+ Condition += " and od.Wanjiestatus = 1 ";
+ }
+ else
+ {
+ Condition += " and ( od.Wanjiestatus is null or od.Wanjiestatus = 0 )";
+ }
+
+ }
+
+
+ Query query = new Query();
+ IList<Criterion> criterias = new List<Criterion>()
+ {
+ new Criterion("", Condition),
+
+ new Criterion("orderBy",sort)
+ };
+ query.Criteria = criterias;
+ return _IOA_DeliverPlanPaicheDAL.SelectModelPageWenti(query, pa);
+ }
+
+
}
}
--
Gitblit v1.9.1