1

BBWY.Client/GlobalContext.cs

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

BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs

@@ -137,8 +137,8 @@ namespace BBWY.Client.ViewModels
         public string SkuId { get => skuId; set { Set(ref skuId, value); } }
 
 
-
+        public string orderId;
-        public string OrderId { get; set; }
+        public string OrderId { get => orderId; set { Set(ref orderId, value); } }
 
         private string logo;
         /// <summary>
@@ -614,9 +614,10 @@ namespace BBWY.Client.ViewModels
             ArrivalQuantity = 0;
             GoodProductQuantity = 0;
 
-
+            IncreateList = new ObservableCollection<IncreateModel>();
             string[] increateDatas = model.Increment1?.Split(',');
             bool isSelected = false;
+            
             foreach (var item in increates)
             {
                 isSelected = false;

BBWY.Client/Views/PackTask/WareHouseListControl.xaml

@@ -123,9 +123,13 @@
                                                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
                                                                    CommandParameter="{Binding DepartmentName}"
                                                                    Margin=" 5,0,0,0"/>
-                   
+                                <StackPanel Orientation="Horizontal" Visibility="{Binding OrderId, Converter={StaticResource objConverter},ConverterParameter=#null:Visible:Collapsed}">
-                                <TextBlock VerticalAlignment="Center" Text="对接人:" Margin="16,0,0,0" />
+                                    <TextBlock  VerticalAlignment="Center" Text="对接人:" Margin="16,0,0,0"  />
-                                <TextBlock VerticalAlignment="Center" Text="{Binding AcceptName}" Margin="5,0,0,0" />
+                                    <TextBlock  VerticalAlignment="Center" Text="{Binding AcceptName}" Margin="5,0,0,0" />
+
+
+                                </StackPanel>
+                                
                             </StackPanel>
                             
                         </Grid>
@@ -292,20 +296,33 @@
                                     <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
                                         <StackPanel Margin="10,5" Orientation="Horizontal"  VerticalAlignment="Center"  HorizontalAlignment="Left" >
                                             <TextBlock  Text="条形码:"/>
-                                            <c:BButton x:Name="btn_lookBarCode" Content="查看" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
+                                            <StackPanel Orientation="Horizontal" Visibility="{Binding BarCodeModel,Converter={StaticResource objConverter}, ConverterParameter=#null:Collapsed:Visible}">
-                                                  Command="{Binding LookBarCommand}"     />
+                                                <c:BButton x:Name="btn_lookBarCode" Content="查看" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
+                                                  Command="{Binding LookBarCommand}" />
 
-                                            <c:BButton x:Name="btn_daCer" Content="打印" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
+                                                <c:BButton x:Name="btn_daCer" Content="打印" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
                                                        Command="{Binding PrintBarcodeCommand}"/>
+                                            </StackPanel>
+                                            <TextBlock Text="未配置" Style="{StaticResource middleTextBlock}"
+                                                       Visibility="{Binding BarCodeModel,Converter={StaticResource objConverter}, ConverterParameter=#null:Visible:Collapsed}"
+                                                       />
+
 
                                         </StackPanel>
                                         <StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center"  HorizontalAlignment="Left" >
                                             <TextBlock  Text="合格证:"/>
-                                            <c:BButton x:Name="btn_lookCer" Content="查看" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
+                                            <StackPanel Orientation="Horizontal"
+                                                        Visibility="{Binding CertificateModel,Converter={StaticResource objConverter}, ConverterParameter=#null:Collapsed:Visible}"
+                                                        >
+                                                <c:BButton x:Name="btn_lookCer" Content="查看" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
                                                        Command="{Binding LookCerCommand}"/>
 
-                                            <c:BButton x:Name="btn_dayinCer" Content="打印" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
+                                                <c:BButton x:Name="btn_dayinCer" Content="打印" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
                                                        Command="{Binding PrintCerCommand}"/>
+                                            </StackPanel>
+                                            <TextBlock Text="未配置" Style="{StaticResource middleTextBlock}"
+                                                       Visibility="{Binding CertificateModel,Converter={StaticResource objConverter}, ConverterParameter=#null:Visible:Collapsed}"
+                                                       />
 
                                         </StackPanel>
                                     </StackPanel>