From abdd1a1d8802a93ad9307b0b42020beae9147f62 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 30 十月 2025 08:44:30 +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