打包端新增打印 ，仓库端打印包装费改为包装收益 并默认为0.85折扣

BBWY.Client/App.xaml.cs

@@ -68,7 +68,7 @@ namespace BBWY.Client
             // userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjI0OTUxNjgzNTc2NTAwMjI0IiwidGVhbUlkIjoiMTYyMDM0MjAxNDcwNjk3ODgxNiIsInNvblRlYW1JZHMiOiIxNjIwMzQyMDE0NzA2OTc4ODE2LDE2MjAzNDQxNDA4NTAwMDgwNjQsMTQxMDk1NTYwNDYxMjA5MTkwNCIsImV4cCI6MTcyNDkxNDM5M30.tIgo70tzRxZyUQkX1Jsh9I4ySciX0VC9HMMOoTnwVtM";
 
             //包装组
-            userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxMzk1NzA4MjA4NjU1MzcyMjg4IiwidGVhbUlkIjoiMTcxODU0MTA2MzM5NzgzODg0OCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE3MzAyODcxNjh9.lpiLJjP0prtQgZZfpG0NN6n60LNKstbFCJc-nLgb62A";
+           /// userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxMzk1NzA4MjA4NjU1MzcyMjg4IiwidGVhbUlkIjoiMTcxODU0MTA2MzM5NzgzODg0OCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE3MzAyODcxNjh9.lpiLJjP0prtQgZZfpG0NN6n60LNKstbFCJc-nLgb62A";
 
 
             //齐越琳琳

BBWY.Client/GlobalContext.cs

@@ -13,11 +13,20 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10193";
+            ClientVersion = "10194";
         }
 
+
+        private string title;
+
+        public string Title { get=> title; set { Set(ref title, value); } }
+
+
+
         private User user;
 
+       
+
         public User User { get => user; set { Set(ref user, value); } }
 
         public string UserToken { get; set; }

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

@@ -62,6 +62,17 @@ namespace BBWY.Client.Models.APIModel.Response.PackTask
         /// </summary>
         public decimal PackFees { get; set; }
 
+
+        /// <summary>
+        /// 包装人员折扣
+        /// </summary>
+        public decimal? PackerDiscount { get; set; }
+
+        /// <summary>
+        /// 包装收益（包装员收益）
+        /// </summary>
+        public decimal? PackerPackFees { get; set; }
+
         /// <summary>
         /// 增值费用小计(待移除)
         /// </summary>

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

@@ -7,6 +7,11 @@ namespace BBWY.Client.Models
 {
     public class GetPackDetailResponse
     {
+        ///// <summary>
+        ///// 打包折扣
+        ///// </summary>
+        //public decimal PackDiscount { get; set; } 
+
         public string ProcessTypeName { get; set; }
 
         public string ProcessComboName { get; set; }

BBWY.Client/Models/PackUser/PackerTaskModel.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Windows.Input;
 
 namespace BBWY.Client.Models.PackUser
 {
@@ -39,5 +40,10 @@ namespace BBWY.Client.Models.PackUser
         /// 展示留言信息
         /// </summary>
         public bool ShowMoreMsg { get => showMoreMsg; set { Set(ref showMoreMsg, value); } }
+
+
+
+    
+
     }
 }

BBWY.Client/ViewModels/MainViewModel.cs

@@ -329,7 +329,7 @@ namespace BBWY.Client.ViewModels
 
                 CreateMenu();
 
-
+                GlobalContext.Title = GlobalContext.User.Name;
                 try
                 {
                     var res = packTaskExpressService.GetExpressNameList();
@@ -441,6 +441,7 @@ namespace BBWY.Client.ViewModels
                     {
                         Environment.Exit(Environment.ExitCode);
                     }
+
                 });
             }
             catch (Exception ex)
@@ -502,6 +503,8 @@ namespace BBWY.Client.ViewModels
             }
 
             GlobalContext.User.Shop = shop;
+
+            GlobalContext.Title = GlobalContext.User.Shop.ShopName;
             //ShowShopChoosePanel = false;
             Task.Factory.StartNew(GetLogisticsList);
             if (shop.Platform == Platform.京东)

BBWY.Client/ViewModels/PackTask/PackDetailViewModel.cs

@@ -23,6 +23,7 @@ using System.IO;
 using BBWY.Client.Models.APIModel;
 using Org.BouncyCastle.Bcpg;
 using System.Threading;
