From a7e05ebe00fdcb649c012e5afc4a42a8d631e824 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 02 四月 2025 08:38:24 +0800
Subject: [PATCH] 删除客户管理查询条件中的“客户编号” 完成  新增订单---黑白印件  的后道工序最右边增加一个“口 竖式”,同前面套号、压痕一样,默认不勾选,是竖式的业务经理自己下单时勾选  完成提交外协付款申请时,增加上传审批证明的上传图片功能,可以添加多张图片;查询列表中增加“付款状态:全部、已付款、未付款”查询条件,默认全部;“完工状态”改为默认未完工   完成请示批复----付款申请  中也要向上面的需求一样,增加上传审批证明的上传图片功能,可以添加多张图片   完成在“请示批复”中进行“批复”操作的时候要能查看上传的审批图片  完成包装要求”要显示在打印的订单中 完成包装要求”要显示在打印的订单中 完成收据联单的新增订单中,纸张选无碳纸时,不显示“品牌”、“克重”,在联数的后面增加颜色选择:“颜色:上白下红”(匹配联数)订单管理中的“订单状态”删除,删除后新增两个状态:“完工状态:全部、未完工、已完工”和“送货状态:全部、已送货、未送货”  完成请示批复中默认“未批复”   完成请示批复中默认“未批复”   完成

---
 CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs |   98 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 96 insertions(+), 2 deletions(-)

diff --git a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
index 84ff7ae..1565a5c 100644
--- a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
@@ -463,9 +463,9 @@
         /// <param name="OutOrderId"></param>
         /// <param name="RelationType"></param>
         /// <returns></returns>
-        public IEnumerable<EC_OrderBasic> SelectAferOfOutOrder(Infrastructure.Query.Pagination pagination, Guid MemberId, DateTime? StartCreatTime, DateTime? EndCreatTime, DateTime? StartReturnTime, DateTime? EndReturnTime, string Creater, string OutFirm, string WorkStates, string OutOrderId, int? RelationType)
+        public IEnumerable<EC_OrderBasic> SelectAferOfOutOrder(Infrastructure.Query.Pagination pagination, Guid MemberId, DateTime? StartCreatTime, DateTime? EndCreatTime, DateTime? StartReturnTime, DateTime? EndReturnTime, string Creater, string OutFirm, string WorkStates, string OutOrderId, int? RelationType, string PayState = null)
         {
-            return _eC_OrderBasicDAL.SelectAferOfOutOrder(pagination, MemberId, StartCreatTime, EndCreatTime, StartReturnTime, EndReturnTime, Creater, OutFirm, WorkStates, OutOrderId, RelationType);
+            return _eC_OrderBasicDAL.SelectAferOfOutOrder(pagination, MemberId, StartCreatTime, EndCreatTime, StartReturnTime, EndReturnTime, Creater, OutFirm, WorkStates, OutOrderId, RelationType, PayState);
         }
 
         /// <summary>
@@ -674,6 +674,100 @@
 
 
 
+        /// <summary>
+        /// 鏌ヨ瀹㈡埛棰勪粯娆惧垪琛�
+        /// </summary>
+        /// <param name="pa"></param>
+        /// <returns></returns>
+        public IEnumerable<EC_OrderBasic> GetModelPageListForSonghuoyanchis(Pagination pa, string DeliveryTime, string Province, string City, string County, string BuyerName, string BusinessManagerId, string SellerOrderId, string DocumentName, Guid SellerId)
+        {
+            string Condition = " and ( ob.[OrderState] ='1' or ob.[OrderState] ='2' or ob.[OrderState] ='3'  or ob.[OrderState] ='4' ) and SellerId='" + SellerId + "' ";
+
+            if (!string.IsNullOrEmpty(DeliveryTime))
+            {
+                if (DeliveryTime == "鏄庡ぉ")
+                {
+                    Condition += " and (  DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])=1 or  DATEDIFF(DAY,GETDATE(),oe.[DelayTime])=1 )";
+                }
+                else if (DeliveryTime == "鍚庡ぉ")
+                {
+                    Condition += " and  (  DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])=2 or  DATEDIFF(DAY,GETDATE(),oe.[DelayTime])=2 )";
+                }
+                else if (DeliveryTime == "3澶�")
+                {
+                    Condition += " and  (  DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])=3 or  DATEDIFF(DAY,GETDATE(),oe.[DelayTime])=3 )";
+                }
+                else if (DeliveryTime == "4澶�")
+                {
+                    Condition += " and  (  DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])=4 or  DATEDIFF(DAY,GETDATE(),oe.[DelayTime])=4 )";
+                }
+                else if (DeliveryTime == "5澶�")
+                {
+                    Condition += " and (   DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])=5 or  DATEDIFF(DAY,GETDATE(),oe.[DelayTime])=5) ";
+                }
+                else if (DeliveryTime == "6澶�")
+                {
+                    Condition += " and  (  DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])=6 or  DATEDIFF(DAY,GETDATE(),oe.[DelayTime])=6) ";
+                }
+                else if (DeliveryTime == "7澶�")
+                {
+                    Condition += " and  (  DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])=7 or  DATEDIFF(DAY,GETDATE(),oe.[DelayTime])=7 )";
+                }
+                else if (DeliveryTime == "涓�鍛ㄥ悗")
+                {
+                    Condition += " and  (  DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime]) >7 or  DATEDIFF(DAY,GETDATE(),oe.[DelayTime])>7 )";
+                }
+                else if (DeliveryTime == "閫炬湡")
+                {
+                    Condition += " and (  DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])<=0 or  DATEDIFF(DAY,GETDATE(),oe.[DelayTime])<=0 )";
+                }
+
+            }
+
+            if (!string.IsNullOrEmpty(Province))
+                Condition += string.Format(" and CustomerCommunications.Province='{0}'", Province);
+
+            if (!string.IsNullOrEmpty(City))
+                Condition += string.Format(" and CustomerCommunications.City='{0}'", City);
+
+            if (!string.IsNullOrEmpty(County))
+                Condition += string.Format(" and CustomerCommunications.County='{0}'", County);
+
+            if (!string.IsNullOrEmpty(BuyerName))
+            {
+                Condition += " and  ob.BuyerName like '%" + BuyerName + "%'";
+            }
+            if (!string.IsNullOrEmpty(BusinessManagerId))
+            {
+                Condition += string.Format(" and oe.BusinessManagerId='{0}'", BusinessManagerId);
+            }
+
+
+
+            if (!string.IsNullOrEmpty(SellerOrderId))
+            {
+                Condition += " and  ob.SellerOrderId like '%" + SellerOrderId + "%'"; ;
+            }
+            if (!string.IsNullOrEmpty(DocumentName))
+            {
+                Condition += " and  ob.DocumentName like '%" + DocumentName + "%'"; ;
+            }
+
+
+            Query query = new Query();
+            IList<Criterion> criterias = new List<Criterion>()
+            {
+                new Criterion("", Condition),
+
+                new Criterion("orderBy","   [DeliveryTime] DESC ")
+            };
+            query.Criteria = criterias;
+            return _eC_OrderBasicDAL.SelectModelPage_weiwangong(query, pa);
+        }
+
+
+
+
 
         /// <summary>
         /// 鏍规嵁鏂板璁㈠崟鎿嶄綔锛屽苟淇敼璁㈠崟鐘舵��

--
Gitblit v1.9.1