包装耗材设置新增自定义添加

BBWY.Client/App.xaml.cs

@@ -72,7 +72,8 @@ namespace BBWY.Client
 
 
             //齐越琳琳
-            //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjY4NDI2OTQyNTY0NTM2MzIwIiwidGVhbUlkIjoiMTUxNjcxNTM3MjQ0NTcwMDA5NiIsInNvblRlYW1JZHMiOiIxNzE4NTQxMDYzMzk3ODM4ODQ4LDE1MTY3MTUzNzI0NDU3MDAwOTYiLCJleHAiOjE3MzAyODcxNjh9.6vXadZWQfhnxbR3320RloKv3LqqbNdZ7wDDfO3tY_5U";
+            
+           userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjY4NDI2OTQyNTY0NTM2MzIwIiwidGVhbUlkIjoiMTUxNjcxNTM3MjQ0NTcwMDA5NiIsInNvblRlYW1JZHMiOiIxNzE4NTQxMDYzMzk3ODM4ODQ4LDE1MTY3MTUzNzI0NDU3MDAwOTYiLCJleHAiOjE3MzAyODcxNjh9.6vXadZWQfhnxbR3320RloKv3LqqbNdZ7wDDfO3tY_5U";
             #else
             //var uid = e.Args.Count() > 0 ? e.Args.LastOrDefault(args => args.StartsWith("uid:")) : string.Empty;
             //if (string.IsNullOrEmpty(uid))

BBWY.Client/GlobalContext.cs

@@ -13,7 +13,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10197";
+            ClientVersion = "10198";
         }
 
 

BBWY.Client/Models/APIModel/Request/SetPackDetailRequest.cs

@@ -92,6 +92,11 @@ namespace BBWY.Client.Models
         /// 耗材类型
         /// </summary>
         public string ConsumableTypeName { get; set; }
+
+        /// <summary>
+        /// 耗材是否存入配置 (添加的耗材)
+        /// </summary>
+        public bool? IsSaveConfig { get; set; } = true;
     }
     public class PackUserModelRequest
     {

BBWY.Client/Models/PackTask/PackItemModel.cs

@@ -15,6 +15,11 @@ namespace BBWY.Client.Models.PackTask
 {
     public class PackItemModel : NotifyObject
     {
+
+        private bool isHideDelete=false;
+        public bool IsHideDelete { get => isHideDelete; set { Set(ref isHideDelete, value); } }
+
+
         private string itemName;
         public string ItemName { get => itemName; set { Set(ref itemName, value); } }
 

BBWY.Client/ViewModels/PackTask/PackDetailViewModel.cs

@@ -812,8 +812,35 @@ namespace BBWY.Client.ViewModels.PackTask
                                         condate.ConsumablePrice = con.ConsumablePrice;
                                         condate.SelectId = con.ConsumableId;
                                         condate.TaskCount = con.TaskCount;
+                                        condate.IsHideDelete = true;
 
                                     });
+                                else
+                                {
+                                    ObservableCollection<string> consumableTypeList = new ObservableCollection<string>();
+
+                                    foreach (var item in ConsumableTypeList)
+                                    {
+                                        consumableTypeList.Add(item.ConsumableTypeName);
+                                    }
+
+                                    App.Current.Dispatcher.Invoke(() =>
+                                    {
+                                        ConsumableServiceList.Add(new PackItemModel
+                                        {
+
+                                            ConsumableTypeList = consumableTypeList,
+                                            AllConsumableTypeList = ConsumableTypeList,
+                                            TotalConsumableFees = ToTalConsumableFees,
+                                            ConsumableType = con.ConsumableTypeName,
+                                            ConsumablePrice = con.ConsumablePrice,
+                                            SelectId = con.ConsumableId,
+                                            TaskCount = con.TaskCount
+                                        });
+
+                                    });
+                                  
+                                }
 
                             }
                         }
