diff --git a/BBWY.Client/APIServices/OrderService.cs b/BBWY.Client/APIServices/OrderService.cs
index 7f26c15a..67e0c489 100644
--- a/BBWY.Client/APIServices/OrderService.cs
+++ b/BBWY.Client/APIServices/OrderService.cs
@@ -48,6 +48,16 @@ namespace BBWY.Client.APIServices
             }, null, HttpMethod.Post);
         }
 
+        /// <summary>
+        /// 获取订单详情
+        /// </summary>
+        /// <param name="orderId"></param>
+        /// <returns></returns>
+        public ApiResponse<OrderResponse> GetOrderById(string orderId)
+        {
+            return SendRequest<OrderResponse>(globalContext.BBYWApiHost, $"api/order/GetOrderById/{orderId}", null, null, HttpMethod.Get);
+        }
+
         /// <summary>
         /// 解密收货人信息
         /// </summary>
@@ -167,5 +177,26 @@ namespace BBWY.Client.APIServices
         {
             return SendRequest<object>(globalContext.BBYWApiHost, "/Api/Order/SyncOrderByDate", new { shopId, startTime, endTime }, null, HttpMethod.Post);
         }
+
+        /// <summary>
+        /// 修改商家备注
+        /// </summary>
+        /// <param name="orderId"></param>
+        /// <param name="venderRemark"></param>
+        /// <param name="flag"></param>
+        /// <returns></returns>
+        public ApiResponse<object> EditVenderRemark(string orderId, string venderRemark, string flag)
+        {
+            return SendRequest<object>(globalContext.BBYWApiHost, "api/order/EditVenderRemark", new
+            {
+                orderId,
+                venderRemark,
+                flag,
+                globalContext.User.Shop.Platform,
+                globalContext.User.Shop.AppKey,
+                globalContext.User.Shop.AppSecret,
+                globalContext.User.Shop.AppToken
+            }, null, HttpMethod.Post);
+        }
     }
 }
diff --git a/BBWY.Client/Models/Order/Order.cs b/BBWY.Client/Models/Order/Order.cs
index 0c09ee2c..8d60a0ac 100644
--- a/BBWY.Client/Models/Order/Order.cs
+++ b/BBWY.Client/Models/Order/Order.cs
@@ -14,6 +14,8 @@ namespace BBWY.Client.Models
         private StorageType? storageType;
         private OrderState orderState;
         private string waybillNo;
+        private string venderRemark;
+        private string flag;
 
         public string Id { get; set; }
 
@@ -88,11 +90,6 @@ namespace BBWY.Client.Models
         /// </summary>
         public string BuyerRemark { get; set; }
 
-        /// <summary>
-        /// 商家备注
-        /// </summary>
-        public string VenderRemark { get; set; }
-
         /// <summary>
         /// 采购备注
         /// </summary>
@@ -116,14 +113,26 @@ namespace BBWY.Client.Models
         public string StoreName { get; set; }
 
         /// <summary>
-        /// 订单旗帜
+        /// 刷单类型
         /// </summary>
-        public string Flag { get; set; }
+        public SDType? SDType { get; set; }
 
         /// <summary>
-        /// 刷单类型
+        /// 订单状态
         /// </summary>
-        public SDType? SDType { get; set; }
+        public OrderState OrderState { get => orderState; set { Set(ref orderState, value); } }
+
+        public string WaybillNo { get => waybillNo; set { Set(ref waybillNo, value); } }
+
+        /// <summary>
+        /// 商家备注
+        /// </summary>
+        public string VenderRemark { get => venderRemark; set { Set(ref venderRemark, value); } }
+
+        /// <summary>
+        /// 订单旗帜
+        /// </summary>
+        public string Flag { get => flag; set { Set(ref flag, value); } }
 
         /// <summary>
         /// 收货人信息
@@ -157,13 +166,6 @@ namespace BBWY.Client.Models
         /// </summary>
         public OrderDropShipping OrderDropShipping { get; set; }
 
