打印 品名换成店铺

BBWY.Client/Helpers/MyPrintHelper.cs

@@ -79,8 +79,8 @@ namespace BBWY.Client.Helpers
 
 
 
-            args.Graphics.DrawString($"品名: {barCode.BrandName}", font, System.Drawing.Brushes.Black, new PointF(10, topHeigth));
-            topHeigth += (heightSpace + sizeHeight);
+            //args.Graphics.DrawString($"品名: {barCode.BrandName}", font, System.Drawing.Brushes.Black, new PointF(10, topHeigth));
+            //topHeigth += (heightSpace + sizeHeight);
 
 
             switch (barCode.LabelModel)
@@ -99,6 +99,10 @@ namespace BBWY.Client.Helpers
             // g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAlias;          
             size = args.Graphics.MeasureString(barcodeSku, font);
             topHeigth += (heightSpace + sizeHeight);
+
+            args.Graphics.DrawString($"店铺: {barCode.ShopName}", font, System.Drawing.Brushes.Black, new PointF(10, topHeigth));
+            topHeigth += (heightSpace + sizeHeight);
+
             args.Graphics.DrawImage(img, 1, topHeigth, 234, 50);
             topHeigth += (50 + 5);
             args.Graphics.DrawString(barcodeSku, font, System.Drawing.Brushes.Black, new PointF((236 - size.Width) / 2, topHeigth));
@@ -145,8 +149,12 @@ namespace BBWY.Client.Helpers
             string barcodeSku = $"POP{barCode.SkuId}";
             Barcode barcode = new Barcode();
             System.Drawing.Image img = barcode.Encode(TYPE.CODE128, barcodeSku, 500, 60);
-            args.Graphics.DrawString($"品名: {barCode.BrandName}", font, System.Drawing.Brushes.Black, new PointF(10, 10));
-            args.Graphics.DrawString($"规格: {barCode.SkuName}", font, System.Drawing.Brushes.Black, new PointF(10, 40));
+            //args.Graphics.DrawString($"品名: {barCode.BrandName}", font, System.Drawing.Brushes.Black, new PointF(10, 10));
+            //args.Graphics.DrawString($"规格: {barCode.SkuName}", font, System.Drawing.Brushes.Black, new PointF(10, 40));
+
+          
+            args.Graphics.DrawString($"规格: {barCode.SkuName}", font, System.Drawing.Brushes.Black, new PointF(10, 10));
+            args.Graphics.DrawString($"店铺: {barCode.ShopName}", font, System.Drawing.Brushes.Black, new PointF(10, 40));
             // g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAlias;          
             SizeF size = args.Graphics.MeasureString(barcodeSku, font);
             args.Graphics.DrawString(barcodeSku, font, System.Drawing.Brushes.Black, new PointF((236 - size.Width) / 2, 130));

BBWY.Client/Models/PackTask/BarCodeModel.cs

@@ -64,8 +64,10 @@ namespace BBWY.Client.Models
         /// </summary>
         public BarcodeLabelModel LabelModel { get => labelModel; set { Set(ref labelModel, value); } }
 
+        /// <summary>
+        /// 店铺名
+        /// </summary>
+        public string ShopName { get; set; }
 
-
- 
     }
 }

BBWY.Client/Models/PackTask/PackTaskModel.cs

@@ -156,7 +156,8 @@ namespace BBWY.Client.Models
                 LabelModel = BarCodeModel.LabelModel,
                 ProductNo = BarCodeModel.ProductNo,
                 SkuId = BarCodeModel.SkuId,
-                SkuName = BarCodeModel.SkuName
+                SkuName = BarCodeModel.SkuName,
+                ShopName= ShopName
             };
             printWindow.LoadData();
             //printWindow.Datas = LoadBarLabelModels();

BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs

@@ -587,6 +587,11 @@ namespace BBWY.Client.ViewModels
                 }
                 BatchPrintWindow batchPrint = new BatchPrintWindow();
 
+
+                if (BarCodeModel!=null)
+                {
+                    BarCodeModel.ShopName = OriginShopName;
+                }
                 batchPrint.SetData(GoodProductQuantity,
                    PurchaseSkuList.Where(p => p.IsNeedCer && p.CerDTO.Id > 0).Select(p => p.CerDTO).ToArray()
                     , BarCodeModel);
