From 5af3a0cbd911adbdc2dd98e08008c4fbd50530d9 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 18 十二月 2025 12:19:17 +0800
Subject: [PATCH] 送货情况只查已送的 完成 以送货完成的时间为准来查询。 完成
---
CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs
index 75da3cd..10fa562 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs
@@ -177,7 +177,7 @@
Condition += " and b.shipAddress = '" + shipAddress + "'";
if (!string.IsNullOrEmpty(BuyerName))
- Condition += " and c.BuyerName like '%" + BuyerName + "%'";
+ Condition += " and c.Keyid = '" + BuyerName + "'";
if (!string.IsNullOrEmpty(createTimeStart))
@@ -193,7 +193,7 @@
{
new Criterion("", Condition),
- new Criterion("orderBy"," MakeTime desc ")
+ new Criterion("orderBy"," MakeTime ")
};
query.Criteria = criterias;
return _ICoreDeliverOrderDAL.SelectModelPage(query, pa);
@@ -207,17 +207,33 @@
/// <param name="pa"></param>
/// <returns></returns>
public IEnumerable<CoreDeliverOrder> SelectModelPageLishi(Pagination pa, Guid FirmId, int? DriverId, string shipAddress,
- string BuyerName, string createTimeStart, string createTimeEnd,string OrderState)
+ string BuyerName, string createTimeStart, string createTimeEnd,string OrderState,string shifou)
{
string Condition = " and b.FirmId ='" + FirmId + "' ";
if (!string.IsNullOrEmpty(OrderState))
{
- Condition += " and a.OrderState = " + OrderState + " ";
+ if (OrderState != "4")
+ {
+ Condition += " and a.OrderState = " + OrderState + " ";
+ }
+ else
+ {
+ Condition += " and a.OrderState in( 0,1 ) ";
+ }
}
else
{
- Condition += " and a.OrderState in( 0,1,2 ) ";
+ if (!string.IsNullOrEmpty(shifou))
+ {
+ Condition += " and a.OrderState in( 0,1 ) ";
+ }
+ else
+ {
+ Condition += " and a.OrderState in( 0,1,2 ) ";
+ }
+
+
}
if (DriverId.HasValue)
{
@@ -229,14 +245,14 @@
Condition += " and b.shipAddress = '" + shipAddress + "'";
if (!string.IsNullOrEmpty(BuyerName))
- Condition += " and c.BuyerName like '%" + BuyerName + "%'";
+ Condition += " and c.Keyid = '" + BuyerName + "'";
if (!string.IsNullOrEmpty(createTimeStart))
- Condition += " and DATEDIFF(day,a.[MakeTime],'" + createTimeStart + "')<=0 ";
+ Condition += " and DATEDIFF(day,a.[OverTime],'" + createTimeStart + "')<=0 ";
if (!string.IsNullOrEmpty(createTimeEnd))
- Condition += " and DATEDIFF(day,a.[MakeTime],'" + createTimeEnd + "')>=0 ";
+ Condition += " and DATEDIFF(day,a.[OverTime],'" + createTimeEnd + "')>=0 ";
--
Gitblit v1.9.1