-        /// <summary>
-        /// 订单状态
-        /// </summary>
-        public OrderState OrderState { get => orderState; set { Set(ref orderState, value); } }
-
-        public string WaybillNo { get => waybillNo; set { Set(ref waybillNo, value); } }
-
         public void ConvertOrderCostDetailToGroup()
         {
             if (OrderCostDetailList == null || OrderCostDetailList.Count() == 0)
diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
index 94f949d0..ec3dea38 100644
--- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
+++ b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
@@ -94,6 +94,8 @@ namespace BBWY.Client.ViewModels
 
         public ICommand OutStockCommand { get; set; }
 
+        public ICommand EditVenderRemarkCommand { get; set; }
+
         public OrderListViewModel(OrderService orderService, StatisticsService statisticsService, GlobalContext globalContext, ChoosePurchaseSchemeViewModel choosePurchaseSchemeViewModel)
         {
             random = new Random();
@@ -145,6 +147,7 @@ namespace BBWY.Client.ViewModels
             ChooseStorageTypeCommand = new RelayCommand<object>(ChooseStorageType);
             EditCostCommand = new RelayCommand<Order>(EditCost);
             OutStockCommand = new RelayCommand<Order>((o) => OutStock(o));
+            EditVenderRemarkCommand = new RelayCommand<Order>(EditVenderRemark);
             SearchOrderCommand.Execute(null);
         }
 
@@ -253,7 +256,7 @@ namespace BBWY.Client.ViewModels
             }
             else if (storageType == StorageType.SD)
             {
-                var sd = new SD(orderId, true);
+                var sd = new SD(orderId, true, order.VenderRemark, order.Flag);
                 sd.Closed += Sd_Closed;
                 sd.ShowDialog();
             }
@@ -362,7 +365,7 @@ namespace BBWY.Client.ViewModels
             }
             else if (order.StorageType == StorageType.SD)
             {
-                var sd = new SD(order.Id, false);
+                var sd = new SD(order.Id, false, order.VenderRemark, order.Flag);
                 sd.Closed += Sd_Closed;
                 sd.ShowDialog();
             }
@@ -487,5 +490,41 @@ namespace BBWY.Client.ViewModels
                     App.Current.Dispatcher.Invoke(() => MessageBox.Show(response.Msg, "同步订单"));
             });
         }
+
+        private void EditVenderRemark(Order order)
+        {
+            var editWindow = new EditVenderRemark(order.Id, order.VenderRemark, order.Flag);
+            editWindow.Closed += EditVenderRemarkWindow_Closed;
+            editWindow.ShowDialog();
+        }
+
+        private void EditVenderRemarkWindow_Closed(object sender, EventArgs e)
+        {
+            var editWindow = sender as EditVenderRemark;
+            if (editWindow.DialogResult != true)
+                return;
+
+            var orderId = editWindow.OrderId;
+            var order = OrderList.FirstOrDefault(o => o.Id == orderId);
+            if (order == null)
+                return;
+            var venderRemark = editWindow.VenderRemark;
+            var flag = editWindow.Flag;
+
+            IsLoading = true;
+            Task.Factory.StartNew(() => orderService.EditVenderRemark(orderId, venderRemark, flag)).ContinueWith(r =>
+            {
+                IsLoading = false;
+                var response = r.Result;
+                if (!response.Success)
+                {
+                    App.Current.Dispatcher.Invoke(() => MessageBox.Show(response.Msg, "修改商家备注"));
+                    return;
+                }
+
+                order.VenderRemark = venderRemark;
+                order.Flag = flag;
+            });
+        }
     }
 }
