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/OA/OA_GoodsInfoDAL.cs | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_GoodsInfoDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_GoodsInfoDAL.cs
index aafa92a..d4e204e 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_GoodsInfoDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_GoodsInfoDAL.cs
@@ -153,7 +153,7 @@
throw new NotImplementedException();
}
- public IEnumerable<Model.OA_GoodsInfo> SelectModelPage(Pagination pa, Guid FirmId, string GoodsName, string CommodityName)
+ public IEnumerable<Model.OA_GoodsInfo> SelectModelPage(Pagination pa, Guid FirmId, string GoodsName, string CommodityName ,string selGoodsStatus)
{
string Condition = " where a.FirmId='" + FirmId + "' ";
@@ -163,7 +163,11 @@
}
if (!string.IsNullOrEmpty(CommodityName))
{
- Condition += " and e.CommodityName like '%" + CommodityName + "%' ";
+ Condition += " and a.GoodsTypeId = " + CommodityName + " ";
+ }
+ if (!string.IsNullOrEmpty(selGoodsStatus))
+ {
+ Condition += " and a.StatusId = " + selGoodsStatus + " ";
}
string selTarget = "a.* ,b.Name AS brandName,c.Name as SpecificationName,d.Name as StatusName,e.CommodityName as CommodityName";
--
Gitblit v1.9.1