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_ProcurementDAL.cs | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs
index e4d3e5a..bc6c627 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs
@@ -66,7 +66,11 @@
new SqlParameter("@PaperWeightId",trueModel.PaperWeightId),
new SqlParameter("@tanPrice",trueModel.TanPrice??0),
new SqlParameter("@ReceiveMoney",decimal.Parse("0")),
- new SqlParameter("@Commodityid",trueModel.Commodityid)
+ new SqlParameter("@Commodityid",trueModel.Commodityid),
+ new SqlParameter("@orderId",trueModel.orderId.HasValue?trueModel.orderId.Value:0),
+ new SqlParameter("@DocumentName",string.IsNullOrEmpty(trueModel.DocumentName)?"":trueModel.DocumentName),
+ new SqlParameter("@CaigourenId",trueModel.CaigourenId.HasValue?trueModel.CaigourenId.Value:0),
+ new SqlParameter("@Caigouren",string.IsNullOrEmpty(trueModel.Caigouren)?"":trueModel.Caigouren),
};
try
{
@@ -91,11 +95,21 @@
{
return false;
}
+
+ SqlParameter SuppliersId = null;
+ if (trueModel.SuppliersId.HasValue)
+ {
+ SuppliersId = new SqlParameter("@SuppliersId", trueModel.SuppliersId);
+ }
+ else
+ {
+ SuppliersId = new SqlParameter("@SuppliersId", DBNull.Value);
+ }
IList<SqlParameter> sqlParms = new List<SqlParameter>()
{
new SqlParameter("@Keyid",trueModel.Keyid),
new SqlParameter("@FirmId",trueModel.FirmId),
- new SqlParameter("@SuppliersId",trueModel.SuppliersId),
+ SuppliersId,
new SqlParameter("@GoodsId",trueModel.GoodsId),
new SqlParameter("@ClearingStatusId",trueModel.ClearingStatusId),
new SqlParameter("@Price",trueModel.Price),
@@ -111,7 +125,10 @@
new SqlParameter("@PaperWeightId",trueModel.PaperWeightId),
new SqlParameter("@tanPrice",trueModel.TanPrice??0),
new SqlParameter("@ReceiveMoney",trueModel.ReceiveMoney),
- new SqlParameter("@Commodityid",trueModel.Commodityid)
+ new SqlParameter("@Commodityid",trueModel.Commodityid),
+ new SqlParameter("@WarehouseName",string.IsNullOrEmpty(trueModel.WarehouseName)?"":trueModel.WarehouseName),
+ new SqlParameter("@CaigourenId",trueModel.CaigourenId.HasValue?trueModel.CaigourenId.Value:0),
+ new SqlParameter("@Caigouren",string.IsNullOrEmpty(trueModel.Caigouren)?"":trueModel.Caigouren),
};
try
{
@@ -197,7 +214,7 @@
}
if (!string.IsNullOrEmpty(Operator))
{
- Condition += string.Format(" and Operator='{0}'", Operator);
+ Condition += string.Format(" and Caigouren like '%{0}%'", Operator);
}
if (!string.IsNullOrEmpty(ClearingStatusId))
{
--
Gitblit v1.9.1