diff --git a/BBWY.Client/App.xaml.cs b/BBWY.Client/App.xaml.cs
index 5cea52bc..2dca752c 100644
--- a/BBWY.Client/App.xaml.cs
+++ b/BBWY.Client/App.xaml.cs
@@ -47,13 +47,13 @@ namespace BBWY.Client
             string userToken = string.Empty;
 
 
-          
+
 #if DEBUG
             //仓库组测试
-           // userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjM1OTMyMDAyMjcwMDU2NDQ4IiwidGVhbUlkIjoiMTU0MDg4NTU3MDYyNzA0NzQyNCIsInNvblRlYW1JZHMiOiIxNTQwODg1NTcwNjI3MDQ3NDI0IiwiZXhwIjoxNzEwNDk2NTQ1fQ.Sx2vGJcYGf98x99slQLU3vt7yWdjspptSpbUCcZgWek";
+            // userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjM1OTMyMDAyMjcwMDU2NDQ4IiwidGVhbUlkIjoiMTU0MDg4NTU3MDYyNzA0NzQyNCIsInNvblRlYW1JZHMiOiIxNTQwODg1NTcwNjI3MDQ3NDI0IiwiZXhwIjoxNzEwNDk2NTQ1fQ.Sx2vGJcYGf98x99slQLU3vt7yWdjspptSpbUCcZgWek";
 
             //齐越山鸡
-             userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw";
+            userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw";
 
             //刷单组测试
             //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTcxODUyODE0OTAzMTUyNjQwIiwidGVhbUlkIjoiMTU3MTg1MjQ1MDI5NjUwMDIyNCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE2OTUxNDc2ODh9.hVupdHnhgHHGo3QrMSDqhINqtq6Q5_RovWyXjiMkkEs";
@@ -105,13 +105,13 @@ namespace BBWY.Client
 
             IServiceCollection serviceCollection = new ServiceCollection();
             serviceCollection.AddHttpClient();
-           // serviceCollection.AddTransient<CreatePackTaskViewModel>();
+            // serviceCollection.AddTransient<CreatePackTaskViewModel>();
             serviceCollection.AddHttpClient("gzip").ConfigurePrimaryHttpMessageHandler(handler => new HttpClientHandler()
             {
                 AutomaticDecompression = System.Net.DecompressionMethods.GZip
             });
 
-           
+
             serviceCollection.AddMemoryCache();
             serviceCollection.AddSingleton<RestApiService>();
             serviceCollection.AddSingleton(gl);
@@ -121,6 +121,7 @@ namespace BBWY.Client
             serviceCollection.AddTransient<_1688PreviewPurchaseViewModel>();
             serviceCollection.AddTransient<EditServiceOrderViewModel>();
 
+
             #region 注册拳探SDK相关类
             serviceCollection.AddSingleton<QuanTanProductClient>();
             #endregion
diff --git a/BBWY.Client/Models/Enums.cs b/BBWY.Client/Models/Enums.cs
index 50640ff2..fbe5ae82 100644
--- a/BBWY.Client/Models/Enums.cs
+++ b/BBWY.Client/Models/Enums.cs
@@ -371,4 +371,11 @@
         无 = 0, 非新 = 1, 新 = 2
     }
 
+    /// <summary>
+    /// 采购单状态 待付款 = 0, 待发货 = 1, 待收货 = 2, 待质检 = 3, 待打包 = 4, 待结算 = 5, 已完成 = 6, 已取消= 7
+    /// </summary>
+    public enum PurchaseOrderState
+    {
+        待付款 = 0, 待发货 = 1, 待收货 = 2, 待质检 = 3, 待打包 = 4, 待结算 = 5, 已完成 = 6, 已取消 = 7
+    }
 }
