From 50d433602441964d905abe6e516ad258ba66627d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 21 十一月 2025 12:06:16 +0800
Subject: [PATCH] 送货单修改这几个地方，第一个，那个表格最上面那根线条和左边那根线条看粗细不一致，太细了， 感觉像打出来像断笔画。这是一个。第二个， 中间空的太多。我刚才打印打了两张送货单，他都打印的是两页， 相当于说跳了一行一行空白的第二页，第二页是白字的嘛，中间空的太多，中间不空那么多。 好，第三，那个左右的页边距，你们可能只有。
---
CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs
index e24d161..bc6c627 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs
@@ -36,10 +36,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("@FirmId",trueModel.FirmId),
- new SqlParameter("@SuppliersId",trueModel.SuppliersId),
+ SuppliersId,
new SqlParameter("@GoodsId",trueModel.GoodsId),
new SqlParameter("@ClearingStatusId",trueModel.ClearingStatusId),
new SqlParameter("@Price",trueModel.Price),
@@ -55,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
{
@@ -80,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),
@@ -100,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
{
@@ -186,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