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.BLL/OA/OA_KaipiaoshenqingBLL.cs |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs
index ad971c2..e7ad82a 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs
@@ -139,7 +139,7 @@
         /// <param name="pa"></param>
         /// <returns></returns>
         public IEnumerable<OA_Kaipiaoshenqing> SelectModelPage(Pagination pa, Guid FirmId, string CreateTimeStart, string CreateTimeEnd,
-  string Kaipiaoshenqing, string Kehuqianshou, string BusinessManagerId, string CustormerName, string PayStates, string HuikuanStates)
+  string Kaipiaoshenqing, string Kehuqianshou, string BusinessManagerId, string CustormerName, string PayStates, string HuikuanStates,string Fapiaohao)
         {
             string Condition = " and ok.FirmId ='" + FirmId + "' and ok.ApprovalStatus = 1 ";
 
@@ -161,11 +161,11 @@
             {
                 if (HuikuanStates == "2")
                 {
-                    Condition += " and  ok.Huikuanmoney >0 ";
+                    Condition += " and  ok.Huikuanmoney >= kpmoney ";
                 }
                 else if (HuikuanStates == "1")
                 {
-                    Condition += " and ( ok.Huikuanmoney is null or ok.Huikuanmoney <=0) ";
+                    Condition += " and ( ok.Huikuanmoney is null or ok.Huikuanmoney < kpmoney ) ";
                 }
             }
             if (!string.IsNullOrEmpty(PayStates))
@@ -179,7 +179,8 @@
                     Condition += " and ( ( ok.Shenqingleixing ='璁㈠崟寮�绁�' and EXISTS (  select eoe.[KaipiaoshenqingId] from [EC_OrderExtend] eoe inner join [EC_OrderBasic] eob on eob.Keyid = eoe.Keyid  where ok.Keyid  = eoe.[KaipiaoshenqingId] and eob.PayState !=-1   ) ) or ( ok.Shenqingleixing ='棰勪粯娆惧紑绁�' and ok.[Kehumoney] < ok.[kpmoney]  ) )";
                 }
             }
-           
+            if (!string.IsNullOrEmpty(Fapiaohao))
+                Condition += " and  ok.Fapiaohao like '%" + Fapiaohao + "%'";
 
             Query query = new Query();
             IList<Criterion> criterias = new List<Criterion>()

--
Gitblit v1.9.1