diff --git a/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseOrderListViewModel.cs b/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseOrderListViewModel.cs
new file mode 100644
index 00000000..d7b22ff7
--- /dev/null
+++ b/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseOrderListViewModel.cs
@@ -0,0 +1,85 @@
+using BBWY.Client.Models;
+using BBWY.Common.Models;
+using GalaSoft.MvvmLight.Command;
+using System;
+using System.Threading.Tasks;
+using System.Windows.Input;
+
+namespace BBWY.Client.ViewModels
+{
+    public class BatchPurchaseOrderListViewModel : BaseVM, IDenpendency
+    {
+        private GlobalContext globalContext;
+        private DateTime startDate;
+        private DateTime endDate;
+        private string searchPurchaseOrderId;
+        private string searchPurchaseName;
+        private string searchProductId;
+        private string searchSkuId;
+        private PurchaseOrderState? purchaseOrderState;
+        private int pageIndex;
+        private int pageSize;
+
+        public ICommand SearchPurchaseOrderCommand { get; set; }
+        public ICommand OpenCreateNewPurchaseOrderDialogCommand { get; set; }
+
+        public ICommand SetSearchDateCommand { get; set; }
+
+        public ICommand SetPurchaseOrderStateCommand { get; set; }
+
+
+        public DateTime StartDate { get => startDate; set { Set(ref startDate, value); } }
+        public DateTime EndDate { get => endDate; set { Set(ref endDate, value); } }
+        public string SearchPurchaseOrderId { get => searchPurchaseOrderId; set { Set(ref searchPurchaseOrderId, value); } }
+        public string SearchPurchaseName { get => searchPurchaseName; set { Set(ref searchPurchaseName, value); } }
+        public string SearchProductId { get => searchProductId; set { Set(ref searchProductId, value); } }
+        public string SearchSkuId { get => searchSkuId; set { Set(ref searchSkuId, value); } }
+        public PurchaseOrderState? PurchaseOrderState { get => purchaseOrderState; set { Set(ref purchaseOrderState, value); } }
+        public int PageIndex { get => pageIndex; set { Set(ref pageIndex, value); } }
+
+        public int PageSize { get => pageSize; set { Set(ref pageSize, value); } }
+
+        public BatchPurchaseOrderListViewModel(GlobalContext globalContext)
+        {
+            SetSearchDateCommand = new RelayCommand<int>(SetSearchDate);
+            SetPurchaseOrderStateCommand = new RelayCommand<PurchaseOrderState?>(SetPurchaseOrderState);
+            SearchPurchaseOrderCommand = new RelayCommand(InitQueryPurchaseOrder);
+            OpenCreateNewPurchaseOrderDialogCommand = new RelayCommand(OpenCreateNewPurchaseOrderDialog);
+            PageSize = 10;
+            this.globalContext = globalContext;
+            EndDate = DateTime.Now.Date;
+            StartDate = DateTime.Now.Date.AddDays(-15);
+            InitQueryPurchaseOrder();
+        }
+
+
+        private void InitQueryPurchaseOrder()
+        {
+            PageIndex = 1;
+            Task.Factory.StartNew(() => QueryPurchaseOrder(PageIndex));
+        }
+
+        private void SetPurchaseOrderState(PurchaseOrderState? purchaseOrderState)
+        { 
+            this.PurchaseOrderState = purchaseOrderState;
+            InitQueryPurchaseOrder();
+        }
+
+        private void SetSearchDate(int d)
+        {
+            EndDate = d == 1 ? DateTime.Now.Date.AddDays(-1) : DateTime.Now;
+            StartDate = DateTime.Now.Date.AddDays(d * -1);
+            InitQueryPurchaseOrder();
+        }
+
+        private void QueryPurchaseOrder(int pageIndex)
+        {
+
+        }
+
+        private void OpenCreateNewPurchaseOrderDialog()
+        { 
+            
+        }
+    }
+}
diff --git a/BBWY.Client/ViewModels/MainViewModel.cs b/BBWY.Client/ViewModels/MainViewModel.cs
index 1a7d75d8..239e06b3 100644
--- a/BBWY.Client/ViewModels/MainViewModel.cs
+++ b/BBWY.Client/ViewModels/MainViewModel.cs
@@ -164,6 +164,16 @@ namespace BBWY.Client.ViewModels
                     }
                     });
 