+using Org.BouncyCastle.Ocsp;
 
 namespace BBWY.Client.ViewModels.PackTask
 {
@@ -445,6 +446,13 @@ namespace BBWY.Client.ViewModels.PackTask
         public string PackUserName { get => packUserName; set { Set(ref packUserName, value); } }
 
 
+        private decimal? packerFee;
+        /// <summary>
+        /// 包装员费用
+        /// </summary>
+        public decimal? PackerFee { get => packerFee; set { Set(ref packerFee, value); } }
+
+
         private int incrementPartTaskCount;
         /// <summary>
         /// 配件任务数量
@@ -674,6 +682,9 @@ namespace BBWY.Client.ViewModels.PackTask
 
         }
 
+
+
+
         private List<ProductResistantResponse> productResistantList;
         public List<ProductResistantResponse> ProductResistantList { get => productResistantList; set { Set(ref productResistantList, value); } }
         /// <summary>
@@ -733,6 +744,7 @@ namespace BBWY.Client.ViewModels.PackTask
 
                 if (!packDetailRes.Success)
                 {
+
                     App.Current.Dispatcher.Invoke(() =>
                     {
                         MessageBox.Show(packDetailRes.Msg);
@@ -740,8 +752,10 @@ namespace BBWY.Client.ViewModels.PackTask
                 }
                 if (packDetailRes.Success && packDetailRes.Data != null)
                 {
+
                     var resData = packDetailRes.Data;
 
+                   
                     PackProcessType = resData.PackProcessType;
 
                     switch (PackProcessType)
@@ -909,7 +923,7 @@ namespace BBWY.Client.ViewModels.PackTask
         /// </summary>
         private void UpLoadPack(object obj)
         {
-            if (PackUserModelList==null|| PackUserModelList.Count<=0)
+            if (PackUserModelList == null || PackUserModelList.Count <= 0)
             {
                 System.Windows.MessageBox.Show("信息不完整,打包人设置有误");
                 return;

BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs

@@ -26,6 +26,8 @@ using BBWY.Client.Models.SealBox;
 using Newtonsoft.Json;
 using System.Diagnostics;
 using BBWY.Client.Extensions;
+using BBWY.Client.APIServices.QiKu;
+using BBWY.Client.Views.PackerTask;
 
 namespace BBWY.Client.ViewModels.PackTask
 {
@@ -593,7 +595,7 @@ namespace BBWY.Client.ViewModels.PackTask
         private readonly PackTaskService packTaskService;
         private readonly SealBoxService sealBoxService;
         public GlobalContext globalContext;
-        public WareHouseListViewModel(PackTaskService packTaskService, GlobalContext globalContext, SealBoxService sealBoxService)
+        public WareHouseListViewModel(PackTaskService packTaskService, GlobalContext globalContext, SealBoxService sealBoxService, PackUserService packUserService)
         {
 
 
@@ -684,6 +686,7 @@ namespace BBWY.Client.ViewModels.PackTask
             LoadTransportSkuDataCommand = new RelayCommand<WareWaitTransport>(LoadTransportSkuData);
 
             LoadCompletedSkuDataCommand = new RelayCommand<WareWaitCompleted>(LoadCompletedSkuData);
+            this.packUserService = packUserService;
         }
 
         private void LoadCompletedSkuData(WareWaitCompleted model)
@@ -955,6 +958,7 @@ namespace BBWY.Client.ViewModels.PackTask
             Task.Factory.StartNew(() => SearchTaskList());
         }
 
+        PackUserService packUserService;
         private void CompletedPackTask(object obj)
         {
             var model = (PackTaskModel)obj;
@@ -964,23 +968,29 @@ namespace BBWY.Client.ViewModels.PackTask
                 System.Windows.MessageBox.Show("请先设置打包费用!");
                 return;
             }
-            if (System.Windows.MessageBox.Show("是否完成打包?", "提示",
-                         MessageBoxButton.YesNo,
-                         MessageBoxImage.Warning) != MessageBoxResult.Yes)
-                return;
-            var res = packTaskService.CompletedPackTask(model.TaskId);
-            if (res == null)
-            {
-                return;
-            }
-            if (!res.Success)
-            {
-                System.Windows.MessageBox.Show(res.Msg);
-                return;
-            }
+            //if (System.Windows.MessageBox.Show("是否完成打包?", "提示",
+            //             MessageBoxButton.YesNo,
+            //             MessageBoxImage.Warning) != MessageBoxResult.Yes)
+            //    return;
 
 
-            Task.Factory.StartNew(() => SearchTaskList());
+            AddOneItemWeightWindow addOneItemWeightWindow = new AddOneItemWeightWindow(ReflashTask, packUserService, model.TaskId);
+            addOneItemWeightWindow.ShowDialog();
+
+
+            //var res = packTaskService.CompletedPackTask(model.TaskId);
+            //if (res == null)
+            //{
+            //    return;
+            //}
+            //if (!res.Success)
+            //{
+            //    System.Windows.MessageBox.Show(res.Msg);
+            //    return;
+            //}
+
+
+            //Task.Factory.StartNew(() => SearchTaskList());
         }
 
         private void StoreGetBySelf(long taskId)

BBWY.Client/ViewModels/PackerTask/PackerTaskViewModel.cs

@@ -17,6 +17,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Net.Mail;
+using System.Reflection;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -383,8 +384,54 @@ namespace BBWY.Client.ViewModels.PackerTask
             this.globalContext = globalContext;
 
             ShowMoreMessageCommand = new RelayCommand<long>(ShowMoreMessage);
+
+            PrintBarcodeCommand = new RelayCommand<BarCodeModel>(PrintBarcode);
+            PrintCerCommand = new RelayCommand<CertificateModel[]>(PrintCer);
+        }
+
+        private void PrintCer(CertificateModel[] certificateModel)
+        {
+            if (certificateModel == null)
+            {
+                new TipsWindow("该任务无设置合格证信息,无法打印!").Show();
+                return;
+            }
+            PrintWindow printWindow = new PrintWindow();
+
+            printWindow.CertificateModel = certificateModel;
+            printWindow.LoadData();
+            //printWindow.Datas = LoadCerLabelModels();
+            printWindow.ShowDialog();
+        }
+
+        /// <summary>
+        /// 打印条形码
+        /// </summary>
+        private void PrintBarcode(BarCodeModel BarCodeModel)
+        {
+            if (BarCodeModel == null)
+            {
+                new TipsWindow("该任务无设置条形码信息,无法打印!").Show();
+                return;
+            }
+
+            PrintWindow printWindow = new PrintWindow();
+            printWindow.BarCodeModel = new BarCodeModel
+            {
+                Brand = BarCodeModel.Brand,
+                BrandName = BarCodeModel.BrandName,
+                LabelModel = BarCodeModel.LabelModel,
+                ProductNo = BarCodeModel.ProductNo,
+                SkuId = BarCodeModel.SkuId,
+                SkuName = BarCodeModel.SkuName,
+                ShopName = BarCodeModel.ShopName
+            };
+            printWindow.LoadData();
+            //printWindow.Datas = LoadBarLabelModels();
+            printWindow.ShowDialog();
         }
 
+
         private void ShowMoreMessage(long taskId)
         {
             var model = PackerTaskModelList?.SingleOrDefault(p => p.TaskId == taskId);
@@ -474,6 +521,9 @@ namespace BBWY.Client.ViewModels.PackerTask
         public ICommand AppendMarkMessageCommand { get; set; }
 
         public ICommand ShowMoreMessageCommand { get; set; }
+
+        public ICommand PrintBarcodeCommand { get; set; }
+        public ICommand PrintCerCommand { get; set; }
         public void SetTaskState()
         {
             PageIndex = 1;

BBWY.Client/Views/MainWindow.xaml

@@ -9,7 +9,7 @@
            DataContext="{Binding Main,Source={StaticResource Locator}}"
            mc:Ignorable="d"
            Style="{StaticResource bwstyle}"
-           Title="{Binding GlobalContext.User.Shop.ShopName,StringFormat=步步为盈 \{0\}}" Height="450" Width="800">
+           Title="{Binding GlobalContext.Title}" Height="450" Width="800">
     <b:Interaction.Triggers>
         <b:EventTrigger EventName="Closing">
             <b:InvokeCommandAction Command="{Binding ClosingCommand}" PassEventArgsToCommand="True"/>

BBWY.Client/Views/PackTask/PackDetailWindow.xaml

@@ -621,8 +621,8 @@
                     <Run Text="{Binding PackTaskModel.PackUser}"/>
                                 </TextBlock>
                                 <TextBlock Margin="0 0 0 0" Style="{StaticResource middleTextBlock}" Grid.Column="1"  FontWeight="Bold">
-                    <Run Text="包装费:"/>
-                    <Run Text="{Binding PackTaskModel.FeesItemResponse.PackFees,StringFormat='0.00'}"/>
+                    <Run Text="包装收益:"/>
+                    <Run Text="{Binding PackerFee,StringFormat='0.00'}"/>
                                 </TextBlock>
                             </Grid>
                             <TextBlock Margin="0 0 0 0" FontSize="13" FontWeight="Bold">

BBWY.Client/Views/PackTask/PackDetailWindow.xaml.cs

@@ -65,6 +65,8 @@ namespace BBWY.Client.Views.PackTask
             serviceViewModel.OrderId = model.OrderId;
             serviceViewModel.SkuId = model.SkuId;
             serviceViewModel.PackUserName = model.PackUser?.Replace("\r\n", ",")?.Replace("\n", ",")?.Replace("\r", ",");
+
+            serviceViewModel.PackerFee = model.FeesItemResponse?.PackFees*(model.FeesItemResponse?.PackerDiscount??0.85m) ;
             serviceViewModel.LoadPackDatas();
             if (reflashWindow != null)
                 serviceViewModel.ReflashWindow = reflashWindow;
@@ -151,8 +153,6 @@ namespace BBWY.Client.Views.PackTask
         {
             try
             {
-
-
                 using (HttpClient client = new HttpClient())
                 {
                     // 发送 HTTP 请求并获取图片数据
@@ -180,8 +180,6 @@ namespace BBWY.Client.Views.PackTask
         private void DownloadImags(string url)
         {
             var client = new HttpClient();
-
-
             var uri = new Uri(Uri.EscapeUriString(url));
             byte[] urlContents = client.GetByteArrayAsync(uri).Result;
             var applicationPath = System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);

BBWY.Client/Views/PackerTask/AddOneItemWeightWindow.xaml

@@ -32,7 +32,7 @@
                     <Label   HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Width="60" Content="单件重量:"/>
                     <StackPanel Orientation="Horizontal">
                         <c:BTextBox Height="30" Width="150" Text="{Binding Weigth}" BorderThickness="1" />
-                        <Label  Content="kg"  HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Width="50"  />
+                        <Label  Content="g"  HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Width="50"  />
                     </StackPanel>
                 </StackPanel>
             </Grid>

BBWY.Client/Views/PackerTask/PackerPackCompletedControl.xaml

@@ -431,35 +431,78 @@ TextWrapping="Wrap"
                                                 <TextBlock  Text="条形码:"/>
                                                 <StackPanel Orientation="Horizontal" Visibility="{Binding BarCodeDTO,Converter={StaticResource objConverter}, ConverterParameter=#null:Collapsed:Visible}">
                                                     <c:BButton x:Name="btn_lookBarCode" Content="查看" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
-                                            Command="{Binding DataContext.LookBarCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"  CommandParameter="{Binding BarCodeDTO}"/>
+   Command="{Binding DataContext.LookBarCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"  CommandParameter="{Binding BarCodeDTO}"/>
+
+                                                    <c:BButton x:Name="btn_daCer" Content="打印" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
+       Command="{Binding DataContext.PrintBarcodeCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"  CommandParameter="{Binding BarCodeDTO}" />
                                                 </StackPanel>
                                                 <TextBlock Text="未配置" Style="{StaticResource middleTextBlock}" Margin="5,0,0,0"
-                                                 Visibility="{Binding BarCodeDTO,Converter={StaticResource objConverter}, ConverterParameter=#null:Visible:Collapsed}"
-                                                 />
+       Visibility="{Binding BarCodeDTO,Converter={StaticResource objConverter}, ConverterParameter=#null:Visible:Collapsed}"
+       />
+
+
                                             </StackPanel>
                                             <StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center"  HorizontalAlignment="Left" >
                                                 <TextBlock  Text="合格证:"/>
                                                 <StackPanel Orientation="Horizontal"
-                                                  Visibility="{Binding Cers,Converter={StaticResource objConverter}, ConverterParameter=#null:Collapsed:Visible}"
-                                                  >
+        Visibility="{Binding Cers,Converter={StaticResource objConverter}, ConverterParameter=#null:Collapsed:Visible}"
+        >
 
                                                     <StackPanel Orientation="Horizontal"
-                                                      Visibility="{Binding CertificatePosition,Converter={StaticResource objConverter}, ConverterParameter=无需合格证:Collapsed:Visible}"
-                                                      >
+            Visibility="{Binding CertificatePosition,Converter={StaticResource objConverter}, ConverterParameter=无需合格证:Collapsed:Visible}"
+            >
                                                         <c:BButton x:Name="btn_lookCer" Content="查看" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
-                                                 Command="{Binding DataContext.LookCerCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" CommandParameter="{Binding Cers}"/>
+     Command="{Binding DataContext.LookCerCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" CommandParameter="{Binding Cers}"/>
+
+                                                        <c:BButton x:Name="btn_dayinCer" Content="打印" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
+Command="{Binding DataContext.PrintCerCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" CommandParameter="{Binding Cers}"        />
+
                                                     </StackPanel>
                                                     <TextBlock Text="无需合格证" Style="{StaticResource middleTextBlock}" Margin="5,0,0,0"
-                                                 Visibility="{Binding CertificatePosition,Converter={StaticResource objConverter}, ConverterParameter=无需合格证:Visible:Collapsed}"
-                                                 />
+       Visibility="{Binding CertificatePosition,Converter={StaticResource objConverter}, ConverterParameter=无需合格证:Visible:Collapsed}"
+       />
 
                                                 </StackPanel>
                                                 <TextBlock Text="未配置" Style="{StaticResource middleTextBlock}" Margin="5,0,0,0"
-                                                 Visibility="{Binding Cers,Converter={StaticResource objConverter}, ConverterParameter=#null:Visible:Collapsed}"
-                                                 />
+       Visibility="{Binding Cers,Converter={StaticResource objConverter}, ConverterParameter=#null:Visible:Collapsed}"
+       />
 
                                             </StackPanel>
                                         </StackPanel>
+                                        <!--<StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
+                                   <StackPanel Margin="10,5" Orientation="Horizontal"  VerticalAlignment="Center"  HorizontalAlignment="Left" >
+                                       <TextBlock  Text="条形码:"/>
+                                       <StackPanel Orientation="Horizontal" Visibility="{Binding BarCodeDTO,Converter={StaticResource objConverter}, ConverterParameter=#null:Collapsed:Visible}">
+                                           <c:BButton x:Name="btn_lookBarCode" Content="查看" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
+                                   Command="{Binding DataContext.LookBarCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"  CommandParameter="{Binding BarCodeDTO}"/>
+                                       </StackPanel>
+                                       <TextBlock Text="未配置" Style="{StaticResource middleTextBlock}" Margin="5,0,0,0"
+                                        Visibility="{Binding BarCodeDTO,Converter={StaticResource objConverter}, ConverterParameter=#null:Visible:Collapsed}"
+                                        />
+                                   </StackPanel>
+                                   <StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center"  HorizontalAlignment="Left" >
+                                       <TextBlock  Text="合格证:"/>
+                                       <StackPanel Orientation="Horizontal"
+                                         Visibility="{Binding Cers,Converter={StaticResource objConverter}, ConverterParameter=#null:Collapsed:Visible}"
+                                         >
+
+                                           <StackPanel Orientation="Horizontal"
+                                             Visibility="{Binding CertificatePosition,Converter={StaticResource objConverter}, ConverterParameter=无需合格证:Collapsed:Visible}"
+                                             >
+                                               <c:BButton x:Name="btn_lookCer" Content="查看" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
+                                        Command="{Binding DataContext.LookCerCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" CommandParameter="{Binding Cers}"/>
+                                           </StackPanel>
+                                           <TextBlock Text="无需合格证" Style="{StaticResource middleTextBlock}" Margin="5,0,0,0"
+                                        Visibility="{Binding CertificatePosition,Converter={StaticResource objConverter}, ConverterParameter=无需合格证:Visible:Collapsed}"
+                                        />
+
+                                       </StackPanel>
+                                       <TextBlock Text="未配置" Style="{StaticResource middleTextBlock}" Margin="5,0,0,0"
+                                        Visibility="{Binding Cers,Converter={StaticResource objConverter}, ConverterParameter=#null:Visible:Collapsed}"
+                                        />
+
+                                   </StackPanel>
+                               </StackPanel>-->
 
 
 

BBWY.Client/Views/PackerTask/PackerTaskList.xaml

@@ -12,7 +12,7 @@
       DataContext="{Binding PackerTaskVM,Source={StaticResource Locator}}"
       mc:Ignorable="d"  Background="White"
       d:DesignHeight="450" d:DesignWidth="2048"
-      Title="TaskList">
+      Title="cesih">
     <Page.Resources>
         <Style TargetType="RadioButton">
 

BBWY.Client/Views/PackerTask/PackerWaitPackageControl.xaml

@@ -433,6 +433,49 @@ TextWrapping="Wrap"
                                                 <TextBlock  Text="条形码:"/>
                                                 <StackPanel Orientation="Horizontal" Visibility="{Binding BarCodeDTO,Converter={StaticResource objConverter}, ConverterParameter=#null:Collapsed:Visible}">
                                                     <c:BButton x:Name="btn_lookBarCode" Content="查看" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
+            Command="{Binding DataContext.LookBarCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"  CommandParameter="{Binding BarCodeDTO}"/>
+
+                                                    <c:BButton x:Name="btn_daCer" Content="打印" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
+                Command="{Binding DataContext.PrintBarcodeCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"  CommandParameter="{Binding BarCodeDTO}" />
+                                                </StackPanel>
+                                                <TextBlock Text="未配置" Style="{StaticResource middleTextBlock}" Margin="5,0,0,0"
+                Visibility="{Binding BarCodeDTO,Converter={StaticResource objConverter}, ConverterParameter=#null:Visible:Collapsed}"
+                />
+
+
+                                            </StackPanel>
+                                            <StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center"  HorizontalAlignment="Left" >
+                                                <TextBlock  Text="合格证:"/>
+                                                <StackPanel Orientation="Horizontal"
+                 Visibility="{Binding Cers,Converter={StaticResource objConverter}, ConverterParameter=#null:Collapsed:Visible}"
+                 >
+
+                                                    <StackPanel Orientation="Horizontal"
+                     Visibility="{Binding CertificatePosition,Converter={StaticResource objConverter}, ConverterParameter=无需合格证:Collapsed:Visible}"
+                     >
+                                                        <c:BButton x:Name="btn_lookCer" Content="查看" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
+              Command="{Binding DataContext.LookCerCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" CommandParameter="{Binding Cers}"/>
+
+                                                        <c:BButton x:Name="btn_dayinCer" Content="打印" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
+         Command="{Binding DataContext.PrintCerCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" CommandParameter="{Binding Cers}"        />
+
+                                                    </StackPanel>
+                                                    <TextBlock Text="无需合格证" Style="{StaticResource middleTextBlock}" Margin="5,0,0,0"
+                Visibility="{Binding CertificatePosition,Converter={StaticResource objConverter}, ConverterParameter=无需合格证:Visible:Collapsed}"
+                />
+
+                                                </StackPanel>
+                                                <TextBlock Text="未配置" Style="{StaticResource middleTextBlock}" Margin="5,0,0,0"
+                Visibility="{Binding Cers,Converter={StaticResource objConverter}, ConverterParameter=#null:Visible:Collapsed}"
+                />
+
+                                            </StackPanel>
+                                        </StackPanel>
+                                        <!--<StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
+                                            <StackPanel Margin="10,5" Orientation="Horizontal"  VerticalAlignment="Center"  HorizontalAlignment="Left" >
+                                                <TextBlock  Text="条形码:"/>
+                                                <StackPanel Orientation="Horizontal" Visibility="{Binding BarCodeDTO,Converter={StaticResource objConverter}, ConverterParameter=#null:Collapsed:Visible}">
+                                                    <c:BButton x:Name="btn_lookBarCode" Content="查看" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
                                             Command="{Binding DataContext.LookBarCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"  CommandParameter="{Binding BarCodeDTO}"/>
                                                 </StackPanel>
                                                 <TextBlock Text="未配置" Style="{StaticResource middleTextBlock}" Margin="5,0,0,0"
@@ -461,7 +504,7 @@ TextWrapping="Wrap"
                                                  />
 
                                             </StackPanel>
-                                        </StackPanel>
+                                        </StackPanel>-->