From 006dca9a42fba209410906ef39e96912266f3561 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 19 三月 2026 09:05:38 +0800
Subject: [PATCH] 20260318  在司机后面把车牌号加上,如:“龚小虎(川G51020)”   送货计划的客户名称: 下单状态也查询

---
 CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
index 257421a..5dcc001 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -410,7 +410,7 @@
             {
                 new SqlParameter("@Keyid",OrderId)
             };
-            string sql = " Update [EC_OrderExtend] Set [SurplusPrintNum]=[PrintNum]   where [Keyid] = (select [OrderId] from [OA_OrderWorkListRelation] where [RelationTargetId] = @Keyid and [RelationTypeId]=4 )  ;Update [EC_OrderBasic] Set [OrderState]=2   where [Keyid] = (select [OrderId] from [OA_OrderWorkListRelation] where [RelationTargetId] = @Keyid and [RelationTypeId]=4 )   ";
+            string sql = " Update [EC_OrderExtend] Set [SurplusPrintNum]=[PrintNum]   where [Keyid] = (select [OrderId] from [OA_OrderWorkListRelation] where [RelationTargetId] = @Keyid and [RelationTypeId]=4 )  ;Update [EC_OrderBasic] Set [OrderState]=1   where [Keyid] = (select [OrderId] from [OA_OrderWorkListRelation] where [RelationTargetId] = @Keyid and [RelationTypeId]=4 )   ";
 
             try
             {
@@ -1536,10 +1536,10 @@
         /// </summary>
         /// <param name="orderId">璁㈠崟缂栧彿</param>
         /// <returns></returns>
-        public IEnumerable<EC_OrderBasic> GetOrderByPrintTypeId(int PrintTypeId)
+        public IEnumerable<EC_OrderBasic> GetOrderByPrintTypeId(int PrintTypeId, Guid MemberId)
         {
-            
-            IList<EC_OrderBasic> result = _dataBase.SelectModel<EC_OrderBasic>(" * ", "EC_OrderBasic ", string.Format(" PrintTypeId = {0} and OrderState = 4 ", PrintTypeId));
+            //string sss = "EC_OrderBasic" + string.Format(" PrintTypeId = {0} and SellerId = '{1}' and OrderTypeId=1 and (OrderState = 4 or OrderState = 2 or OrderState = 3 or OrderState = 1)", PrintTypeId, MemberId.ToString());
+            IList<EC_OrderBasic> result = _dataBase.SelectModel<EC_OrderBasic>(" * ", "EC_OrderBasic ", string.Format(" PrintTypeId = {0} and SellerId = '{1}' and OrderTypeId=1 and (OrderState = 4 or OrderState = 2 or OrderState = 3 or OrderState = 1)", PrintTypeId, MemberId.ToString()));
             return result;
         }
 
@@ -1553,7 +1553,7 @@
         {
             IList<EC_OrderBasic> result = new List<EC_OrderBasic>();
          
-             result = _dataBase.SelectModel<EC_OrderBasic>(" * ", "EC_OrderBasic ", string.Format(" BuyerId = '{0}' and PayState!={1} and  SellerId = '{2}'", BuyerId,PayState, SellerId));
+             result = _dataBase.SelectModel<EC_OrderBasic>(" * ", "EC_OrderBasic ", string.Format(" BuyerId = '{0}' and PayState!={1} and  SellerId = '{2}' and [OrderState]!=0 and [OrderState] !=-2 ", BuyerId,PayState, SellerId));
             return result;
         }
         /// <summary>

--
Gitblit v1.9.1