+                    MenuList.Add(new MenuModel()
+                    {
+                        Name = "采购管理",
+                        ChildList = new List<MenuModel>()
+                    {
+                        new MenuModel(){ Name="采购列表",Url="/Views/BatchPurchase/BatchPurchaseOrderList.xaml" }
+                        //new MenuModel(){ Name="采购账单",Url="/Views/ServiceOrder/ServiceOrderList.xaml" }
+                    }
+                    });
+
                     MenuList.Add(new MenuModel()
                     {
                         Name = "商品管理",
diff --git a/BBWY.Client/ViewModels/ViewModelLocator.cs b/BBWY.Client/ViewModels/ViewModelLocator.cs
index daf28eb1..00d7dcc5 100644
--- a/BBWY.Client/ViewModels/ViewModelLocator.cs
+++ b/BBWY.Client/ViewModels/ViewModelLocator.cs
@@ -238,5 +238,14 @@ namespace BBWY.Client.ViewModels
                 return s.ServiceProvider.GetRequiredService<EditServiceOrderViewModel>();
             }
         }
+
+        public BatchPurchaseOrderListViewModel BatchPurchaseOrderListVM
+        {
+            get
+            {
+                using var s = sp.CreateScope();
+                return s.ServiceProvider.GetRequiredService<BatchPurchaseOrderListViewModel>();
+            }
+        }
     }
 }
