From 374ce108d737c1e4d6608989090195a7346d10ad Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 26 二月 2026 08:47:21 +0800
Subject: [PATCH] 优化格式美观度。 完成 (1)“印刷、打包、送货要求”放在右边的格子里面;右边格子拉通 (2)“单价”和“总价”的格子比例要调整适中 (3)把“印件名称”放在第一格 (1)操作中增加“问题处理”,进行处理操作  完成 (2)问题反馈除了生成在这个列表中,还要自动推送给对应订单的下单人或者送货安排(发起工作安排)的安排人,显示在他们的“工作提醒”中,处理完了就在列表中变成已完成问题处理,显示“√”,点“√”进去就显示谁处理的、什么时候处理的。  完成 生产施工单中,选“轮转印刷机”的,删除“纸张数量(张)”和“开料规格”  完成

---
 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