合并

BBWY.Client/APIServices/QiKu/PackTaskService.cs

@@ -36,12 +36,8 @@ namespace BBWY.Client.APIServices
                                                   )
         {
 
-            if (taskId != null && !string.IsNullOrEmpty(taskId.Trim()))
-            {
             return SendRequest<SearchTaskListResponse>(globalContext.QKApiHost, "api/PackTask/SearchTaskList", new
             {
-                    TaskId = taskId,
-                    ShopId = globalContext.User.Shop.ShopId.ToString()
 
                 }, null, HttpMethod.Post);
             }
@@ -58,7 +54,7 @@ namespace BBWY.Client.APIServices
 
             }, null, HttpMethod.Post);
         }
-        public ApiResponse<SearchTaskListResponse> GetWareHouseList(string WayBillNo = null, string SourceExpressName = null, string departmentName = null, string skuId = null, string taskId = null,
+        public ApiResponse<SearchTaskListResponse> SearchTaskList(string WayBillNo = null, string SourceExpressName = null, string departmentName = null, string skuId = null, string taskId = null,
 
                                                    TaskState? TaskState = null,
                                                    string ShopName = null,
@@ -66,14 +62,7 @@ namespace BBWY.Client.APIServices
                                                    int pageSize = 10
                                                   )
         {
-            if (taskId != null && !string.IsNullOrEmpty(taskId.Trim()))
-            {
-                return SendRequest<SearchTaskListResponse>(globalContext.QKApiHost, "api/PackTask/SearchTaskList", new
-                {
-                    TaskId = taskId
 
-                }, null, HttpMethod.Post);
-            }
             return SendRequest<SearchTaskListResponse>(globalContext.QKApiHost, "api/PackTask/SearchTaskList", new
             {
                 DepartmentName = departmentName,
@@ -98,7 +87,7 @@ namespace BBWY.Client.APIServices
         }
 
 
-        public ApiResponse<ProductSkuResponse> GetProductSku(string skuId)
+        public ApiResponse<ProductSkuResponse> SearchProduct(string skuId)
         {
             HttpClientHelper helper = new HttpClientHelper(globalContext.QKApiHost);
 

BBWY.Client/GlobalContext.cs

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

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/APIModel/Request/BarCodeRequest.cs

@@ -43,9 +43,9 @@ namespace BBWY.Client.Models.APIModel.Request
         /// </summary>
         public BarcodeLabelModel LabelModel { get;  set; }
 
-        ///// <summary>
-        ///// 型号
-        ///// </summary>
-        //public string ModelNo { get; set; }
+        /// <summary>
+        /// 店铺名 
+        /// </summary>
+        public string ShopName { get; set; }
     }
 }

BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs

@@ -419,7 +419,7 @@ namespace BBWY.Client.Models
                     Brand = productApiResponse.Data.Items[0].BrandName;
 
                 }
-                var productSku = packTaskService.GetProductSku(skuid);
+                var productSku = packTaskService.SearchProduct(skuid);
                 if (productSku == null || !productSku.Success)
                 {
 
@@ -452,6 +452,10 @@ namespace BBWY.Client.Models
                     BarCodeModel = new BarCodeModel();
                     IsSetBarCode = true;
                 }
+                if (BarCodeModel.LabelModel== BarcodeLabelModel.无型号模板)
+                {
+                    BarCodeModel.LabelModel = BarcodeLabelModel.精简模板;
+                }
                 BarCodeModel.Brand = Brand;
                 if (!string.IsNullOrEmpty(BrandName))
                     BarCodeModel.BrandName = BrandName;

BBWY.Client/Models/PackTask/BarCodeModel.cs

@@ -49,23 +49,16 @@ namespace BBWY.Client.Models
         public string SkuId { get => skuId; set { Set(ref skuId, value); } }
 
 
-        private string modelNo;
-        /// <summary>
-        /// 型号
-        /// </summary>
-        public string ModelNo { get => modelNo; set { Set(ref modelNo, value); } }
-
- 
-
-
         private BarcodeLabelModel labelModel= BarcodeLabelModel.精简模板;
         /// <summary>
         /// 模板标签
         /// </summary>
         public BarcodeLabelModel LabelModel { get => labelModel; set { Set(ref labelModel, value); } }
 
-
-
+        /// <summary>
+        /// 店铺名
+        /// </summary>
+        public string ShopName { get; set; }
 
     }
 }

BBWY.Client/Models/PackTask/PackTaskModel.cs

