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_DeliverPlanBLL.cs |   30 ++++++++++++++++++++++++++++--
 1 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs
index 0771cec..2b8837c 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs
@@ -119,6 +119,19 @@
             return _IOA_DeliverPlanDAL.GetModelByformid(formid);
         }
 
+
+
+        /// <summary>
+        /// 鏍规嵁deliverPlanPaicheid鑾峰緱淇℃伅
+        /// </summary>
+        /// <param name="deliverPlanPaicheid">缂栧彿</param>
+        /// <returns></returns>
+        public IEnumerable<Model.OA_DeliverPlan> GetModelByDeliverPlanPaicheid(Guid deliverPlanPaicheid)
+        {
+
+            return _IOA_DeliverPlanDAL.GetModelByDeliverPlanPaicheid(deliverPlanPaicheid);
+        }
+
         /// <summary>
         /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
         /// </summary>
@@ -154,7 +167,7 @@
         /// <param name="pa"></param>
         /// <returns></returns>
         public IEnumerable<OA_DeliverPlan> SelectModelPage(Pagination pa, Guid FirmId,  string DeliveredTime,
-  string CarId, string DriverId,string trueMemberId ="", string CustormerName = "", string BusinessManager = "")
+  string CarId, string DriverId,string trueMemberId ="", string CustormerName = "", string BusinessManager = "", string Paiche = "")
         {
             string Condition = " and od.FirmId ='" + FirmId + "' and od.shifouDelivery = 1 ";
             string sort = " Dizhi asc   ";
@@ -167,7 +180,7 @@
                 }
                 else
                 {
-                    Condition += " and DATEDIFF(day,GETDATE(),od.[DeliverTime])<0 and od.[DeliveredTime] is null  ";
+                    Condition += " and DATEDIFF(day,GETDATE(),od.[DeliverTime])<0    ";
                     sort = "  DeliverTime desc,Dizhi asc   ";
                 }
             }
@@ -183,6 +196,19 @@
                 Condition += " and  od.BusinessManagerId = '" + BusinessManager + "'";
             if (!string.IsNullOrEmpty(CustormerName))
                 Condition += " and  od.CompanyName like '%" + CustormerName + "%'";
+            if (!string.IsNullOrEmpty(Paiche))
+            {
+                if(Paiche == "1")
+                {
+                    Condition += " and   od.CarId >0";
+                }
+                else
+                {
+                    Condition += " and ( od.CarId = 0 or od.CarId is null )";
+                }
+               
+            }
+               
 
             Query query = new Query();
             IList<Criterion> criterias = new List<Criterion>()

--
Gitblit v1.9.1