From 259584df9c06ade70f1f351affb35d4922e1263d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 07 十一月 2025 16:23:13 +0800
Subject: [PATCH] 这个打印送货单，你们给我做两种，做一张打印没得数量的，做一张打印有数量的。送货单格式就是32开，就哎就是A4排一半。你们打了测试，注意，美观。 把那个把它做出来，下一批就用这个自动打。 不是不是打印的要数量都是有数量，要没得数量都没得数量。就是点打印的时候就两个按钮嘛，一个是有数量打印，或者或者或者空白送货单打印。 现在这个现在的送货单都是没有数量噻。现在那个要的，比如你那里再打你那个打印关闭的按钮，要把搞成两个打印嘛，就是打印空白送货单和打印送货单。 好点打印空白送货单的，就是现在这样子。点打印送货单，打印的就是那个跟有有就是有数据的送货单。作业本送货统计查询，状态查询需要修改逻辑
---
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