From b1ac791a0e8896ee3d2016949911d44c9f0fb7a9 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 16 三月 2026 13:17:23 +0800
Subject: [PATCH] 封面的构件选项修改为“封面、封内合拼、多单合拼、内页”，默认封面 选择了封面构件后，新增的内页构件中的选项该为“内页、多单合拼”， 默认内页 专版按以上 合版的选项中增加“无”，默认无 无”打印的时候为空白，不显示“无”字
---
CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs
index 45cc514..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
{
@@ -121,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
{
@@ -207,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