From 00c00849d493223af875ad8e0e60ed4ccb432931 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Thu, 6 Jul 2023 21:36:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E9=87=87=E8=B4=AD=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/GlobalContext.cs            |  2 +-
 BBWY.Client/Models/Enums.cs             | 17 ++++-------------
 BBWY.Client/ViewModels/MainViewModel.cs |  2 +-
 BBWY.Server.Model/Enums.cs              | 10 +---------
 4 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs
index 49e466fd..c69049d7 100644
--- a/BBWY.Client/GlobalContext.cs
+++ b/BBWY.Client/GlobalContext.cs
@@ -13,7 +13,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10142";
+            ClientVersion = "10143";
         }
 
         private User user;
diff --git a/BBWY.Client/Models/Enums.cs b/BBWY.Client/Models/Enums.cs
index 9f5f5dbc..f6925590 100644
--- a/BBWY.Client/Models/Enums.cs
+++ b/BBWY.Client/Models/Enums.cs
@@ -409,17 +409,12 @@
     /// <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>
+    /// <para>待验收 = 140</para>
+    /// <para>待核算 = 150</para>
     /// </summary>
     public enum PurchaseOrderState
     {
-        /*待付款 = 0, 待发货 = 1, 待收货 = 2, 待验收 = 3, 待打包 = 4, 待结算 = 5, 已完成 = 6, 已取消 = 7*/
         待付款 = 0,
         等待采购 = 1,
         部分采购 = 110,
@@ -428,13 +423,9 @@
         待收货 = 3,
         部分收货 = 130,
         已完成 = 4,
-        锁定 = 5,
         已取消 = 6,
-        暂停 = 7,
-        已退款 = 8,
-        Unknow = 100,
-        打包中 = 140,
-        待完结 = 150
+        待验收 = 140,
+        待核算 = 150
     }
 
 
diff --git a/BBWY.Client/ViewModels/MainViewModel.cs b/BBWY.Client/ViewModels/MainViewModel.cs
index 5f8615e2..d2d1fa57 100644
--- a/BBWY.Client/ViewModels/MainViewModel.cs
+++ b/BBWY.Client/ViewModels/MainViewModel.cs
@@ -175,7 +175,7 @@ namespace BBWY.Client.ViewModels
                         Name = "采购管理",
                         ChildList = new List<MenuModel>()
                     {
-                        new MenuModel(){ Name="采购列表",Url="/Views/BatchPurchase/BatchPurchaseOrderList.xaml" },
+                        //new MenuModel(){ Name="采购列表",Url="/Views/BatchPurchase/BatchPurchaseOrderList.xaml" },
                         new MenuModel(){ Name="采购列表(Web)",Url="/Views/Web/Web.xaml" }
                     }
                     });
diff --git a/BBWY.Server.Model/Enums.cs b/BBWY.Server.Model/Enums.cs
index a5221dc4..8acc29b2 100644
--- a/BBWY.Server.Model/Enums.cs
+++ b/BBWY.Server.Model/Enums.cs
@@ -322,17 +322,13 @@
         }
 
         /// <summary>
-        /// 采购单状态 
+        /// 订单状态 
         /// <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>
@@ -346,11 +342,7 @@
             待收货 = 3,
             部分收货 = 130,
             已完成 = 4,
-            锁定 = 5,
             已取消 = 6,
-            暂停 = 7,
-            已退款 = 8,
-            Unknow = 100,
             待验收 = 140,
             待核算 = 150
         }