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_DocumentDAL.cs |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DocumentDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DocumentDAL.cs
index 6a4ee89..8f6e6fa 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DocumentDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DocumentDAL.cs
@@ -55,8 +55,9 @@
                         	new SqlParameter("@DM_PrintTime", trueModel.DM_PrintTime) ,            
                         	new SqlParameter("@DM_PrintStatus", trueModel.DM_PrintStatus) ,            
                         	new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime) ,            
-                        	new SqlParameter("@Operator", trueModel.Operator)             
-            		 };
+                        	new SqlParameter("@Operator", trueModel.Operator)      ,
+                            new SqlParameter("@Konghangshu", trueModel.Konghangshu.HasValue?trueModel.Konghangshu.Value:0) ,
+                     };
             try
             {
                 _dataBase.Query("sp_OA_Document_Insert", CommandType.StoredProcedure, sqlParms.ToArray<SqlParameter>());
@@ -101,7 +102,10 @@
                             new SqlParameter("@DM_PrintStatus", trueModel.DM_PrintStatus) ,            
                             new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime) ,            
                             new SqlParameter("@Operator", trueModel.Operator),
-                             new SqlParameter("@Jusequanxian", trueModel.Jusequanxian),
+                              new SqlParameter("@Jusequanxian",string.IsNullOrEmpty(trueModel.Jusequanxian)?"":trueModel.Jusequanxian) ,
+
+                            new SqlParameter("@Konghangshu", trueModel.Konghangshu.HasValue?trueModel.Konghangshu.Value:0) ,
+                             new SqlParameter("@Shifoushenpi",trueModel.Shifoushenpi.HasValue?trueModel.Shifoushenpi.Value:0) ,
                      };
             try
             {
@@ -189,7 +193,7 @@
         /// </summary>
         /// <param name="pagination"></param>
         /// <returns></returns>
-        public IEnumerable<Model.OA_Document> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid _FirmId, DateTime? _BeginDM_PromulgatedDate, DateTime? _EndDM_PromulgatedDate, int? _DM_Status, int? _DM_PostingId, string _DM_PostingName, string _DM_PostingFirmName, string _DM_DocumentType, string _DM_DocumentNumber, string _DM_Title, string _DM_Content, string _DM_ThemeWords, string _DM_CCUnit, int? _DM_PrintNumber, int? _DM_Number, DateTime? _BeginDM_DelTime, DateTime? _EndDM_DelTime, DateTime? _BeginDM_PrintTime, DateTime? _EndDM_PrintTime, int? _DM_PrintStatus, DateTime? _BeginLastUpdateTime, DateTime? _EndLastUpdateTime, string _Operator)
+        public IEnumerable<Model.OA_Document> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid _FirmId, DateTime? _BeginDM_PromulgatedDate, DateTime? _EndDM_PromulgatedDate, int? _DM_Status, int? _DM_PostingId, string _DM_PostingName, string _DM_PostingFirmName, string _DM_DocumentType, string _DM_DocumentNumber, string _DM_Title, string _DM_Content, string _DM_ThemeWords, string _DM_CCUnit, int? _DM_PrintNumber, int? _DM_Number, DateTime? _BeginDM_DelTime, DateTime? _EndDM_DelTime, DateTime? _BeginDM_PrintTime, DateTime? _EndDM_PrintTime, int? _DM_PrintStatus, DateTime? _BeginLastUpdateTime, DateTime? _EndLastUpdateTime, string _Operator, int? Shifoushenpi)
         {
             try
             {
@@ -207,6 +211,19 @@
                 if (_DM_Status.HasValue)
                     condition += " and DM_Status = '" + _DM_Status + "'";
 
+                if (Shifoushenpi.HasValue)
+                {
+                    if(Shifoushenpi.Value == 1)
+                    {
+                        condition += " and Shifoushenpi = " + Shifoushenpi + "";
+                    }
+                    else
+                    {
+                        condition += " and ( Shifoushenpi is null or  Shifoushenpi = " + Shifoushenpi + " )";
+                    }
+                }
+                   
+
                 if (_DM_PostingId.HasValue)
                     condition += " and DM_PostingId = '" + _DM_PostingId + "'";
 

--
Gitblit v1.9.1