@@ -6,6 +6,7 @@ using BBWY.Client.ViewModels.PackTask;
 using BBWY.Client.Views.PackTask;
 using BBWY.Client.Views.QualityTask;
 using GalaSoft.MvvmLight.Command;
+using NPOI.Util;
 using System;
 using System.Collections.Generic;
 
@@ -101,7 +102,7 @@ namespace BBWY.Client.Models
                 return;
             }
             LookCerWindow lookCerWindow = new LookCerWindow(CertificateModel);
-            lookCerWindow.Show();
+            lookCerWindow.ShowDialog();
         }
 
 
@@ -117,15 +118,7 @@ namespace BBWY.Client.Models
                 return;
             }
             LookBarCodeWindow look = new LookBarCodeWindow();
-            look.SetData(new BarCodeModel
-            {
-                Brand = BarCodeModel.Brand,
-                BrandName = BarCodeModel.BrandName,
-                LabelModel = BarCodeModel.LabelModel,
-                ProductNo = BarCodeModel.ProductNo,
-                SkuId = BarCodeModel.SkuId,
-                SkuName = BarCodeModel.SkuName
-            });
+            look.SetData(BarCodeModel.Copy());
             look.Show();
         }
 
@@ -141,7 +134,7 @@ namespace BBWY.Client.Models
             printWindow.CertificateModel = certificateModel;
             printWindow.LoadData();
             //printWindow.Datas = LoadCerLabelModels();
-            printWindow.Show();
+            printWindow.ShowDialog();
         }
 
         /// <summary>
@@ -163,11 +156,12 @@ namespace BBWY.Client.Models
                 LabelModel = BarCodeModel.LabelModel,
                 ProductNo = BarCodeModel.ProductNo,
                 SkuId = BarCodeModel.SkuId,
-                SkuName = BarCodeModel.SkuName
+                SkuName = BarCodeModel.SkuName,
+                ShopName = BarCodeModel.ShopName
             };
             printWindow.LoadData();
             //printWindow.Datas = LoadBarLabelModels();
-            printWindow.Show();
+            printWindow.ShowDialog();
         }
 
 

BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs

@@ -871,7 +871,7 @@ namespace BBWY.Client.ViewModels.PackTask
                     Brand = productApiResponse.Data.Items[0].BrandName;
 
                 }
-                var productSku = packTaskService.GetProductSku(searchSkuId);
+                var productSku = packTaskService.SearchProduct(searchSkuId);
                 if (productSku == null || !productSku.Success)
                 {
                     IsLoading = false;
@@ -942,6 +942,10 @@ namespace BBWY.Client.ViewModels.PackTask
                     BarCodeModel = new BarCodeModel();
                     IsSetBarCode = true;
                 }
+                if (BarCodeModel.LabelModel == BarcodeLabelModel.无型号模板)
+                {
+                    BarCodeModel.LabelModel = BarcodeLabelModel.精简模板;
+                }
                 BarCodeModel.Brand = Brand;
                 if (!string.IsNullOrEmpty(BrandName))
                     BarCodeModel.BrandName = BrandName;

BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs

@@ -384,6 +384,7 @@ namespace BBWY.Client.ViewModels.PackTask
                 BarCodeModel.Brand = Brand;
                 BarCodeModel.SkuId = SkuId;
                 BarCodeModel.SkuName = SkuName;
+                BarCodeModel.ShopName = globalContext.User.Shop.ShopName;
             }
             if (!string.IsNullOrEmpty(BrandName))
                 BarCodeModel.BrandName = BrandName;
@@ -491,7 +492,7 @@ namespace BBWY.Client.ViewModels.PackTask
                     Brand = productApiResponse.Data.Items[0].BrandName;
 
                 }
-                var productSku = packTaskService.GetProductSku(skuid);
+                var productSku = packTaskService.SearchProduct(skuid);
                 if (productSku == null || !productSku.Success || productSku.Data == null)
                     return;
                 if (TaskId <= 0)
@@ -521,6 +522,9 @@ namespace BBWY.Client.ViewModels.PackTask
                 {
                     BarCodeModel = new BarCodeModel();
                 }
+                if (BarCodeModel.LabelModel == BarcodeLabelModel.无型号模板)
+                    BarCodeModel.LabelModel = BarcodeLabelModel.精简模板;
+
                 BarCodeModel.Brand = Brand;
                 if (!string.IsNullOrEmpty(BrandName))
                     BarCodeModel.BrandName = BrandName;

BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs

@@ -283,7 +283,7 @@ namespace BBWY.Client.ViewModels.PackTask
             var id = (long)paramList[0];
             var markMsg = paramList[1].ToString();
             SubmitOverTimeMarkMsgWindow submitOverTimeMarkMsgWindow = new SubmitOverTimeMarkMsgWindow(OverTimeTaskType.待落仓, id, markMsg, packTaskService, ReflashTask) ;
-            submitOverTimeMarkMsgWindow.Show();
+            submitOverTimeMarkMsgWindow.ShowDialog();
         }
 
         private void SetFallWareConfigured(object obj)
@@ -338,7 +338,7 @@ namespace BBWY.Client.ViewModels.PackTask
 
 
             SealBoxConfigureWindow sealBoxConfigureWindow = new SealBoxConfigureWindow(updateSealBoxConfig.Data.UpdateSealBoxConfiguredTaskDatas, ReflashTask, sealBoxId);
-            sealBoxConfigureWindow.Show();
+            sealBoxConfigureWindow.ShowDialog();
         }
 
         private void ConfiguredSealBox()
@@ -374,7 +374,7 @@ namespace BBWY.Client.ViewModels.PackTask
                 return;
             }
             SealBoxConfigureWindow sealBoxConfigureWindow = new SealBoxConfigureWindow(updateSealBoxConfig.Data.UpdateSealBoxConfiguredTaskDatas, ReflashTask, 0);
-            sealBoxConfigureWindow.Show();
+            sealBoxConfigureWindow.ShowDialog();
 
 
         }
@@ -536,7 +536,7 @@ namespace BBWY.Client.ViewModels.PackTask
                     try
                     {
                         PackTaskList = new ObservableCollection<PackTaskModel>();//初始化数据
-                        var datas = packTaskService.GetTaskList(SearchSkuId, SearchTaskId,SearchSpuId,SearchOrderSn, this.TaskState,
+                        var datas = packTaskService.SearchTaskList(SearchSkuId, SearchTaskId, this.TaskState,
                             PageIndex, PageSize);
                         if (datas != null && datas.Data != null && datas.Success)
                         {
@@ -596,6 +596,8 @@ namespace BBWY.Client.ViewModels.PackTask
                                 if (item.BarCodeDTO != null && item.BarCodeDTO.Id > 0)
                                 {
                                     data.BarCodeModel = item.BarCodeDTO;
+                                    if (data.BarCodeModel.LabelModel == BarcodeLabelModel.无型号模板)
+                                        data.BarCodeModel.LabelModel = BarcodeLabelModel.精简模板;
                                 }
                                 if (item.Cers != null)
                                 {
@@ -1032,7 +1034,7 @@ namespace BBWY.Client.ViewModels.PackTask
         public void CreateTask()
         {
             PublishTaskWindow publish = new PublishTaskWindow(ReflashTask);
-            publish.Show();
+            publish.ShowDialog();
         }
 
         /// <summary>

BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs

@@ -435,7 +435,7 @@ namespace BBWY.Client.ViewModels.PackTask
             }
 
             SubmitOverTimeMarkMsgWindow submitOverTimeMarkMsgWindow = new SubmitOverTimeMarkMsgWindow(overTimeTaskType, id, markMsg, packTaskService, ReflashTask);
-            submitOverTimeMarkMsgWindow.Show();
+            submitOverTimeMarkMsgWindow.ShowDialog();
         }
 
         private void LookLSOrderConfigure(object obj)
@@ -487,7 +487,7 @@ namespace BBWY.Client.ViewModels.PackTask
             var totalPageIndex = data.GetWareLSOrderPurchases.Count() % 10 == 0 ? data.GetWareLSOrderPurchases.Count() / 10 : data.GetWareLSOrderPurchases.Count() / 10 + 1;
 
             WareLSAcceptOrderWindow wareLSAcceptOrderWindow = new WareLSAcceptOrderWindow(lsdTaskMsg, lookData, 1, totalPageIndex, model.BoxConfigureData.PrewOrder);
-            wareLSAcceptOrderWindow.Show();
+            wareLSAcceptOrderWindow.ShowDialog();
         }
 
         private void PrintLSOrderConfigure(object obj)
@@ -691,14 +691,14 @@ namespace BBWY.Client.ViewModels.PackTask
             if (fallware.WareType == WareType.京仓)
             {
                 SetJDWareBoxWindow window = new SetJDWareBoxWindow(model);
-                window.Show();
+                window.ShowDialog();
                 //var w = new SetJDWareBoxWindow2(model, sealBoxService, fallware.WareType, ReflashTask, false);
                 //w.ShowDialog();
             }
             if (fallware.WareType == WareType.云仓 || fallware.WareType == WareType.聚水潭齐越仓)
             {
                 SetCloudWareBoxWindow window = new SetCloudWareBoxWindow(model, fallware.WareType);
-                window.Show();
+                window.ShowDialog();
             }
 
         }