diff --git a/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml b/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml
new file mode 100644
index 00000000..51071d2c
--- /dev/null
+++ b/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml
@@ -0,0 +1,151 @@
+<Page x:Class="BBWY.Client.Views.BatchPurchase.BatchPurchaseOrderList"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
+      xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
+      xmlns:local="clr-namespace:BBWY.Client.Views.BatchPurchase"
+      mc:Ignorable="d"
+      xmlns:cmodel="clr-namespace:BBWY.Client.Models"
+      xmlns:sys="clr-namespace:System;assembly=mscorlib"
+      d:DesignHeight="1080" d:DesignWidth="1920"
+      Title="BatchPurchaseOrderList"
+      DataContext="{Binding BatchPurchaseOrderListVM,Source={StaticResource Locator}}">
+    <Page.Resources>
+        <sys:Int32 x:Key="d0">0</sys:Int32>
+        <sys:Int32 x:Key="d1">1</sys:Int32>
+        <sys:Int32 x:Key="d3">2</sys:Int32>
+        <sys:Int32 x:Key="d7">6</sys:Int32>
+        <sys:Int32 x:Key="d15">14</sys:Int32>
+        <sys:Int32 x:Key="d30">29</sys:Int32>
+    </Page.Resources>
+    <Grid>
+        <c:RoundWaitProgress Play="{Binding IsLoading}" Panel.ZIndex="999"/>
+
+        <Grid Margin="5,0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="auto"/>
+                <RowDefinition Height="5"/>
+                <RowDefinition Height="30"/>
+                <RowDefinition Height="5"/>
+                <RowDefinition Height="30"/>
+                <RowDefinition Height="5"/>
+                <RowDefinition Height="30"/>
+                <RowDefinition/>
+                <RowDefinition Height="30"/>
+            </Grid.RowDefinitions>
+
+            <Grid Background="{StaticResource Border.Background}" HorizontalAlignment="Left" Height="75" Panel.ZIndex="999">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition/>
+                    <ColumnDefinition Width="auto"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="5"/>
+                    <RowDefinition Height="0.5*"/>
+                </Grid.RowDefinitions>
+                <StackPanel Orientation="Horizontal" Margin="0,5,0,0" Height="30">
+                    <StackPanel.Resources>
+                        <Style TargetType="DatePickerTextBox">
+                            <Setter Property="IsReadOnly" Value="True"/>
+                        </Style>
+                    </StackPanel.Resources>
+                    <TextBlock Text="下单时间" VerticalAlignment="Center" Margin="5,0,0,0"/>
+                    <DatePicker SelectedDate="{Binding StartDate}" Width="133.5" Height="30" VerticalContentAlignment="Center" FocusVisualStyle="{x:Null}" Margin="5,0,0,0"/>
+                    <DatePicker SelectedDate="{Binding EndDate}" Width="133.5" Height="30" VerticalContentAlignment="Center" FocusVisualStyle="{x:Null}" Margin="5,0,0,0"/>
+                    <TextBlock Text="采购单" VerticalAlignment="Center" Margin="5,0,0,0"/>
+                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchPurchaseOrderId}" WaterRemark="精确匹配"/>
+                    <TextBlock Text="SPU" VerticalAlignment="Center" Margin="5,0,0,0"/>
+                    <c:BTextBox Width="150" Margin="5,0,0,0" WaterRemark="精确匹配" Text="{Binding SearchProductId}"/>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" Grid.Row="2" Margin="0,0,0,5" Height="30">
+                    <c:BButton Content="今天" Width="50" Height="25" Margin="5,0,0,0"
+                               Command="{Binding SetSearchDateCommand}"
+                               CommandParameter="{StaticResource d0}"/>
+                    <c:BButton Content="昨天" Width="50" Height="25" Margin="5,0,0,0"
+                               Command="{Binding SetSearchDateCommand}"
+                               CommandParameter="{StaticResource d1}"/>
+                    <c:BButton Content="近3天" Width="50" Height="25" Margin="5,0,0,0"
+                               Command="{Binding SetSearchDateCommand}"
+                               CommandParameter="{StaticResource d3}"/>
+                    <c:BButton Content="近7天" Width="50" Height="24" Margin="5,0,0,0"
+                               Command="{Binding SetSearchDateCommand}"
+                               CommandParameter="{StaticResource d7}"/>
+                    <c:BButton Content="近15天" Width="50" Height="25" Margin="5,0,0,0"
+                               Command="{Binding SetSearchDateCommand}"
+                               CommandParameter="{StaticResource d15}"/>
+                    <c:BButton Content="近30天" Width="50" Height="25" Margin="5,0,0,0"
+                               Command="{Binding SetSearchDateCommand}"
+                               CommandParameter="{StaticResource d30}"/>
+                    <TextBlock VerticalAlignment="Center" Margin="5,0,0,0" Text="采购商"/>
+                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchPurchaseName}" WaterRemark="精确匹配"/>
+                    <TextBlock Text="SKU" VerticalAlignment="Center" Margin="5,0,0,0"/>
+                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchSkuId}" WaterRemark="精确匹配"/>
+
+                    <c:BButton Content="同步" Width="50" Margin="5,0,0,0" Command="{Binding SyncOrderCommand}" ToolTipService.InitialShowDelay="0" ToolTipService.ShowDuration="10000"
+                               Visibility="Collapsed">
+                        <c:BButton.ToolTip>
+                            <StackPanel>
+                                <TextBlock Text="1.使用筛选条件中的开始时间和结束时间进行同步"/>
+                                <TextBlock Text="2.从开始时间起每次同步3小时时长的订单直到到达结束时间"/>
+                                <TextBlock Text="3.已存在未结束的同步任务将不会重复执行"/>
+                            </StackPanel>
+                        </c:BButton.ToolTip>
+                    </c:BButton>
+                </StackPanel>
+
+                <Grid Grid.Column="1" Grid.RowSpan="3">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <Button Content="搜索" Width="50" VerticalAlignment="Stretch" Margin="5,0,0,0" Command="{Binding SearchPurchaseOrderCommand}"
+                           Grid.RowSpan="2" Background="{StaticResource Button.Selected.Background}" BorderThickness="0" Foreground="White"/>
+                    <Button Content="导出" Command="{Binding ExportCommand}" Width="50" Grid.Column="1"
+                               Visibility="{Binding Visibility,ElementName=listbox_order}" Background="#1CC2A2" BorderThickness="0" Foreground="White"/>
+                    <!--<Button Content="同步" Command="{Binding SyncOrderCommand}" Width="50" Grid.Column="1" Grid.Row="1"
+                               Visibility="{Binding Visibility,ElementName=listbox_order}" Background="#02A7F0" BorderThickness="0" Foreground="White"/>-->
+                </Grid>
+            </Grid>
+
+            <StackPanel Grid.Row="2" HorizontalAlignment="Left" Orientation="Horizontal">
+                <c:BButton Content="新建采购单" Padding="10,0" Margin="0,0,10,0" Background="#2879FF"
+                           Command="{Binding OpenCreateNewPurchaseOrderDialogCommand}"/>
+                <c:BButton Content="全部" Width="100" Margin="5,0,0,0"
+                           Background="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=#null:#8080FF:#F2F2F2}"
+                           Foreground="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=#null:White:#4A4A4A}"
+                           Command="{Binding SetPurchaseOrderStateCommand}" CommandParameter="{x:Null}"/>
+                <c:BButton Content="待付款" Width="100" 
+                           Background="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=待付款:#8080FF:#F2F2F2}"
+                           Foreground="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=待付款:White:#4A4A4A}"
+                           Command="{Binding SetPurchaseOrderStateCommand}" CommandParameter="{x:Static cmodel:PurchaseOrderState.待付款}"/>
+                <c:BButton Content="待发货" Width="100" 
+                           Background="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=待发货:#8080FF:#F2F2F2}"
+                           Foreground="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=待发货:White:#4A4A4A}"
+                           Command="{Binding SetPurchaseOrderStateCommand}" CommandParameter="{x:Static cmodel:PurchaseOrderState.待发货}"/>
+                <c:BButton Content="待收货" Width="100" 
+                           Background="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=待收货:#8080FF:#F2F2F2}"
+                           Foreground="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=待收货:White:#4A4A4A}"
+                           Command="{Binding SetPurchaseOrderStateCommand}" CommandParameter="{x:Static cmodel:PurchaseOrderState.待收货}"/>
+                <c:BButton Content="待质检" Width="100" 
+                           Background="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=待质检:#8080FF:#F2F2F2}"
+                           Foreground="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=待质检:White:#4A4A4A}"
+                           Command="{Binding SetPurchaseOrderStateCommand}" CommandParameter="{x:Static cmodel:PurchaseOrderState.待质检}"/>
+                <c:BButton Content="待打包" Width="100" 
+                           Background="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=待打包:#8080FF:#F2F2F2}"
+                           Foreground="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=待打包:White:#4A4A4A}"
+                           Command="{Binding SetPurchaseOrderStateCommand}" CommandParameter="{x:Static cmodel:PurchaseOrderState.待打包}"/>
+                <c:BButton Content="待结算" Width="100" 
+                           Background="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=待结算:#8080FF:#F2F2F2}"
+                           Foreground="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=待结算:White:#4A4A4A}"
+                           Command="{Binding SetPurchaseOrderStateCommand}" CommandParameter="{x:Static cmodel:PurchaseOrderState.待结算}"/>
+                <c:BButton Content="已完成" Width="100" 
+                           Background="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=已完成:#8080FF:#F2F2F2}"
+                           Foreground="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=已完成:White:#4A4A4A}"
+                           Command="{Binding SetPurchaseOrderStateCommand}" CommandParameter="{x:Static cmodel:PurchaseOrderState.已完成}"/>
+            </StackPanel>
+        </Grid>
+    </Grid>
+</Page>
diff --git a/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml.cs b/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml.cs
new file mode 100644
index 00000000..e7be8d60
--- /dev/null
+++ b/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BBWY.Client.Views.BatchPurchase
+{
+    /// <summary>
+    /// BatchPurchaseOrderList.xaml 的交互逻辑
+    /// </summary>
+    public partial class BatchPurchaseOrderList : Page
+    {
+        public BatchPurchaseOrderList()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BBWY.Server.Business/ServiceOrder/ServiceOrderBusiness.cs b/BBWY.Server.Business/ServiceOrder/ServiceOrderBusiness.cs
index 8c6e3878..50a40375 100644
--- a/BBWY.Server.Business/ServiceOrder/ServiceOrderBusiness.cs
+++ b/BBWY.Server.Business/ServiceOrder/ServiceOrderBusiness.cs
@@ -17,6 +17,8 @@ namespace BBWY.Server.Business
 
         public ServiceOrderResponse GetList(ClientQueryServiceOrderRequest request)
         {
+            if (request.EndDate != null)
+                request.EndDate = request.EndDate.Value.Date.AddDays(1).AddSeconds(-1);
             var list = fsql.Select<ServiceOrder, Order, OrderSku>()
                                                             .InnerJoin((s, o, osku) => s.OrderId == o.Id)
                                                             .InnerJoin((s, o, osku) => s.OrderId == osku.OrderId && s.SkuId == osku.SkuId)
diff --git a/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderV2.cs b/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderV2.cs
index c6004f8c..7b77a78d 100644
--- a/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderV2.cs
+++ b/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderV2.cs
@@ -111,8 +111,8 @@ namespace BBWY.Server.Model.Db
         /// <summary>
         /// 采购单状态(待付款=0,待发货=1,待收货=2,待质检=3,待打包=4,待结算=5,已完成=6)
         /// </summary>
-
-        public int? OrderState { get; set; }
+        [Column(MapType = typeof(int?))]
+        public Enums.PurchaseOrderState? OrderState { get; set; }
 
         /// <summary>
         /// 支付时间
diff --git a/BBWY.Server.Model/Enums.cs b/BBWY.Server.Model/Enums.cs
index 33278d19..35b8cf42 100644
--- a/BBWY.Server.Model/Enums.cs
+++ b/BBWY.Server.Model/Enums.cs
@@ -311,5 +311,13 @@
         {
             无 = 0, 非新 = 1, 新 = 2
         }
+
+        /// <summary>
+        /// 采购单状态 待付款 = 0, 待发货 = 1, 待收货 = 2, 待质检 = 3, 待打包 = 4, 待结算 = 5, 已完成 = 6, 已取消= 7
+        /// </summary>
+        public enum PurchaseOrderState
+        {
+            待付款 = 0, 待发货 = 1, 待收货 = 2, 待质检 = 3, 待打包 = 4, 待结算 = 5, 已完成 = 6, 已取消 = 7
+        }
     }
 }
diff --git a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411235916.pdma.json b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023412003649.pdma.json
similarity index 98%
rename from doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411235916.pdma.json
rename to doc/.back_步步为盈数据库/步步为盈数据库-backup-2023412003649.pdma.json
index 0f20e94b..9357debb 100644
--- a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411235916.pdma.json
+++ b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023412003649.pdma.json
@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.5.1",
   "createdTime": "2022-10-3 12:39:39",
-  "updatedTime": "2023-4-11 23:59:14",
+  "updatedTime": "2023-4-11 23:59:48",
   "dbConns": [],
   "profile": {
     "default": {
@@ -1339,16 +1339,7 @@
           "hideInGraph": true
         }
       ],
-      "correlations": [
-        {
-          "myField": "8BF0615B-95E0-4B44-A1C3-85FFCFB498E3",
-          "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
-          "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        }
-      ]
+      "correlations": []
     },
     {
       "id": "30E9507B-707C-4BCF-99F2-104066BCC3F9",
@@ -1844,24 +1835,7 @@
           "hideInGraph": true
         }
       ],
