diff --git a/BBWY.Client/APIServices/ProductService.cs b/BBWY.Client/APIServices/ProductService.cs index 89219493..1e4fbda8 100644 --- a/BBWY.Client/APIServices/ProductService.cs +++ b/BBWY.Client/APIServices/ProductService.cs @@ -60,5 +60,26 @@ namespace BBWY.Client.APIServices null, HttpMethod.Post); } + + public ApiResponse GetProductList(string spu, string productName, string productItem, int pageIndex, Platform platform, string appKey, string appSecret, string appToken) + { + return SendRequest(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); + } + + } } diff --git a/BBWY.Client/APIServices/QiKu/PackTaskService.cs b/BBWY.Client/APIServices/QiKu/PackTaskService.cs index 367cbb72..3578f34d 100644 --- a/BBWY.Client/APIServices/QiKu/PackTaskService.cs +++ b/BBWY.Client/APIServices/QiKu/PackTaskService.cs @@ -284,6 +284,20 @@ namespace BBWY.Client.APIServices return SendRequest(globalContext.QKApiHost, $"api/PackTask/CompletedPackTask?taskId={taskId}", null, null, HttpMethod.Post); } + /// + /// 获取B端物流信息 + /// + /// + /// + /// + public ApiResponse> GetPurchaseExpressOrderList(string orderId,string sourceSkuId) + { + return SendRequest>("http://bbwyb.qiyue666.com", $"Api/Order/GetPurchaseExpressOrderList", new { + orderId, + sourceSkuId + }, null, HttpMethod.Post); + } + } public class CompeteSealBox diff --git a/BBWY.Client/App.xaml.cs b/BBWY.Client/App.xaml.cs index 81e519b5..701e1eb0 100644 --- a/BBWY.Client/App.xaml.cs +++ b/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"; diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs index 106752ce..b16184dc 100644 --- a/BBWY.Client/GlobalContext.cs +++ b/BBWY.Client/GlobalContext.cs @@ -45,6 +45,8 @@ namespace BBWY.Client public string _1688ApiHost { get; set; } public string QKApiHost { get; set; } + + #endregion #region Web diff --git a/BBWY.Client/Helpers/ExpressOrderHelper.cs b/BBWY.Client/Helpers/ExpressOrderHelper.cs new file mode 100644 index 00000000..818e4835 --- /dev/null +++ b/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 "未知"; + } + } +} diff --git a/BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs b/BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs index 6031094d..b09999ff 100644 --- a/BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs +++ b/BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs @@ -181,10 +181,10 @@ namespace BBWY.Client.Models.APIModel public DateTime? PackCompletionOverTime { get; set; } - /// - /// 物流信息 - /// - public List ExpressOrderList { get; set; } + ///// + ///// 物流信息 + ///// + //public List ExpressOrderList { get; set; } } public class ExpressOrderResponse { diff --git a/BBWY.Client/Models/PackTask/PackTaskModel.cs b/BBWY.Client/Models/PackTask/PackTaskModel.cs index 96416289..9be54967 100644 --- a/BBWY.Client/Models/PackTask/PackTaskModel.cs +++ b/BBWY.Client/Models/PackTask/PackTaskModel.cs @@ -419,7 +419,17 @@ namespace BBWY.Client.Models /// 物流信息 /// public List ExpressOrderList { get; set; } - + + /// + /// 需求方店铺id + /// + private string shopName; + /// + /// 需求方店铺id + /// + public string ShopName { get => shopName; set { Set(ref shopName, value); } } + + } public class SkuMessage : NotifyObject @@ -455,16 +465,6 @@ namespace BBWY.Client.Models /// public string BrandName { get => brandName; set { Set(ref brandName, value); } } - /// - /// 需求方店铺id - /// - private string shopName; - /// - /// 需求方店铺id - /// - public string ShopName { get => shopName; set { Set(ref shopName, value); } } - - /// /// 货号 /// diff --git a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs index a6e6e48f..948bd455 100644 --- a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs @@ -532,7 +532,7 @@ namespace BBWY.Client.ViewModels.PackTask ItemList = new List() { 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; diff --git a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs index 48725492..efc3d6c4 100644 --- a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs +++ b/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(); - 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() { 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) { diff --git a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs index 4742911a..c2dec7f5 100644 --- a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs +++ b/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; + + 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; @@ -824,6 +826,7 @@ namespace BBWY.Client.ViewModels SkuTitle = model.SkuTitle; BasicPack = model.BasicPack; CertificatePosition = model.CertificatePosition; + ArrivalQuantity = 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; + } + + } + } diff --git a/BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml b/BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml index 3dd41984..92c88518 100644 --- a/BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml +++ b/BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml @@ -120,9 +120,9 @@ Margin=" 5,0,0,0"/> - diff --git a/BBWY.Client/Views/PackTask/WaitPackageControl.xaml b/BBWY.Client/Views/PackTask/WaitPackageControl.xaml index fe05e0d4..281fe2ee 100644 --- a/BBWY.Client/Views/PackTask/WaitPackageControl.xaml +++ b/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 @@ + - - + + @@ -50,11 +51,12 @@ - - - - - + + + + + + @@ -96,9 +98,10 @@ + - - + + @@ -123,9 +126,9 @@ Margin=" 5,0,0,0"/> - @@ -164,12 +167,12 @@ + - - + + - - - - - - + @@ -410,7 +415,7 @@ - + @@ -428,7 +433,7 @@ - + - + diff --git a/BBWY.Client/Views/PackTask/WareHouseList.xaml b/BBWY.Client/Views/PackTask/WareHouseList.xaml index fb02bcea..9f6a5fde 100644 --- a/BBWY.Client/Views/PackTask/WareHouseList.xaml +++ b/BBWY.Client/Views/PackTask/WareHouseList.xaml @@ -137,7 +137,6 @@