合并

BBWY.Client/APIServices/ProductService.cs

@@ -60,5 +60,26 @@ namespace BBWY.Client.APIServices
                                                   null,
                                                   HttpMethod.Post);
         }
+
+        public ApiResponse<ProductListResponse> GetProductList(string spu, string productName, string productItem, int pageIndex, Platform platform, string appKey, string appSecret, string appToken)
+        {
+            return SendRequest<ProductListResponse>(globalContext.BBYWApiHost,
+                                                    "api/product/GetProductList",
+                                                    new
+                                                    {
+                                                        Spu = spu,
+                                                        ProductName = productName,
+                                                        ProductItem = productItem,
+                                                        PageIndex = pageIndex,
+                                                        Platform = platform,
+                                                        AppKey = appKey,
+                                                        AppSecret = appSecret,
+                                                        AppToken = appToken
+                                                    },
+                                                    null,
+                                                    HttpMethod.Post);
+        }
+
+       
     }
 }

BBWY.Client/APIServices/QiKu/PackTaskService.cs

@@ -284,6 +284,20 @@ namespace BBWY.Client.APIServices
             return SendRequest<bool>(globalContext.QKApiHost, $"api/PackTask/CompletedPackTask?taskId={taskId}", null, null, HttpMethod.Post);
         }
 
+        /// <summary>
+        /// 获取B端物流信息
+        /// </summary>
+        /// <param name="orderId"></param>
+        /// <param name="sourceSkuId"></param>
+        /// <returns></returns>
+        public ApiResponse<List< ExpressOrderResponse>> GetPurchaseExpressOrderList(string orderId,string sourceSkuId)
+        {
+            return SendRequest<List<ExpressOrderResponse>>("http://bbwyb.qiyue666.com", $"Api/Order/GetPurchaseExpressOrderList", new {
+                orderId,
+                sourceSkuId
+            }, null, HttpMethod.Post);
+        }
+
     }
 
     public class CompeteSealBox

BBWY.Client/App.xaml.cs

@@ -50,10 +50,10 @@ namespace BBWY.Client
 
 #if DEBUG
             //仓库组测试
-            // userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjM1OTMyMDAyMjcwMDU2NDQ4IiwidGVhbUlkIjoiMTU0MDg4NTU3MDYyNzA0NzQyNCIsInNvblRlYW1JZHMiOiIxNTQwODg1NTcwNjI3MDQ3NDI0IiwiZXhwIjoxNzEwNDk2NTQ1fQ.Sx2vGJcYGf98x99slQLU3vt7yWdjspptSpbUCcZgWek";
+             userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjM1OTMyMDAyMjcwMDU2NDQ4IiwidGVhbUlkIjoiMTU0MDg4NTU3MDYyNzA0NzQyNCIsInNvblRlYW1JZHMiOiIxNTQwODg1NTcwNjI3MDQ3NDI0IiwiZXhwIjoxNzEwNDk2NTQ1fQ.Sx2vGJcYGf98x99slQLU3vt7yWdjspptSpbUCcZgWek";
 
             //齐越山鸡
-            userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw";
+            //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw";
 
             //刷单组测试
             //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTcxODUyODE0OTAzMTUyNjQwIiwidGVhbUlkIjoiMTU3MTg1MjQ1MDI5NjUwMDIyNCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE2OTUxNDc2ODh9.hVupdHnhgHHGo3QrMSDqhINqtq6Q5_RovWyXjiMkkEs";

BBWY.Client/GlobalContext.cs

@@ -45,6 +45,8 @@ namespace BBWY.Client
         public string _1688ApiHost { get; set; }
 
         public string QKApiHost { get; set; }
+
+
         #endregion
 
         #region Web