-      "correlations": [
-        {
-          "myField": "DEFBFE32-2FF7-41E5-A871-2978539AD6A7",
-          "refEntity": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95",
-          "refField": "3F567BD5-256D-4843-ADDF-0805BE706112",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        },
-        {
-          "myField": "88311B02-719F-45ED-9603-84EEA4F6F802",
-          "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
-          "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        }
-      ]
+      "correlations": []
     },
     {
       "id": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
@@ -2863,16 +2837,7 @@
           "hideInGraph": true
         }
       ],
-      "correlations": [
-        {
-          "myField": "672717A5-A65E-4A6C-9F10-C4689C92FD45",
-          "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
-          "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        }
-      ]
+      "correlations": []
     },
     {
       "id": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E",
@@ -3300,16 +3265,7 @@
           "hideInGraph": true
         }
       ],
-      "correlations": [
-        {
-          "myField": "E3ECBB1B-D2F3-45AE-AD54-FB0A6886635E",
-          "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
-          "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        }
-      ]
+      "correlations": []
     },
     {
       "id": "379D48BE-3522-413B-8FA3-752D65ADB597",
@@ -3791,24 +3747,7 @@
           "hideInGraph": true
         }
       ],
-      "correlations": [
-        {
-          "myField": "65A1A6ED-EF2C-4369-8CCB-B6E762EEF9D0",
-          "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
-          "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        },
-        {
-          "myField": "E85EE812-0F49-49B3-8FBD-E6435CF08CDA",
-          "refEntity": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95",
-          "refField": "B503CFCF-19DA-4D5B-9416-C3DD65E477CD",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        }
-      ]
+      "correlations": []
     },
     {
       "id": "D2D83A3F-F985-44C0-9E6B-057FE01F7FD1",
@@ -4064,16 +4003,7 @@
           "hideInGraph": true
         }
       ],