@@ -986,7 +1013,7 @@ namespace BBWY.Client.ViewModels.PackTask
                 ConsumableFees = ConsumableFees,
                 TaskId = TaskId,
                 PackUserList = PackUserModelList?.Select(p => new PackUserModelRequest { TaskCount = p.TaskCount, UserId = p.SelectUserId }).ToList(),
-                ConsumableList = ConsumableServiceList?.Select(c => new ConsumableRequest { ConsumableId = c.SelectId.Value, TaskCount = c.TaskCount, ConsumableTypeName = c.ConsumableType, ConsumablePrice = c.ConsumablePrice }).ToList(),
+                ConsumableList = ConsumableServiceList?.Select(c => new ConsumableRequest { ConsumableId = c.SelectId.Value, TaskCount = c.TaskCount, ConsumableTypeName = c.ConsumableType, ConsumablePrice = c.ConsumablePrice,IsSaveConfig=c.IsHideDelete  }).ToList(),
                 DiscountFactory = DiscountFactory,
                 PackDiscountPrice = PackDiscountFees,
                 PackPrice = PackFees,

BBWY.Client/Views/PackTask/PackDetailWindow.xaml

@@ -14,7 +14,7 @@
         xmlns:hc="https://handyorg.github.io/handycontrol"
         CloseButtonVisibility="Visible"
         WindowStartupLocation="CenterScreen"
-        CloseButtonColor="{StaticResource WindowButtonColor}"
+        CloseButtonColor="White"
         DataContext="{Binding PackDetailVM,Source={StaticResource Locator}}"
         MinButtonVisibility="Collapsed" 
         MaxButtonVisibility="Collapsed"   
@@ -82,8 +82,8 @@
         </Grid.RowDefinitions>
 
         <Border BorderThickness="0,0,0,1" BorderBrush="{StaticResource MainMenu.BorderBrush}"
-                Background="{StaticResource Border.Background}">
+                Background="{StaticResource Button.Background}">
-            <TextBlock Text="包装任务配置"  HorizontalAlignment="Center" VerticalAlignment="Center"/>
+            <TextBlock Text="包装任务配置"  HorizontalAlignment="Left" Foreground="White"  Margin="20 0 0 0" VerticalAlignment="Center"/>
 
         </Border>
         <Grid Grid.Row="1" >
@@ -347,7 +347,7 @@
                         ItemsSource="{Binding PackUserModelList,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" 
                      ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
                      BorderBrush="{StaticResource Border.Brush}"
-                     BorderThickness="1,1,1,1" 
+                     BorderThickness="1 0 1 0 " 
                      Foreground="{StaticResource Text.Color}"
                      ScrollViewer.VerticalScrollBarVisibility="Auto"
                         >
@@ -375,7 +375,7 @@
                                         </DataTemplate>
                                     </ListBox.ItemTemplate>
                                 </ListBox>
-                                <c:BButton  Content="添加" Foreground="Blue" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}" Background="Transparent" HorizontalAlignment="Stretch"
+                                <c:BButton  Content="添加" Foreground="Blue" BorderThickness="1 0 1 1" BorderBrush="{StaticResource Border.Brush}" Background="Transparent" HorizontalAlignment="Stretch"
                                  Command="{Binding AddPackUserCommand}"
                                 />
                             </StackPanel>
@@ -432,7 +432,7 @@
                         ItemsSource="{Binding ConsumableServiceList}"
                      ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
                      BorderBrush="{StaticResource Border.Brush}"
-                     BorderThickness="1,1,1,0" 
+                     BorderThickness="1,0,1,0" 
                      Foreground="{StaticResource Text.Color}"
                      ScrollViewer.VerticalScrollBarVisibility="Auto"
                         >