BBWY.Client/Helpers/ExpressOrderHelper.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using WebSocketSharp;
+
+namespace BBWY.Client.Helpers
+{
+    public class ExpressOrderHelper
+    {
+        public static string GetExpressStateName(string expressState)
+        {
+            if (expressState.IsNullOrEmpty())
+                return null;
+            if (expressState == "ZaiTu")
+                return "运输中";
+            if (expressState == "LanShou")
+                return "已揽收";
+            if (expressState == "QianShou")
+                return "已签收";
+            if (expressState == "PaiJian")
+                return "正在派件";
+            if (expressState == "Unknow")
+                return "未知";
+            return "未知";
+        }
+    }
+}

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

@@ -181,10 +181,10 @@ namespace BBWY.Client.Models.APIModel
         public DateTime? PackCompletionOverTime { get; set; }
 
 
-        /// <summary>
+        ///// <summary>
-        /// 物流信息
+        ///// 物流信息
-        /// </summary>
+        ///// </summary>
-        public List<ExpressOrderResponse> ExpressOrderList { get; set; }
+        //public List<ExpressOrderResponse> ExpressOrderList { get; set; }
     }
     public class ExpressOrderResponse
     {

BBWY.Client/Models/PackTask/PackTaskModel.cs

@@ -420,6 +420,16 @@ namespace BBWY.Client.Models
         /// </summary>
         public List<ExpressOrderResponse> ExpressOrderList { get; set; }
 
+        /// <summary>
+        /// 需求方店铺id
+        /// </summary>
+        private string shopName;
+        /// <summary>
+        /// 需求方店铺id
+        /// </summary>
+        public string ShopName { get => shopName; set { Set(ref shopName, value); } }
+
+
     }
 
     public class SkuMessage : NotifyObject
@@ -455,16 +465,6 @@ namespace BBWY.Client.Models
         /// </summary>
         public string BrandName { get => brandName; set { Set(ref brandName, value); } }
 
-        /// <summary>
-        /// 需求方店铺id
-        /// </summary>
-        private string shopName;
-        /// <summary>
-        /// 需求方店铺id
-        /// </summary>
-        public string ShopName { get => shopName; set { Set(ref shopName, value); } }
-
-
         /// <summary>
         /// 货号
         /// </summary>

BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs

@@ -532,7 +532,7 @@ namespace BBWY.Client.ViewModels.PackTask
                                     ItemList = new List<SkuMessage>() { new SkuMessage
                             {    BrandName = item.BrandName,
                                  GoodsNo = item.ProductItemNum, Logo= item.Logo,
-                                 ShopName = item.ShopName, SkuName = item.SkuName,
+                                  SkuName = item.SkuName,
                                   SkuId = item.SkuId
 
                             } },
@@ -550,9 +550,27 @@ namespace BBWY.Client.ViewModels.PackTask
                                     TaskState = item.TaskState,
                                     QualityCompletionOverTime = item.QualityCompletionOverTime,
                                     PackCompletionOverTime = item.PackCompletionOverTime,
-                                    ExpressOrderList = item.ExpressOrderList,
+                                    ShopName = item.ShopName,
                                     // IsWorry = (Worry)item.IsWorry,
                                 };