-      "correlations": [
-        {
-          "myField": "3D2A0846-F961-4CC6-82DD-AC9D778700AF",
-          "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
-          "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        }
-      ]
+      "correlations": []
     },
     {
       "id": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A",
@@ -4465,32 +4395,7 @@
           "hideInGraph": true
         }
       ],
-      "correlations": [
-        {
-          "myField": "C2FE946F-02B4-4B24-9AA4-433A6E98F7A9",
-          "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
-          "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        },
-        {
-          "myField": "EDBAA4E6-1F5F-4FF4-B467-B02ED749BCD9",
-          "refEntity": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE",
-          "refField": "1012CEB5-702E-428F-ABEF-17BD9856E4E3",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        },
-        {
-          "myField": "93852E9B-AD50-40B6-A131-B62EFFE3438C",
-          "refEntity": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95",
-          "refField": "3F567BD5-256D-4843-ADDF-0805BE706112",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        }
-      ]
+      "correlations": []
     },
     {
       "id": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74",
@@ -4862,16 +4767,7 @@
           "hideInGraph": true
         }
       ],
-      "correlations": [
-        {
-          "myField": "BD4C9D08-9D6C-4878-A539-BE15AC2420E3",
-          "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
-          "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        }
-      ]
+      "correlations": []
     },
     {
       "id": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213",
@@ -5720,16 +5616,7 @@
           "hideInGraph": true
         }
       ],