@@ -1343,7 +1343,7 @@ namespace BBWY.Client.ViewModels.PackTask
 
                     PackTaskList = new ObservableCollection<PackTaskModel>();//初始化数据
 
-                    var datas = packTaskService.GetWareHouseList(SearchWayBillNo, SearchExpressName, SearchDepartment, SearchSkuId, SearchTaskId, this.TaskState, SearchShopName,
+                    var datas = packTaskService.SearchTaskList(SearchWayBillNo, SearchExpressName, SearchDepartment, SearchSkuId, SearchTaskId, this.TaskState, SearchShopName,
                         PageIndex, PageSize);
                     if (datas != null && datas.Data != null && datas.Success)
                     {
@@ -1411,6 +1411,8 @@ namespace BBWY.Client.ViewModels.PackTask
                             {
                                 
                                 data.BarCodeModel = item.BarCodeDTO;
+                                if (data.BarCodeModel.LabelModel == BarcodeLabelModel.无型号模板)
+                                    data.BarCodeModel.LabelModel = BarcodeLabelModel.精简模板;
 
                             }
                             if (item.Cers != null)

BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs

@@ -482,6 +482,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);

BBWY.Client/Views/PackTask/BarcodeControl.xaml

@@ -9,28 +9,27 @@
     <Grid DataContext="{Binding RelativeSource={RelativeSource Mode=FindAncestor,  AncestorType={x:Type local:BarcodeControl}}}">
         <DockPanel Grid.Row="1">
             <Border Name="jingjian" Visibility="{Binding model.LabelModel,Converter={StaticResource objConverter},ConverterParameter=精简模板:Visible:Collapsed}" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="220" Margin="1">
-                <StackPanel Orientation="Vertical">
-                    <TextBlock  Margin="10,25,10,0" FontSize="15" FontWeight="Black"  >
+                <StackPanel Orientation="Vertical"  >
+                    <TextBlock  Margin="10,10,10,5" FontSize="15" FontWeight="Black"  >
                             <Run Text="品名:"/>
-                            <Run Text="{Binding model.BrandName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
+                            <Run Text="{Binding model.BrandName}"/>
                     </TextBlock>
-                    <TextBlock  Margin="10,25,10,0" FontSize="15" FontWeight="Black"  >
+                    <TextBlock  Margin="10,10,10,5" FontSize="15" FontWeight="Black"  >
                              <Run Text="规格:"/>
-                            <Run Text="{Binding model.SkuName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
+                            <Run Text="{Binding model.SkuName}"/>
                     </TextBlock>
-                    <Image Source="/resources/images/barcode.png" Margin="10,25,10,0"/>
+                    <TextBlock  Margin="10,10,10,5" FontSize="15" FontWeight="Black"  >
+                            <Run Text="店铺:"/>
+                            <Run Text="{Binding model.ShopName}"/>
+                    </TextBlock>
+                    <Image Source="/resources/images/barcode.png" Margin="10,10,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}"/>
+                            <Run  Text="{Binding model.SkuId}"/>
                     </TextBlock>
                 </StackPanel>
             </Border>
             <Border Name="biaozhun" Visibility="{Binding model.LabelModel,Converter={StaticResource objConverter},ConverterParameter=标准模板:Visible:Collapsed}" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="220" Margin="1">
                 <StackPanel Orientation="Vertical"  >
-
-                    <TextBlock  Margin="10,10,10,0" FontSize="15" FontWeight="Black"  >
-                            <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}"/>
@@ -43,6 +42,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,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
+                    </TextBlock>
                     <Image Source="/resources/images/barcode.png" Margin="10,10,10,0"/>
                     <TextBlock Text="POP" HorizontalAlignment="Center" Margin="10,0,10,0" FontSize="15" FontWeight="Black"  >
                             <Run  Text="{Binding model.SkuId}"/>
@@ -51,10 +54,7 @@
             </Border>
             <Border Name="wuxinghao" Visibility="{Binding model.LabelModel,Converter={StaticResource objConverter},ConverterParameter=无型号模板:Visible:Collapsed}" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="220" Margin="1">
                 <StackPanel Orientation="Vertical"  >