+
+                                if (!item.OrderId.IsNullOrEmpty() && !item.SkuId.IsNullOrEmpty())//加载物流信息
+                                {
+                                    var expressData = packTaskService.GetPurchaseExpressOrderList(item.OrderId, item.SkuId);
+                                    if (expressData != null && expressData.Success && expressData.Data != null)
+                                    {
+                                        expressData.Data.ForEach(e => {
+                                            e.ExpressState = ExpressOrderHelper.GetExpressStateName(e.ExpressState);
+
+
+                                        });
+
+                                        data.ExpressOrderList = expressData.Data;
+
+
+
+                                    }
+                                }
                                 if (item.BarCodeDTO != null && item.BarCodeDTO.Id > 0)
                                 {
                                     data.BarCodeModel = item.BarCodeDTO;

BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs

@@ -26,6 +26,7 @@ using BBWY.Client.Views.FallWare;
 using BBWY.Client.Models.FallWare;
 using WebSocketSharp;
 using System.Threading;
+using BBWY.Client.Helpers;
 
 namespace BBWY.Client.ViewModels.PackTask
 {
@@ -738,7 +739,6 @@ namespace BBWY.Client.ViewModels.PackTask
                 Task.Factory.StartNew(() =>
                 {
                     WaitTransportList = new ObservableCollection<WareWaitTransport>();
-
                     var datas = sealBoxService.GetWareWaitTransportList(SelectWareType, PageSize, PageIndex);
                     if (datas != null && datas.Data != null && datas.Success)
                     {
@@ -746,7 +746,6 @@ namespace BBWY.Client.ViewModels.PackTask
                         OrderCount = dataModel.TotalCount;
                         foreach (var item in dataModel.WareWaitTransports)
                         {
-
                             App.Current.Dispatcher.BeginInvoke(new Action(() =>
                             {
                                 WaitTransportList.Add(item);
@@ -1000,9 +999,8 @@ namespace BBWY.Client.ViewModels.PackTask
                                 ItemList = new List<SkuMessage>() { new SkuMessage
                             {    BrandName = item.BrandName,
                                  GoodsNo = item.ProductItemNum, Logo= item.Logo,
-                                 ShopName = item.ShopName, SkuName = item.SkuName,
+                                 SkuName = item.SkuName,
                                  SkuId = item.SkuId
-
                             } },
                                 MarkMessage = item.MarkMessage,
                                 PackType = (PackType)item.PackType,
@@ -1018,8 +1016,28 @@ namespace BBWY.Client.ViewModels.PackTask
                                 FloorDragNumber = item.FloorDragNumber,
                                 QualityCompletionOverTime = item.QualityCompletionOverTime,
                                 PackCompletionOverTime = item.PackCompletionOverTime,
-                                ExpressOrderList = item.ExpressOrderList,
+                                ShopName = item.ShopName,
+                                //ExpressOrderList = item.ExpressOrderList,
                             };
+
+                            if (!item.OrderId.IsNullOrEmpty()&&!item.SkuId.IsNullOrEmpty())
+                            {
+                                var expressData = packTaskService.GetPurchaseExpressOrderList(item.OrderId,item.SkuId);
+                                if (expressData!=null&& expressData.Success&&expressData.Data!=null)
+                                {
+                                    expressData.Data.ForEach(e => {
+                                        e.ExpressState=ExpressOrderHelper.GetExpressStateName(e.ExpressState);
+                                        
+
+                                    });
+
+                                    data.ExpressOrderList=expressData.Data;
+
+
+
+                                }
+                            }
+
                             if (item.BarCodeDTO != null && item.BarCodeDTO.Id > 0)
                             {
 

BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs

@@ -709,7 +709,7 @@ namespace BBWY.Client.ViewModels
             if (BarCodeModel == null)
             {
                 var resCode = packPurchaseTaskService.SearchBarCode(SkuId);
-                if (resCode == null)
+                if (resCode == null||!resCode.Success)
                 {
                     BarCodeModel = new BarCodeModel();
                     BarCodeModel.ProductNo = ProductNo;
@@ -719,7 +719,9 @@ namespace BBWY.Client.ViewModels
                 }
                 else
                 {
+              
                         BarCodeModel = resCode.Data;
+              
                 }
 
             }
@@ -816,7 +818,7 @@ namespace BBWY.Client.ViewModels
             Logo = model.ItemList[0].Logo.Replace("80x80", "200x200");
             BrandName = model.ItemList[0].BrandName;
             SkuCount = model.SkuCount;
-            brand = model.Brand;
+            Brand = model.Brand;
             ProductNo = model.ProductNo;
             MarkMessage = model.MarkMessage;
             PackType = model.PackType;
@@ -826,6 +828,7 @@ namespace BBWY.Client.ViewModels
             CertificatePosition = model.CertificatePosition;
         
 
+
             ArrivalQuantity = 0;
             GoodProductQuantity = 0;
 
@@ -923,6 +926,48 @@ namespace BBWY.Client.ViewModels
             }
 
 
+            if (BarCodeModel==null)
+            {
+                //加载品牌品名数据
+                var shopList = globalContext.User.ShopList;
+                var shop = shopList.FirstOrDefault(s => s.ShopName == model.ShopName);
+                if (shop != null)
+                {
+
+                    var skuResponse = productService.GetProductSkuList(string.Empty, SkuId, shop.Platform, shop.AppKey, shop.AppSecret, shop.AppToken);
+                    if (skuResponse.Success)
+                    {
+                        if (skuResponse.Data.Count == 0)
+                        {
+                            return;
+                        }
+                        Logo = skuResponse.Data[0].Logo.Replace("80x80", "200x200");
+                        SkuName = skuResponse.Data[0].Title;
+                        SpuId = skuResponse.Data[0].ProductId;
+                        var productApiResponse = productService.GetProductList(skuResponse.Data[0].ProductId, string.Empty, string.Empty, 1,
+                      shop.Platform, shop.AppKey, shop.AppSecret, shop.AppToken);
+                        if (productApiResponse.Success)
+                        {
+                            if (productApiResponse.Data.Count == 0)
+                            {
+                                return;
+                            }
+
+                            ProductNo = productApiResponse.Data.Items[0].ProductItemNum;
+                            Brand = productApiResponse.Data.Items[0].BrandName;
+
+                        }
+                       
+                    }
+                    else
+                    {
+
+                        App.Current.Dispatcher.Invoke(() => MessageBox.Show(skuResponse.Msg, "加载sku"));
+                        return;
+                    }
+
+                }
+            }
 
 
 

BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml

@@ -120,9 +120,9 @@
                                                                    Margin=" 5,0,0,0"/>
 
                                 <TextBlock VerticalAlignment="Center" Text="店铺:" Margin="14,0,0,0" />
-                                <c:BButton Content="{Binding ItemList[0].ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                <c:BButton Content="{Binding ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
                                                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
-                                                                   CommandParameter="{Binding ItemList[0].ShopName}"
+                                                                   CommandParameter="{Binding ShopName}"
                                                                    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"  />

BBWY.Client/Views/PackTask/WaitPackageControl.xaml

@@ -8,7 +8,7 @@
              xmlns:ctr="clr-namespace:BBWY.Client.Converters"
              xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:cmodel="clr-namespace:BBWY.Client.Models"
-             xmlns:viewmodel="clr-namespace:BBWY.Client.ViewModels.PackTask"
+             xmlns:viewmodel="clr-namespace:BBWY.Client.ViewModels.PackTask"  Background="White"
              xmlns:local="clr-namespace:BBWY.Client.Views.PackTask"
              DataContext="{Binding WareHouseList,Source={StaticResource Locator}}"
              xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
@@ -38,9 +38,10 @@
                 <ColumnDefinition Width="100"/>
                 <ColumnDefinition MinWidth="100"/>
                 <ColumnDefinition Width="150"/>
+                <ColumnDefinition Width="130"/>
                 <ColumnDefinition Width="100"/>
+                <ColumnDefinition Width="120"/>
                 <ColumnDefinition  Width="140"/>
-                <ColumnDefinition  Width="200"/>
                 <ColumnDefinition MinWidth="100"/>
                 <ColumnDefinition Width="120"/>
 
@@ -50,11 +51,12 @@
             <TextBlock Text="组合类型" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
             <TextBlock Text="SKU配件商品" Grid.Column="3" Style="{StaticResource middleTextBlock}"/>
             <TextBlock Text="打包需求" Grid.Column="4"  Style="{StaticResource middleTextBlock}"/>
-            <TextBlock Text="合格证位置"   Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
+            <TextBlock Text="合格证、条形码"   Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
-            <TextBlock Text="服务、耗材费用" Grid.Column="6" Style="{StaticResource middleTextBlock}"/>
+            <TextBlock Text="合格证位置"   Grid.Column="6" Style="{StaticResource middleTextBlock}"/>
-            <TextBlock Text="任务时间" Grid.Column="7" Style="{StaticResource middleTextBlock}"/>
+            <TextBlock Text="服务、耗材费用" Grid.Column="7" Style="{StaticResource middleTextBlock}"/>
-            <TextBlock Text="注意事项/对接备注" Grid.Column="8" Style="{StaticResource middleTextBlock}"/>
+            <TextBlock Text="任务时间" Grid.Column="8" Style="{StaticResource middleTextBlock}"/>
-            <TextBlock Text="操作" Grid.Column="9"   Style="{StaticResource middleTextBlock}"/>
+            <TextBlock Text="注意事项/对接备注" Grid.Column="9" Style="{StaticResource middleTextBlock}"/>
+            <TextBlock Text="操作" Grid.Column="10"   Style="{StaticResource middleTextBlock}"/>
 
 
             <!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>-->
@@ -96,9 +98,10 @@
                                 <ColumnDefinition Width="100"/>
                                 <ColumnDefinition MinWidth="100"/>
                                 <ColumnDefinition Width="150"/>
+                                <ColumnDefinition Width="130"/>
                                 <ColumnDefinition Width="100"/>
+                                <ColumnDefinition Width="120"/>
                                 <ColumnDefinition  Width="140"/>
-                                <ColumnDefinition  Width="200"/>
                                 <ColumnDefinition MinWidth="100"/>
                                 <ColumnDefinition Width="120"/>
 
@@ -123,9 +126,9 @@
                                                                    Margin=" 5,0,0,0"/>
 
                                 <TextBlock VerticalAlignment="Center" Text="店铺:" Margin="14,0,0,0" />
-                                <c:BButton Content="{Binding ItemList[0].ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                <c:BButton Content="{Binding ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
                                                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
-                                                                   CommandParameter="{Binding ItemList[0].ShopName}"
+                                                                   CommandParameter="{Binding ShopName}"
                                                                    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"  />
@@ -164,12 +167,12 @@
                                 <ColumnDefinition Width="100"/>
                                 <ColumnDefinition MinWidth="100"/>
                                 <ColumnDefinition Width="150"/>
+                                <ColumnDefinition Width="130"/>
                                 <ColumnDefinition Width="100"/>
+                                <ColumnDefinition Width="120"/>
                                 <ColumnDefinition  Width="140"/>
-                                <ColumnDefinition  Width="200"/>
                                 <ColumnDefinition MinWidth="100"/>
                                 <ColumnDefinition Width="120"/>
-
                             </Grid.ColumnDefinitions>
                             <ListBox x:Name="listbox_orerSku"   ItemsSource="{Binding ItemList}"
                                          Style="{StaticResource NoScrollViewListBoxStyle}" BorderThickness="0"
@@ -296,10 +299,8 @@
 
                                 </StackPanel>
                             </Grid>
+
                             <Grid Grid.Column="5" >
-                                <TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding CertificatePosition}"/>
-                            </Grid>
-                            <!--<Grid Grid.Column="7" >
                                 <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
                                     <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
                                         <StackPanel Margin="10,5" Orientation="Horizontal"  VerticalAlignment="Center"  HorizontalAlignment="Left" >
@@ -349,6 +350,10 @@
 
                                 </StackPanel>
                             </Grid>
+                            <Grid Grid.Column="6">
+                                <TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding CertificatePosition}"/>
+                            </Grid>
+                            <!--
                             <Grid Grid.Column="8" >
                                 <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
 
@@ -362,7 +367,7 @@
 
                                 </StackPanel>
                             </Grid>-->
-                            <Grid Grid.Column="6">
+                            <Grid Grid.Column="7">
 
                                 <Grid>
 
@@ -410,7 +415,7 @@
                                 </Grid>
                             </Grid>
 
-                            <Grid Grid.Column="7">
+                            <Grid Grid.Column="8">
                                 <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center"
                                             Visibility="{Binding PackRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
                                             >
@@ -428,7 +433,7 @@
                                     </StackPanel>
                                 </StackPanel>
                             </Grid>
-                            <Grid Grid.Column="8" >
+                            <Grid Grid.Column="9" >
                                 <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
                                     <TextBlock 
                                                Text="{Binding MarkMessage}" 
@@ -441,7 +446,7 @@
                             </Grid>
       
                            
-                            <Grid Grid.Column="9" >
+                            <Grid Grid.Column="10" >
                                 <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
 
 

BBWY.Client/Views/PackTask/WareHouseList.xaml

@@ -137,7 +137,6 @@
                     <Button Content="搜索" Width="60" VerticalAlignment="Stretch" Margin="5,0,0,0"
                             Command="{Binding SearchTaskCommand}"
                            Grid.RowSpan="2" Background="{StaticResource Button.Selected.Background}" BorderThickness="0" Foreground="White"/>
-
                 </Grid>
             </Grid>
 
@@ -199,14 +198,12 @@
 
             </StackPanel>
             <Border Grid.Row="2" Margin="0,5,0,0" BorderBrush="{StaticResource Border.Brush}"  BorderThickness="0,1,0,0" />
-            <Border Grid.Row="3" Margin="0,0,0,0" BorderBrush="{StaticResource Border.Brush}"  BorderThickness="0,1,0,0" 
+            <Border Grid.Row="3" Margin="0,0,0,0" BorderBrush="{StaticResource Border.Brush}"  BorderThickness="0,1,0,0" />
 
-                    />
             <Grid Grid.Row="2" Margin="0,5,0,0">
                 <fallware:WareFallWareListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待落仓:Visible:Collapsed}"    />
                 <local:WareHouseListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱|待落仓|待验收|待打包|待转运:Collapsed:Visible}" />
                 <fallware:WareFallWareListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱:Visible:Collapsed}"    />
-
                 <waitquality:WaitQualityControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:Visible:Collapsed}"    />
                 <local:WaitPackageControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:Visible:Collapsed}"  />
                 <waittransport:WareWaitTransportListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待转运:Visible:Collapsed}"  />

BBWY.Client/Views/PackTask/WareHouseListControl.xaml

@@ -120,9 +120,9 @@
                                                                    Margin=" 5,0,0,0"/>
 
                                 <TextBlock VerticalAlignment="Center" Text="店铺:" Margin="14,0,0,0" />
-                                <c:BButton Content="{Binding ItemList[0].ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                <c:BButton Content="{Binding ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
                                                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
-                                                                   CommandParameter="{Binding ItemList[0].ShopName}"
+                                                                   CommandParameter="{Binding ShopName}"
                                                                    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"  />

BBWY.Client/Views/QualityTask/ShopWaitQualityControl.xaml

@@ -118,9 +118,9 @@
                                                                    Margin=" 5,0,0,0"/>
 
                                 <TextBlock VerticalAlignment="Center" Text="店铺:" Margin="14,0,0,0" />
-                                <c:BButton Content="{Binding ItemList[0].ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                <c:BButton Content="{Binding ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
                                                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
-                                                                   CommandParameter="{Binding ItemList[0].ShopName}"
+                                                                   CommandParameter="{Binding ShopName}"
                                                                    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"  />

BBWY.Client/Views/QualityTask/WaitQualityControl.xaml

@@ -118,9 +118,9 @@
                                                                    Margin=" 5,0,0,0"/>
 
                                 <TextBlock VerticalAlignment="Center" Text="店铺:" Margin="14,0,0,0" />
-                                <c:BButton Content="{Binding ItemList[0].ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                <c:BButton Content="{Binding ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
                                                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
-                                                                   CommandParameter="{Binding ItemList[0].ShopName}"
+                                                                   CommandParameter="{Binding ShopName}"
                                                                    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"  />