-      "correlations": [
-        {
-          "myField": "9A555E08-6CC2-4A7C-8967-888F2B46CBFE",
-          "refEntity": "6036D7E4-7ECB-4888-9D74-58DA414447F8",
-          "refField": "0EE3108C-0995-4D82-AA03-FF63F0D62626",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        }
-      ]
+      "correlations": []
     },
     {
       "id": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE",
@@ -7292,16 +7179,7 @@
           "hideInGraph": true
         }
       ],
-      "correlations": [
-        {
-          "myField": "5FD032F5-CF4B-4308-BB7C-2B1F6FD7774E",
-          "refEntity": "5F14586C-79ED-49B2-AA36-01DCC2D5B3FE",
-          "refField": "6F03B0D9-DECD-45A0-B0F5-1921289472EF",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        }
-      ]
+      "correlations": []
     },
     {
       "id": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A",
@@ -7559,16 +7437,7 @@
           "hideInGraph": true
         }
       ],
-      "correlations": [
-        {
-          "myField": "98F8F005-A630-4C98-8C1F-ECCA64E65996",
-          "refEntity": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32",
-          "refField": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        }
-      ]
+      "correlations": []
     },
     {
       "id": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2",
@@ -7843,24 +7712,7 @@
           "hideInGraph": true
         }
       ],
