添加打包推荐人

BBWY.Client/GlobalContext.cs

@@ -9,7 +9,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10121";
+            ClientVersion = "10122";
         }
 
         private User user;

BBWY.Client/Models/APIModel/Response/PackTask/PackServiceResponse.cs

@@ -57,6 +57,11 @@ namespace BBWY.Client.Models.APIModel.Response.PackTask
         /// 增量配件数量
         /// </summary>
         public int? IncrementPartCount { get; set; }
+
+        /// <summary>
+        /// 推荐打包人(skuid)
+        /// </summary>
+        public string SuggestPackUserName { get; set; }
     }
 
     public class PackServiceDTO

BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs

@@ -35,6 +35,14 @@ namespace BBWY.Client.ViewModels.PackTask
     public class PackServiceViewModel : BaseVM, IDenpendency
     {
 
+
+
+        private string suggestPackUserName;
+        /// <summary>
+        /// 打包人
+        /// </summary>
+        public string SuggestPackUserName { get => suggestPackUserName; set { Set(ref suggestPackUserName, value); } }
+
         private int? floorDragNumber;
         public int? FloorDragNumber { get => floorDragNumber; set { Set(ref floorDragNumber, value); } }
 
@@ -182,9 +190,6 @@ namespace BBWY.Client.ViewModels.PackTask
 
         public void InitPrintList()
         {
-
-
-
             TaskImage = MyPrintHelper.GetBarcodeImage(TaskId.ToString(), 300, 60);
 
             BarcodeImage = MyPrintHelper.GetBarcodeImage(SkuId, 300, 60);
@@ -290,6 +295,7 @@ namespace BBWY.Client.ViewModels.PackTask
 
                 if (res.Success)
                 {
+                    SuggestPackUserName = res.Data.SuggestPackUserName;
                     IncrementPartCount = res.Data.IncrementPartCount == null ? 0 : res.Data.IncrementPartCount.Value;
 
                     if (res.Data != null && res.Data.IncrementItemList.Count() > 0)
@@ -319,7 +325,7 @@ namespace BBWY.Client.ViewModels.PackTask
                                     BasicPackServiceList.Add(packService);
                                     if (packService.Name != "贴条码")
                                         PackServiceList.Add(packService);//加载工序服务列表
-                                  
+
                                 });
                         }
                     }
@@ -589,8 +595,8 @@ namespace BBWY.Client.ViewModels.PackTask
             if (disIncrementProcessList == null) return;
 
 
-            if (disBasicPackProcessList.Select(d=>d.ItemName).Distinct().Count()==1&& disBasicPackProcessList.Select(d => d.ItemName).Contains("贴条码")
-                && disIncrementProcessList.Count>0)
+            if (disBasicPackProcessList.Select(d => d.ItemName).Distinct().Count() == 1 && disBasicPackProcessList.Select(d => d.ItemName).Contains("贴条码")
+                && disIncrementProcessList.Count > 0)
             {
                 System.Windows.MessageBox.Show("只有一道贴码工序,无法添加增值包装工序");
                 return;
@@ -609,14 +615,25 @@ namespace BBWY.Client.ViewModels.PackTask
             packTaskDetail.ConsumableList = disConsumableServiceList;
 
             var res = packDetailService.SetPackTaskDetail(packTaskDetail);
-            if (res != null && res.Success)
+
+            if (res==null)
+            {
+                System.Windows.MessageBox.Show("网络异常!");
+                return;
+            }
+            if (!res.Success)
             {
+                System.Windows.MessageBox.Show(res.Msg);
+                return;
+            }
+
+          
                 // new TipsWindow("上传成功!").Show();
                 var win = obj as System.Windows.Window;
                 if (SetAllFees != null)
                     SetAllFees();
                 win.Close();
-            }
+            
         }
         /// <summary>
         /// 更新 打包员 和费用数据

BBWY.Client/Views/PackTask/ServiceWindow.xaml

@@ -70,19 +70,26 @@
 
             </Grid.Resources>
             <Grid.RowDefinitions>
-                <RowDefinition Height="40"/>
+                <RowDefinition Height="80"/>
                 <RowDefinition/>
                 <RowDefinition Height="40"/>
             </Grid.RowDefinitions>
-            <StackPanel Orientation="Horizontal">
-                <TextBlock Text="定向收费:"   HorizontalAlignment="Left" Margin="19 0 0 0" VerticalAlignment="Center"/>
-                <c:BTextBox Text="{Binding DirectionalFees,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  Width="100"/>
+            <StackPanel Orientation="Vertical">
+                <StackPanel Orientation="Horizontal" Margin="0 5 0 0">
+                    <TextBlock Text="定向收费:"   HorizontalAlignment="Left" Margin="19 0 0 0" VerticalAlignment="Center"/>
+                    <c:BTextBox Text="{Binding DirectionalFees,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  Width="100"/>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" Height="40" Margin="0 5 0 0">
+                    <TextBlock Text="推荐打包人: "   HorizontalAlignment="Left" Margin="19 0 0 0" VerticalAlignment="Center"/>
+                    <TextBlock Text="{Binding SuggestPackUserName}" Foreground="Red"  HorizontalAlignment="Left" Margin="0 0 0 0" VerticalAlignment="Center"/>
+                </StackPanel>
             </StackPanel>
+            
 
-            <ScrollViewer x:Name="scrolls" Grid.Row="1" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Disabled" Height="640">
+            <ScrollViewer x:Name="scrolls" Grid.Row="1" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Disabled" Height="650">
                 <ScrollViewer.Content>
                     <StackPanel Orientation="Vertical" Grid.Row="1">
-
+                        
                         <StackPanel Orientation="Horizontal">
                             <TextBlock Text="增值服务" Margin="20,0,10,0" VerticalAlignment="Center"  />
                             <Border Background="Black"  VerticalAlignment="Center" Width="217"  Height="1"/>