diff --git a/BBWY.Client/Views/Order/EditVenderRemark.xaml b/BBWY.Client/Views/Order/EditVenderRemark.xaml
new file mode 100644
index 00000000..be7d435a
--- /dev/null
+++ b/BBWY.Client/Views/Order/EditVenderRemark.xaml
@@ -0,0 +1,51 @@
+<c:BWindow x:Class="BBWY.Client.Views.Order.EditVenderRemark"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:BBWY.Client.Views.Order"
+        mc:Ignorable="d"
+        xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
+        Title="EditVenderRemark" Height="160" Width="300">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="30"/>
+            <RowDefinition/>
+            <RowDefinition Height="40"/>
+        </Grid.RowDefinitions>
+        <Border BorderThickness="0,0,0,1" BorderBrush="{StaticResource MainMenu.BorderBrush}"
+                Background="{StaticResource Border.Background}">
+            <TextBlock Text="修改商家备注" Style="{StaticResource middleTextBlock}"/>
+        </Border>
+
+        <Grid Grid.Row="1" Margin="0,5">
+            <Grid.RowDefinitions>
+                <RowDefinition/>
+                <RowDefinition/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="100"/>
+                <ColumnDefinition/>
+            </Grid.ColumnDefinitions>
+
+            <TextBlock Text="标签" HorizontalAlignment="Right" VerticalAlignment="Center"/>
+            <ComboBox x:Name="cbx_flag" Grid.Column="1" Height="25" Width="100"  
+                      HorizontalAlignment="Left" VerticalAlignment="Center" VerticalContentAlignment="Center" Margin="5,0,0,0"
+                      SelectedIndex="0" FocusVisualStyle="{x:Null}">
+                <ComboBox.ItemTemplate>
+                    <DataTemplate>
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock Text="{Binding Key}"/>
+                            <Border Height="10" Width="40" Background="{Binding Value}" Margin="5,0,0,0"/>
+                        </StackPanel>
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>
+            <TextBlock Text="商家备注" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="1"/>
+            <c:BTextBox x:Name="txtVenderRemark" Grid.Column="1" Grid.Row="1" Height="25" Width="150" HorizontalAlignment="Left" Margin="5,0,0,0"/>
+        </Grid>
+        
+        <c:BButton x:Name="btn_Save" Content="保存" Grid.Row="2" Width="60" HorizontalAlignment="Right" Margin="0,0,8,0"
+                   Click="btn_Save_Click"/>
+    </Grid>
+</c:BWindow>
diff --git a/BBWY.Client/Views/Order/EditVenderRemark.xaml.cs b/BBWY.Client/Views/Order/EditVenderRemark.xaml.cs
new file mode 100644
index 00000000..3e2f2f0e
--- /dev/null
+++ b/BBWY.Client/Views/Order/EditVenderRemark.xaml.cs
@@ -0,0 +1,70 @@
+using BBWY.Client.Models;
+using BBWY.Controls;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+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.Shapes;
+
+namespace BBWY.Client.Views.Order
+{
+    /// <summary>
+    /// EditVenderRemark.xaml 的交互逻辑
+    /// </summary>
+    public partial class EditVenderRemark : BWindow
+    {
+        public string OrderId { get; private set; }
+
+        public string Flag { get; private set; }
+
+        public string VenderRemark { get; private set; }
+
+        public EditVenderRemark(string orderId, string venderRemark, string flag)
+        {
+            InitializeComponent();
+
+            this.OrderId = orderId;
+            this.VenderRemark = venderRemark;
+            this.Flag = flag;
+            this.Loaded += EditVenderRemark_Loaded;
+        }
+
+        private void EditVenderRemark_Loaded(object sender, RoutedEventArgs e)
+        {
+            txtVenderRemark.Text = VenderRemark;
+            var flagList = new List<KVModel>()
+            {
+                new KVModel() {Key="灰色",Value="Gray"},
+                new KVModel() {Key="红色",Value="Red"},
+                new KVModel() {Key="黄色",Value="Yellow"},
+                new KVModel() {Key="绿色",Value="Green"},
+                new KVModel() {Key="蓝色",Value="Blue"},
+                new KVModel() {Key="紫色",Value="Purple"}
+            };
+            cbx_flag.ItemsSource = flagList;
+            if (!string.IsNullOrEmpty(Flag))
+                cbx_flag.SelectedItem = flagList.FirstOrDefault(kv => kv.Value == Flag) ?? flagList[0];
+        }
+
+        private void btn_Save_Click(object sender, RoutedEventArgs e)
+        {
+            if (string.IsNullOrEmpty(txtVenderRemark.Text))
+            {
+                MessageBox.Show("商家备注必填", "提示");
+                return;
+            }
+
+            this.Flag = (cbx_flag.SelectedItem as KVModel).Value;
+            this.VenderRemark = txtVenderRemark.Text;
+            this.DialogResult = true;
+            this.Close();
+        }
+    }
+}
diff --git a/BBWY.Client/Views/Order/OrderList.xaml b/BBWY.Client/Views/Order/OrderList.xaml
index 4cba81c1..4a47e75d 100644
--- a/BBWY.Client/Views/Order/OrderList.xaml
+++ b/BBWY.Client/Views/Order/OrderList.xaml
@@ -717,7 +717,9 @@
                                             <c:BButton x:Name="btn_copyVenderRemark" Content="复制" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
                                                        Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
                                                        CommandParameter="{Binding VenderRemark}"/>