-      "correlations": [
-        {
-          "myField": "61C58DEB-2779-451F-82AD-3B03BC9C795D",
-          "refEntity": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32",
-          "refField": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        },
-        {
-          "myField": "4C09B365-4B2A-4613-9133-DF0421BFC85C",
-          "refEntity": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A",
-          "refField": "41BFEC37-8F13-42D0-B8ED-123071447D18",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        }
-      ]
+      "correlations": []
     },
     {
       "id": "65A6F4A2-D006-4FC7-BED7-53209273F05E",
@@ -8406,16 +8258,7 @@
           "id": "FB5BB057-8F3E-4F68-91CF-7E2923C489F9"
         }
       ],
-      "correlations": [
-        {
-          "myField": "A3C3A9A6-05BF-4514-9789-15C5732F7241",
-          "refEntity": "C70CFE85-2B7B-4409-B60C-0B9D1494C022",
-          "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        }
-      ],
+      "correlations": [],
       "indexes": []
     },
     {
@@ -9146,24 +8989,7 @@
           "id": "07FFE4B1-4275-4407-832A-1F2193E3DA37"
         }
       ],
-      "correlations": [
-        {
-          "myField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
-          "refEntity": "C70CFE85-2B7B-4409-B60C-0B9D1494C022",
-          "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        },
-        {
-          "myField": "16E62919-C979-4830-930A-EAE234252B2F",
-          "refEntity": "91555D00-CE97-4666-94BA-E83996533E52",
-          "refField": "81703BD3-514F-4E8E-8898-54FDBFF90D7A",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        }
-      ],
+      "correlations": [],
       "indexes": []
     },
     {
@@ -9911,32 +9737,7 @@
           "id": "07FFE4B1-4275-4407-832A-1F2193E3DA37"
         }
       ],
-      "correlations": [
-        {
-          "myField": "5F519CD5-5B0E-4C18-99AD-CD24BADE9ED3",
-          "refEntity": "91555D00-CE97-4666-94BA-E83996533E52",
-          "refField": "ED33CB09-DBB2-4FD6-B3E9-BEE77BD14B63",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        },
-        {
-          "myField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
-          "refEntity": "C70CFE85-2B7B-4409-B60C-0B9D1494C022",
-          "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        },
-        {
-          "myField": "58444AC3-3BDE-408A-BE47-3C063EC54731",
-          "refEntity": "28A57F78-5B0C-4F38-B3D8-CAE9A0950386",
-          "refField": "16E62919-C979-4830-930A-EAE234252B2F",
-          "myRows": "1",
-          "refRows": "n",
-          "innerType": ""
-        }
-      ],
+      "correlations": [],
       "indexes": []
     },
     {
@@ -11059,8 +10860,8 @@
           "id": "4318BD45-E948-4B1C-BBE7-8F1D5CE8BD62"
         },
         {
-          "defKey": "PurchaseMode",
-          "defName": "采购模式(代发=0,批发=1)",
+          "defKey": "PurchaseOrderMode",
+          "defName": "采购模式(批发=0,代发=1)",
           "comment": "",
           "type": "INT",
           "len": "",
diff --git a/doc/步步为盈数据库.pdma.json b/doc/步步为盈数据库.pdma.json
index 9357debb..ad570ba4 100644
--- a/doc/步步为盈数据库.pdma.json
+++ b/doc/步步为盈数据库.pdma.json
@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.5.1",
   "createdTime": "2022-10-3 12:39:39",
-  "updatedTime": "2023-4-11 23:59:48",
+  "updatedTime": "2023-4-12 00:36:49",
   "dbConns": [],
   "profile": {
     "default": {