From 797025a3444aebadf8c4242810c9823544799b76 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Thu, 15 Jun 2023 12:51:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/GlobalContext.cs                  |  2 +-
 .../BatchPurchase/PurchaseOrderV2Response.cs  |  3 --
 BBWY.Client/Models/Enums.cs                   | 33 +++++++++++++++++--
 .../BatchPurchase/BatchPurchaseBusiness.cs    | 15 +++++++--
 BBWY.Server.Model/Enums.cs                    |  6 ++--
 5 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs
index 8d013252..963bd169 100644
--- a/BBWY.Client/GlobalContext.cs
+++ b/BBWY.Client/GlobalContext.cs
@@ -9,7 +9,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10125";
+            ClientVersion = "10126";
         }
 
         private User user;
diff --git a/BBWY.Client/Models/APIModel/Response/BatchPurchase/PurchaseOrderV2Response.cs b/BBWY.Client/Models/APIModel/Response/BatchPurchase/PurchaseOrderV2Response.cs
index c2278421..29d69414 100644
--- a/BBWY.Client/Models/APIModel/Response/BatchPurchase/PurchaseOrderV2Response.cs
+++ b/BBWY.Client/Models/APIModel/Response/BatchPurchase/PurchaseOrderV2Response.cs
@@ -88,9 +88,6 @@ namespace BBWY.Client.Models
 
         //public bool? IsSubscribeKuaiDi100 { get; set; } = false;
 
-        /// <summary>
-        /// 采购单状态(待付款=0,待发货=1,待收货=2,待质检=3,待打包=4,待结算=5,已完成=6)
-        /// </summary>
         public PurchaseOrderState? OrderState { get; set; }
 
         /// <summary>
diff --git a/BBWY.Client/Models/Enums.cs b/BBWY.Client/Models/Enums.cs
index c79f546c..c8c1e2e4 100644
--- a/BBWY.Client/Models/Enums.cs
+++ b/BBWY.Client/Models/Enums.cs
@@ -392,12 +392,41 @@
     }
 
     /// <summary>
-    /// 采购单状态 待付款 = 0, 待发货 = 1, 待收货 = 2, 待质检 = 3, 待打包 = 4, 待结算 = 5, 已完成 = 6, 已取消= 7
+    /// 订单状态 
+    /// <para>待付款 = 0</para>
+    /// <para>等待采购 = 1, 部分采购 = 110</para>
+    /// <para>待发货 = 2, 部分发货 = 120</para>
+    /// <para>待收货 = 3, 部分收货 = 130</para>
+    /// <para>已完成 = 4</para>
+    /// <para>锁定 = 5</para>
+    /// <para>已取消 = 6</para>
+    /// <para>暂停 = 7</para>
+    /// <para>已退款 = 8</para>
+    /// <para>Unknow = 100</para>
+    /// <para>打包中 = 140</para>
+    /// <para>待完结 = 150</para>
     /// </summary>
     public enum PurchaseOrderState
     {
-        待付款 = 0, 待发货 = 1, 待收货 = 2, 待质检 = 3, 待打包 = 4, 待结算 = 5, 已完成 = 6, 已取消 = 7
+        /*待付款 = 0, 待发货 = 1, 待收货 = 2, 待质检 = 3, 待打包 = 4, 待结算 = 5, 已完成 = 6, 已取消 = 7*/
+        待付款 = 0,
+        等待采购 = 1,
+        部分采购 = 110,
+        待发货 = 2,
+        部分发货 = 120,
+        待收货 = 3,
+        部分收货 = 130,
+        已完成 = 4,
+        锁定 = 5,
+        已取消 = 6,
+        暂停 = 7,
+        已退款 = 8,
+        Unknow = 100,
+        打包中 = 140,
+        待完结 = 150
     }
+
+
     public enum Settle
     {
         未结算 = 0,
diff --git a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
index d4e5e169..eca9b132 100644
--- a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
+++ b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
@@ -832,8 +832,19 @@ namespace BBWY.Server.Business
 
                     select = select.Where((po, pa) => childSelect.Where(posku => posku.PurchaseOrderId == po.Id).Any());
                 }
-                select = select.WhereIf(request.PurchaserName != null, (po, pa) => po.PurchaserName == request.PurchaserName)
-                               .WhereIf(request.PurchaseOrderState != null, (po, pa) => po.OrderState == request.PurchaseOrderState)
+                select = select.WhereIf(request.PurchaseOrderState == Enums.PurchaseOrderState.待付款 ||
+                                        request.PurchaseOrderState == Enums.PurchaseOrderState.打包中 ||
+                                        request.PurchaseOrderState == Enums.PurchaseOrderState.待完结 ||
+                                        request.PurchaseOrderState == Enums.PurchaseOrderState.已完成 ||
+                                        request.PurchaseOrderState == Enums.PurchaseOrderState.已取消,
+                                        (po,pa) => po.OrderState == request.PurchaseOrderState)
+                               .WhereIf(request.PurchaseOrderState == Enums.PurchaseOrderState.等待采购, (po,pa) => po.OrderState == Enums.PurchaseOrderState.等待采购 ||
+                                                                                                          po.OrderState == Enums.PurchaseOrderState.部分采购)
+                               .WhereIf(request.PurchaseOrderState == Enums.PurchaseOrderState.待发货, (po, pa) => po.OrderState == Enums.PurchaseOrderState.待发货 ||
+                                                                                                        po.OrderState == Enums.PurchaseOrderState.部分发货)
+                               .WhereIf(request.PurchaseOrderState == Enums.PurchaseOrderState.待收货, (po, pa) => po.OrderState == Enums.PurchaseOrderState.待收货 ||
+                                                                                                         po.OrderState == Enums.PurchaseOrderState.部分收货)
+                               .WhereIf(request.PurchaserName != null, (po, pa) => po.PurchaserName == request.PurchaserName)
                                .WhereIf(request.StartDate != null, (po, pa) => po.CreateTime >= request.StartDate)
                                .WhereIf(request.EndDate != null, (po, pa) => po.CreateTime <= request.EndDate);
             }
diff --git a/BBWY.Server.Model/Enums.cs b/BBWY.Server.Model/Enums.cs
index 47498c5e..784e9920 100644
--- a/BBWY.Server.Model/Enums.cs
+++ b/BBWY.Server.Model/Enums.cs
@@ -354,12 +354,12 @@
             Unknow = 100,
             打包中 = 140,
             待完结 = 150
-    }
+        }
 
 
         public enum PackState
         {
-            待发布=0,打包中=1,已完成=2
+            待发布 = 0, 打包中 = 1, 已完成 = 2
         }
 
         public enum IsDeleted
@@ -373,7 +373,7 @@
             未结算 = 0,
             已结清 = 1
         }
-    
+
 
         public enum BillOrigin
         {