@@ -809,7 +814,7 @@ namespace BBWY.Client.ViewModels
         /// </summary>
         public void SearchSku(PackTaskModel model)
         {
-
+            OriginShopName = model.ShopName;
             InitData();
             TaskId = model.TaskId;
             OrderId = model.OrderId;

BBWY.Client/Views/PackTask/MinBarcodeControl.xaml

@@ -10,14 +10,15 @@
         <DockPanel Grid.Row="1">
             <Border Name="jingjian" Visibility="{Binding model.LabelModel,Converter={StaticResource objConverter},ConverterParameter=精简模板:Visible:Collapsed}" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1"  Margin="1">
                 <StackPanel Orientation="Vertical">
-                    <TextBlock  Margin="10,25,10,0" FontSize="15" FontWeight="Black"  >
-                            <Run Text="品名:"/>
-                            <Run Text="{Binding model.BrandName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
-                    </TextBlock>
+                  
                     <TextBlock  Margin="10,25,10,0" FontSize="15" FontWeight="Black"  >
                              <Run Text="规格:"/>
                             <Run Text="{Binding model.SkuName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
                     </TextBlock>
+                    <TextBlock  Margin="10,25,10,0" FontSize="15" FontWeight="Black"  >
+                            <Run Text="店铺:"/>
+                            <Run Text="{Binding model.ShopName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
+                    </TextBlock>
                     <Image Source="{Binding BarcodeImage,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Margin="10,25,10,0"/>
                     <TextBlock Text="POP" HorizontalAlignment="Center" Margin="10,0,10,0" FontSize="15" FontWeight="Black"  >
                             <Run  Text="{Binding model.SkuId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
@@ -31,10 +32,7 @@
                             <Run Text="品牌:"/>
                             <Run Text="{Binding model.Brand,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
                     </TextBlock>
-                    <TextBlock  Margin="10,10,10,0" FontSize="15" FontWeight="Black"  >
-                            <Run Text="品名:"/>
-                            <Run Text="{Binding model.BrandName}"/>
-                    </TextBlock>
+                  
                     <TextBlock  Margin="10,10,10,0" FontSize="15" FontWeight="Black"  >
                             <Run Text="型号:"/>
                             <Run Text="{Binding model.ProductNo}"/>
@@ -43,6 +41,10 @@
                              <Run Text="规格:"/>
                             <Run Text="{Binding model.SkuName}"/>
                     </TextBlock>
+                    <TextBlock  Margin="10,10,10,0" FontSize="15" FontWeight="Black"  >
+                            <Run Text="店铺:"/>
+                            <Run Text="{Binding model.ShopName}"/>
+                    </TextBlock>
                     <Image Source="{Binding BarcodeImage,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Margin="10,10,10,0"/>
                     <TextBlock Text="POP" HorizontalAlignment="Center" Margin="10,0,10,0" FontSize="15" FontWeight="Black"  >
                             <Run  Text="{Binding model.SkuId}"/>
@@ -55,14 +57,15 @@
                             <Run Text="品牌:"/>
                             <Run Text="{Binding model.Brand}"/>
                     </TextBlock>
-                    <TextBlock  Margin="10,10,10,5" FontSize="15" FontWeight="Black"  >
-                            <Run Text="品名:"/>
-                            <Run Text="{Binding model.BrandName}"/>
-                    </TextBlock>
+
                     <TextBlock  Margin="10,10,10,5" FontSize="15" FontWeight="Black"  >
                              <Run Text="规格:"/>
                             <Run Text="{Binding model.SkuName}"/>
                     </TextBlock>
+                    <TextBlock  Margin="10,10,10,5" FontSize="15" FontWeight="Black"  >
+                            <Run Text="店铺:"/>
+                            <Run Text="{Binding model.ShopName}"/>
+                    </TextBlock>
                     <Image Source="{Binding BarcodeImage,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Margin="10,10,10,0"/>
                     <TextBlock Text="POP" HorizontalAlignment="Center" Margin="10,0,10,0" FontSize="15" FontWeight="Black"  >
                             <Run  Text="{Binding model.SkuId}"/>

BBWY.Client/Views/PackTask/ServiceWindow.xaml

@@ -709,6 +709,7 @@
                 <local:MinBarcodeControl Grid.Row="1"  BarcodeImage="{Binding BarcodeImage,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"   model="{Binding PackTaskModel.BarCodeModel, Mode=TwoWay}"  HorizontalAlignment="Left" VerticalAlignment="Top" Margin="20 0 0 0"  Width="250"  Height="190"
                                  Visibility="{Binding PackTaskModel.BarCodeModel,Mode=TwoWay,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
                                           />
+        
             </StackPanel>
 
 

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

@@ -39,6 +39,12 @@ namespace BBWY.Client.Views.PackTask
 
             var serviceViewModel=    this.DataContext as PackServiceViewModel;
             //加载数据
+
+            if (model.BarCodeModel!=null)
+            {
+                model.BarCodeModel.ShopName= model.ShopName;
+            }
+           
             serviceViewModel.PackTaskModel = model;
             serviceViewModel.PackTaskList = new System.Collections.ObjectModel.ObservableCollection<PackTaskModel> { model };
             serviceViewModel.FloorDragNumber = model.FloorDragNumber;

BBWY.Client/Views/QualityTask/BatchPrintWindow.xaml.cs

@@ -41,7 +41,7 @@ namespace BBWY.Client.Views.QualityTask
             this.DataContext = this;
         }
 
-
+        
 
         public CertificateModel[] CertificateModel { get; set; }