-                                            <c:BButton Content="修改" Style="{StaticResource LinkButton}" Margin="5,0,0,0"/>
+                                            <c:BButton Content="修改" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
+                                                       Command="{Binding DataContext.EditVenderRemarkCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
+                                                       CommandParameter="{Binding }"/>
                                         </StackPanel>
                                         <StackPanel Orientation="Horizontal">
                                             <Path x:Name="path_flag" Style="{StaticResource path_flag}" Width="16"
diff --git a/BBWY.Client/Views/Order/SD.xaml.cs b/BBWY.Client/Views/Order/SD.xaml.cs
index 252dda1e..c1d08f2b 100644
--- a/BBWY.Client/Views/Order/SD.xaml.cs
+++ b/BBWY.Client/Views/Order/SD.xaml.cs
@@ -1,6 +1,7 @@
 using BBWY.Client.Models;
 using BBWY.Controls;
 using System.Collections.Generic;
+using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 
@@ -25,16 +26,19 @@ namespace BBWY.Client.Views.Order
 
         public string VenderRemark { get; private set; }
 
-        public SD(string orderId, bool isSetStorageType)
+        public SD(string orderId, bool isSetStorageType, string venderRemark, string flag)
         {
             InitializeComponent();
             this.OrderId = orderId;
             this.IsSetStorageType = isSetStorageType;
+            this.VenderRemark = venderRemark;
+            this.Flag = flag;
 
         }
         private void BWindow_Loaded(object sender, RoutedEventArgs e)
         {
-            cbx_flag.ItemsSource = new List<KVModel>()
+            txtVenderRemark.Text = VenderRemark;
+            var flagList = new List<KVModel>()
             {
                 new KVModel() {Key="灰色",Value="Gray"},
                 new KVModel() {Key="红色",Value="Red"},
@@ -43,10 +47,18 @@ namespace BBWY.Client.Views.Order
                 new KVModel() {Key="蓝色",Value="Blue"},
                 new KVModel() {Key="紫色",Value="Purple"}
             };
+            cbx_flag.ItemsSource = flagList;
+            if (!string.IsNullOrEmpty(Flag))
+                cbx_flag.SelectedItem = flagList.FirstOrDefault(kv => kv.Value == Flag) ?? flagList[0];
         }
 
         private void btn_Save_Click(object sender, RoutedEventArgs e)
         {
+            if (string.IsNullOrEmpty(txtVenderRemark.Text))
+            {
+                MessageBox.Show("商家备注必填", "提示");
+                return;
+            }
             decimal.TryParse(txtSDCommissionAmount.Text, out decimal sdCommissionAmountd);
             decimal.TryParse(txtDeliveryExpressFreight.Text, out decimal deliveryExpressFreight);
             SDCommissionAmount = sdCommissionAmountd;