-                    <TextBlock  Margin="10,10,10,5" FontSize="15" FontWeight="Black"  >
-                            <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}"/>
@@ -63,6 +63,10 @@
                              <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="/resources/images/barcode.png" 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/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/PackTask/SetBarCode.xaml

@@ -8,7 +8,7 @@
         mc:Ignorable="d"
         Style="{StaticResource bwstyle}"
         xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
-        Height="651" Width="577"          
+        Height="380" Width="577"          
         xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
         xmlns:ctr="clr-namespace:BBWY.Client.Converters"
         xmlns:cmodel="clr-namespace:BBWY.Client.Models"
@@ -31,49 +31,44 @@
         </Border>
 
         <Grid Grid.Row="1">
-            <Grid.RowDefinitions>
-                <RowDefinition/>
-                <RowDefinition/>
-            </Grid.RowDefinitions>
+
             <Grid.ColumnDefinitions>
                 <ColumnDefinition/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
             <StackPanel Orientation="Vertical" >
-                <!--{Binding CertificateModel.IsLogo,Converter={StaticResource objConverter},ConverterParameter=1:true:false}-->
-                <RadioButton GroupName="bar"  IsChecked="{Binding BarCodeModel.LabelModel,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:BarcodeLabelModel.精简模板}}"  Command="{Binding BarLabelCheckCommand}" CommandParameter="{x:Static cmodel:BarcodeLabelModel.精简模板}"  Content="精简" Margin="10,10,0,0" Height="30" VerticalAlignment="Top"/>
+
+                <RadioButton  GroupName="bar" IsChecked="{Binding BarCodeModel.LabelModel,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:BarcodeLabelModel.精简模板}}"  Content="精简" Command="{Binding BarLabelCheckCommand}" CommandParameter="{x:Static cmodel:BarcodeLabelModel.精简模板}" Margin="10,10,0,0" Height="30" VerticalAlignment="Top"/>
                 <Border BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="220" Margin="5">
                     <StackPanel Orientation="Vertical"  >
-                        <TextBlock  Margin="10,25,10,0" FontSize="15" FontWeight="Black"  >
+
+
+                        <TextBlock  Margin="10,20,10,10" FontSize="15" FontWeight="Black"  >
                             <Run Text="品名:"/>
-                            <Run Text="{Binding BarCodeModel.BrandName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
+                            <Run Text="{Binding BarCodeModel.BrandName}"/>
                         </TextBlock>
 
-                        <TextBlock  Margin="10,25,10,0" FontSize="15" FontWeight="Black"  >
+                        <TextBlock  Margin="10" FontSize="15" FontWeight="Black"  >
                              <Run Text="规格:"/>
-                            <Run Text="{Binding BarCodeModel.SkuName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
+                            <Run Text="{Binding BarCodeModel.SkuName}"/>
+                        </TextBlock>
+                        <TextBlock  Margin="10,10,10,0" FontSize="15" FontWeight="Black"  >
+                            <Run Text="店铺:"/>
+                            <Run Text="{Binding BarCodeModel.ShopName}"/>
                         </TextBlock>
-                        <Image Source="/resources/images/barcode.png" Margin="10,25,10,0"/>
+                        <Image Source="/resources/images/barcode.png" Margin="10,10,10,0"/>
                         <TextBlock Text="POP" HorizontalAlignment="Center" Margin="10,0,10,0" FontSize="15" FontWeight="Black"  >
-                            <Run  Text="{Binding BarCodeModel.SkuId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
+                            <Run  Text="{Binding BarCodeModel.SkuId}"/>
                         </TextBlock>
-
-
-
-
                     </StackPanel>
                 </Border>
-
             </StackPanel>
             <StackPanel Grid.Column="1" Orientation="Vertical" >
                 <RadioButton  GroupName="bar" IsChecked="{Binding BarCodeModel.LabelModel,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:BarcodeLabelModel.标准模板}}"  Content="标准" Command="{Binding BarLabelCheckCommand}" CommandParameter="{x:Static cmodel:BarcodeLabelModel.标准模板}" Margin="10,10,0,0" Height="30" VerticalAlignment="Top"/>
                 <Border BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="220" Margin="5">
                     <StackPanel Orientation="Vertical"  >
 
