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.SQLDAL/EC/EC_OrderBasicDAL.cs | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 3 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
index 7f99ba9..56cd407 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -410,7 +410,7 @@
{
new SqlParameter("@Keyid",OrderId)
};
- string sql = " Update [EC_OrderExtend] Set [SurplusPrintNum]=[PrintNum] where [Keyid] = (select [OrderId] from [OA_OrderWorkListRelation] where [RelationTargetId] = @Keyid and [RelationTypeId]=4 ) ;Update [EC_OrderBasic] Set [OrderState]=2 where [Keyid] = (select [OrderId] from [OA_OrderWorkListRelation] where [RelationTargetId] = @Keyid and [RelationTypeId]=4 ) ";
+ string sql = " Update [EC_OrderExtend] Set [SurplusPrintNum]=[PrintNum] where [Keyid] = (select [OrderId] from [OA_OrderWorkListRelation] where [RelationTargetId] = @Keyid and [RelationTypeId]=4 ) ;Update [EC_OrderBasic] Set [OrderState]=1 where [Keyid] = (select [OrderId] from [OA_OrderWorkListRelation] where [RelationTargetId] = @Keyid and [RelationTypeId]=4 ) ";
try
{
@@ -1530,6 +1530,20 @@
}
+
+ /// <summary>
+ /// 鏍规嵁绫诲瀷鏌ヨ 璁㈠崟
+ /// </summary>
+ /// <param name="orderId">璁㈠崟缂栧彿</param>
+ /// <returns></returns>
+ public IEnumerable<EC_OrderBasic> GetOrderByPrintTypeId(int PrintTypeId)
+ {
+
+ IList<EC_OrderBasic> result = _dataBase.SelectModel<EC_OrderBasic>(" * ", "EC_OrderBasic ", string.Format(" PrintTypeId = {0} and (OrderState = 4 or OrderState = 2 or OrderState = 3 )", PrintTypeId));
+ return result;
+ }
+
+
/// <summary>
/// 鏍规嵁瀹㈡埛ID鍜岃鍗曟敮浠樼姸鎬佽幏鍙栬鍗曞垪琛�
/// </summary>
@@ -1539,7 +1553,7 @@
{
IList<EC_OrderBasic> result = new List<EC_OrderBasic>();
- result = _dataBase.SelectModel<EC_OrderBasic>(" * ", "EC_OrderBasic ", string.Format(" BuyerId = '{0}' and PayState!={1} and SellerId = '{2}'", BuyerId,PayState, SellerId));
+ result = _dataBase.SelectModel<EC_OrderBasic>(" * ", "EC_OrderBasic ", string.Format(" BuyerId = '{0}' and PayState!={1} and SellerId = '{2}' and [OrderState]!=0 and [OrderState] !=-2 ", BuyerId,PayState, SellerId));
return result;
}
/// <summary>
@@ -1743,6 +1757,46 @@
}
return null == result || result.Count == 0 ? null : result[0];
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰彇璁㈠崟淇℃伅
+ /// </summary>
+ /// <param name="orderId">璁㈠崟鍞竴缂栧彿</param>
+ /// <returns></returns>
+ public EC_OrderBasic SelectModelByxiadanId(int orderId)
+ {
+ if (0 >= orderId)
+ {
+ return null;
+ }
+ else
+ {
+ }
+ string condition = " ";
+ if (orderId > 0)
+ {
+ condition = " b.[XiadanKeyid]=" + orderId + "";
+ }
+ else
+ {
+ return null;
+ }
+
+
+ try
+ {
+ IList<EC_OrderBasic> result = _dataBase.SelectModel<EC_OrderBasic>("a.*", " EC_OrderBasic a inner join [EC_OrderExtend] b on a.[Keyid] = b.[Keyid] ", condition) as IList<EC_OrderBasic>;//鎵ц鏌ヨ
+
+ return (null == result || result.Count == 0) ? null : result[0];//杩斿洖缁撴灉
+
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+
}
@@ -3094,7 +3148,7 @@
condition += " and a.CreateTime >= '" + StartCreatTime.Value + "' ";
if (EndCreatTime != null)
- condition += " and a.CreateTime =< '" + EndCreatTime.Value.AddDays(1) + "' ";
+ condition += " and a.CreateTime <= '" + EndCreatTime.Value.AddDays(1) + "' ";
if (StartReturnTime != null)
condition += " and d.DeliverTime >= '" + StartReturnTime.Value + "' ";
--
Gitblit v1.9.1