@@ -458,7 +458,7 @@
                                                 <TextBox Margin="1"  BorderThickness="0"  VerticalContentAlignment="Center" Grid.Column="3" Height="30" Text="{Binding TaskCount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" />
                                                 <c:BButton Foreground="Blue"  BorderBrush="{StaticResource Border.Brush}" Background="Transparent" HorizontalAlignment="Stretch"
                                           Command="{Binding DeleteServiceCommand}"
-                                            Visibility="{Binding DataContext.IsConsumableTypeListEnable,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}},Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}"                  
+                                                              Visibility="{Binding IsHideDelete,Converter={StaticResource objConverter},ConverterParameter=true:Collapsed:Visible}"
                                            CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ListBox}}, Path=ItemsSource}" Content="删除"  Grid.Column="4"/>
 
                                                 <Border  HorizontalAlignment="Left" Margin="-1 0 0 0" Grid.Column="1" Width="1"   Background="{StaticResource Border.Brush}"/>
@@ -471,9 +471,11 @@
                                         </DataTemplate>
                                     </ListBox.ItemTemplate>
                                 </ListBox>
-                                <c:BButton  Content="添加"   Foreground="Blue" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}" Background="Transparent" HorizontalAlignment="Stretch"
+                                <c:BButton  Content="添加"   Foreground="Blue" BorderThickness="1 0 1 1" BorderBrush="{StaticResource Border.Brush}" Background="Transparent" HorizontalAlignment="Stretch"
-                               Visibility="{Binding IsConsumableTypeListEnable,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}"        Command="{Binding AddConsumableCommand}"
+                                    Command="{Binding AddConsumableCommand}"
                                 />
+                                <!--    Visibility="{Binding DataContext.IsConsumableTypeListEnable,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}},Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}"
+                                Visibility="{Binding IsConsumableTypeListEnable,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}" -->
                             </StackPanel>
 
                         </Grid>

BBWY.Client/Views/PackerTask/PackerPackCompletedControl.xaml

@@ -172,7 +172,7 @@
                     <ColumnDefinition Width="140"/>
                     <ColumnDefinition Width="100"/>
                     <ColumnDefinition Width="120"/>
-                    <ColumnDefinition Width="140"/>
+                    <ColumnDefinition Width="200"/>
                     <ColumnDefinition MinWidth="100"/>
                     <ColumnDefinition  Width="100"/>
                     <ColumnDefinition Width="150"/>
@@ -230,7 +230,7 @@
                                     <ColumnDefinition Width="140"/>
                                     <ColumnDefinition MinWidth="100"/>
                                     <ColumnDefinition Width="150"/>
-                                    <ColumnDefinition MinWidth="140"/>
+                                    <ColumnDefinition MinWidth="200"/>
                                     <ColumnDefinition Width="0"/>
                                     <ColumnDefinition  Width="100"/>
                                     <ColumnDefinition Width="100"/>
@@ -261,7 +261,7 @@
                                     <ColumnDefinition Width="140"/>
                                     <ColumnDefinition Width="100"/>
                                     <ColumnDefinition Width="120"/>
-                                    <ColumnDefinition Width="140"/>
+                                    <ColumnDefinition Width="200"/>
                                     <ColumnDefinition MinWidth="100"/>
                                     <ColumnDefinition  Width="100"/>
                                     <ColumnDefinition Width="150"/>
@@ -400,13 +400,24 @@ TextWrapping="Wrap"
                                     <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Left">
                                         <StackPanel Margin="10,5" Orientation="Horizontal"  VerticalAlignment="Center"  HorizontalAlignment="Left" >
                                             <TextBlock  Text="工序:"/>
-                                            <TextBlock  Text="{Binding  ProcessComboName}"/>
+                                            <TextBlock  Text="{Binding  ProcessComboName}">
+                                                <TextBlock.ToolTip>
+                                                    <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                                        <TextBlock Text="{Binding ProcessComboName}"/>
+                                                    </ToolTip>
+                                                </TextBlock.ToolTip>
+              </TextBlock>
                                         </StackPanel>
                                         <Grid Margin="10,5"  VerticalAlignment="Center"   HorizontalAlignment="Left" >
                                             <TextBlock   TextWrapping="Wrap">