-                        <TextBlock  Margin="10,10,10,0" FontSize="15" FontWeight="Black"  >
-                            <Run Text="品牌:"/>
-                            <Run Text="{Binding BarCodeModel.Brand}"/>
-                        </TextBlock>
+                       
                         <TextBlock  Margin="10,10,10,0" FontSize="15" FontWeight="Black"  >
                             <Run Text="品名:"/>
                             <Run Text="{Binding BarCodeModel.BrandName}"/>
@@ -86,6 +81,10 @@
                              <Run Text="规格:"/>
                             <Run Text="{Binding BarCodeModel.SkuName}"/>
                         </TextBlock>
+                        <TextBlock  Margin="10,10,10,0" FontSize="15" FontWeight="Black"  >
+                            <Run Text="店铺:"/>
+                            <Run Text="{Binding BarCodeModel.ShopName}"/>
+                        </TextBlock>
                         <Image Source="/resources/images/barcode.png" Margin="10,10,10,0"/>
                         <TextBlock Text="POP" HorizontalAlignment="Center" Margin="10,0,10,0" FontSize="15" FontWeight="Black"  >
                             <Run  Text="{Binding BarCodeModel.SkuId}"/>
@@ -99,15 +98,12 @@
 
             </StackPanel>
 
-            <StackPanel Grid.Column="0" Grid.Row="1" Orientation="Vertical" >
-                <RadioButton  GroupName="bar" IsChecked="{Binding BarCodeModel.LabelModel,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:BarcodeLabelModel.无型号模板}}"  Content="无型号" Command="{Binding BarLabelCheckCommand}" CommandParameter="{x:Static cmodel:BarcodeLabelModel.无型号模板}" Margin="10,10,0,0" Height="30" VerticalAlignment="Top"/>
+            <!--<StackPanel Grid.Column="0" Grid.Row="0" Orientation="Vertical" >
+                <RadioButton  GroupName="bar" IsChecked="{Binding BarCodeModel.LabelModel,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:BarcodeLabelModel.精简模板}}"  Content="精简" Command="{Binding BarLabelCheckCommand}" CommandParameter="{x:Static cmodel:BarcodeLabelModel.精简模板}" Margin="10,10,0,0" Height="30" VerticalAlignment="Top"/>
                 <Border BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="220" Margin="5">
                     <StackPanel Orientation="Vertical"  >
 
-                        <TextBlock  Margin="10,10,10,0" FontSize="15" FontWeight="Black"  >
-                            <Run Text="品牌:"/>
-                            <Run Text="{Binding BarCodeModel.Brand}"/>
-                        </TextBlock>
+                  
                         <TextBlock  Margin="10,20,10,10" FontSize="15" FontWeight="Black"  >
                             <Run Text="品名:"/>
                             <Run Text="{Binding BarCodeModel.BrandName}"/>
@@ -117,18 +113,18 @@
                              <Run Text="规格:"/>
                             <Run Text="{Binding BarCodeModel.SkuName}"/>
                         </TextBlock>
+                        <TextBlock  Margin="10,10,10,0" FontSize="15" FontWeight="Black"  >
+                            <Run Text="店铺:"/>
+                            <Run Text="{Binding BarCodeModel.ShopName}"/>
+                        </TextBlock>
                         <Image Source="/resources/images/barcode.png" Margin="10,10,10,0"/>
                         <TextBlock Text="POP" HorizontalAlignment="Center" Margin="10,0,10,0" FontSize="15" FontWeight="Black"  >
                             <Run  Text="{Binding BarCodeModel.SkuId}"/>
                         </TextBlock>
-
-
-
-
                     </StackPanel>
                 </Border>
 
-            </StackPanel>
+            </StackPanel>-->
 
         </Grid>
 

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

@@ -60,7 +60,8 @@ namespace BBWY.Client.Views.PackTask
                 ProductNo = BarCodeModel.ProductNo,
                 SkuId = BarCodeModel.SkuId,
                 SkuName = BarCodeModel.SkuName,
-                LabelModel = BarCodeModel.LabelModel
+                LabelModel = BarCodeModel.LabelModel,
+                ShopName = BarCodeModel.ShopName,
 
             });
             if (resData == null)

BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs

@@ -973,7 +973,6 @@ namespace BBWY.Server.Business
             if (payOrderResponse.Success)
             {
                 var order = fsql.Select<PurchaseOrderV2>().Where(p => p.Id == request.OrderId).ToOne();
-
                 fsql.Update<PurchaseOrderV2>(order)
         .Set(a => a.OrderState, payOrderResponse.PurchaseOrderState)
         .ExecuteAffrows();