-                                            <Run Text="耗材:"/>
+                                                <TextBlock.ToolTip>
-                                            <Run Text="{Binding TaskConsumableMsg}"/>
+                                                    <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
-                                            </TextBlock>
+                                                        <TextBlock Text="{Binding TaskConsumableMsg}"/>
+                                                    </ToolTip>
+                                                </TextBlock.ToolTip>
+              <Run Text="耗材:"/>
+              <Run Text="{Binding TaskConsumableMsg}"/>
+              </TextBlock>
                                         </Grid>
 
                                     </StackPanel>

BBWY.Client/Views/PackerTask/PackerWaitPackageControl.xaml

@@ -173,7 +173,7 @@
                     <ColumnDefinition Width="140"/>
                     <ColumnDefinition Width="100"/>
                     <ColumnDefinition Width="120"/>
-                    <ColumnDefinition Width="140"/>
+                    <ColumnDefinition Width="200"/>
                     <ColumnDefinition MinWidth="100"/>
                     <ColumnDefinition  Width="100"/>
                     <ColumnDefinition Width="150"/>
@@ -229,12 +229,12 @@
                                     <ColumnDefinition Width="300"/>
                                     <ColumnDefinition Width="90"/>
                                     <ColumnDefinition Width="140"/>
+                                    <ColumnDefinition Width="100"/>
+                                    <ColumnDefinition Width="120"/>
+                                    <ColumnDefinition Width="200"/>
                                     <ColumnDefinition MinWidth="100"/>
-                                    <ColumnDefinition Width="150"/>
-                                    <ColumnDefinition MinWidth="140"/>
-                                    <ColumnDefinition Width="0"/>
                                     <ColumnDefinition  Width="100"/>
-                                    <ColumnDefinition Width="100"/>
+                                    <ColumnDefinition Width="150"/>
                                     <ColumnDefinition Width="120"/>
                                 </Grid.ColumnDefinitions>
                                 <StackPanel Orientation="Horizontal" Grid.Column="0" Grid.ColumnSpan="11">
@@ -263,7 +263,7 @@
                                     <ColumnDefinition Width="140"/>
                                     <ColumnDefinition Width="100"/>
                                     <ColumnDefinition Width="120"/>
-                                    <ColumnDefinition Width="140"/>
+                                    <ColumnDefinition Width="200"/>
                                     <ColumnDefinition MinWidth="100"/>
                                     <ColumnDefinition  Width="100"/>
                                     <ColumnDefinition Width="150"/>
@@ -402,10 +402,21 @@ TextWrapping="Wrap"
                                     <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Left">
                                         <StackPanel Margin="10,5" Orientation="Horizontal"  VerticalAlignment="Center"  HorizontalAlignment="Left" >
                                             <TextBlock  Text="工序:"/>
-                                            <TextBlock  Text="{Binding  ProcessComboName}"/>
+                                            <TextBlock  Text="{Binding  ProcessComboName}">
+                                                <TextBlock.ToolTip>
+                                                    <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                                        <TextBlock Text="{Binding ProcessComboName}"/>
+                                                    </ToolTip>
+                                                </TextBlock.ToolTip>
+                                            </TextBlock>
                                         </StackPanel>
                                         <Grid Margin="10,5"  VerticalAlignment="Center"   HorizontalAlignment="Left" >
                                             <TextBlock   TextWrapping="Wrap">
+                                                <TextBlock.ToolTip>
+                                                    <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                                        <TextBlock Text="{Binding TaskConsumableMsg}"/>
+                                                    </ToolTip>
+                                                </TextBlock.ToolTip>
                                             <Run Text="耗材:"/>
                                             <Run Text="{Binding TaskConsumableMsg}"/>
                                             </TextBlock>