From 9a44e8de34c872f610c8cc6bbd158e29b812b8b1 Mon Sep 17 00:00:00 2001 From: "506583276@qq.com" <506583276@qq.com> Date: Thu, 29 Jun 2023 22:08:54 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=9B=A2=E9=98=9F?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E6=9F=A5=E7=9C=8B=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Converters/EnumToColorConverter.cs | 15 +- .../Models/SealBox/SealBoxConfiguredModel.cs | 15 + .../SealBox/SealBoxWaitConfigureModel.cs | 2 + .../ViewModels/PackTask/TaskListViewModel.cs | 134 ++++- .../PackTask/ShopWaitPackageControl.xaml | 439 +++++++++++++++++ .../PackTask/ShopWaitPackageControl.xaml.cs | 26 + BBWY.Client/Views/PackTask/TaskList.xaml | 18 +- .../Views/PackTask/TaskListControl.xaml | 216 ++++---- .../Views/PackTask/WareHouseListControl.xaml | 24 +- .../Views/QualityTask/QualityWindow.xaml | 4 +- .../QualityTask/ShopWaitQualityControl.xaml | 460 ++++++++++++++++++ .../ShopWaitQualityControl.xaml.cs | 26 + .../SealBox/SealBoxConfiguredControl.xaml | 45 +- .../SealBox/SealBoxWaitConfigureControl.xaml | 87 ++-- .../WareWaitTransportControl.xaml | 12 +- 15 files changed, 1320 insertions(+), 203 deletions(-) create mode 100644 BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml create mode 100644 BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml.cs create mode 100644 BBWY.Client/Views/QualityTask/ShopWaitQualityControl.xaml create mode 100644 BBWY.Client/Views/QualityTask/ShopWaitQualityControl.xaml.cs diff --git a/BBWY.Client/Converters/EnumToColorConverter.cs b/BBWY.Client/Converters/EnumToColorConverter.cs index dc4d8eb4..fd23ea22 100644 --- a/BBWY.Client/Converters/EnumToColorConverter.cs +++ b/BBWY.Client/Converters/EnumToColorConverter.cs @@ -25,20 +25,15 @@ namespace BBWY.Client.Converters var enumName = Enum.Parse(type, value.ToString()); if (enumName == null) return DependencyProperty.UnsetValue; int enumIndex = (int)enumName; - if ((enumIndex == 0)) + if ((enumIndex == 7)) { - return "#C1FFC1"; + return "#ec808d"; } - if (enumIndex == 1) + if (enumIndex ==6) { - return "#FFDEAD"; + return "#02a7f0"; } - if(enumIndex==2) - { - return "#FFDAB9"; - - } - return enumName; + return "#facd91"; } catch (Exception e) { diff --git a/BBWY.Client/Models/SealBox/SealBoxConfiguredModel.cs b/BBWY.Client/Models/SealBox/SealBoxConfiguredModel.cs index 6ed226b0..3bf7c6f7 100644 --- a/BBWY.Client/Models/SealBox/SealBoxConfiguredModel.cs +++ b/BBWY.Client/Models/SealBox/SealBoxConfiguredModel.cs @@ -8,6 +8,16 @@ namespace BBWY.Client.Models.SealBox { public class SealBoxConfiguredModel:NotifyObject { + + private string sealBoxRemainTime; + public string SealBoxRemainTime { get => sealBoxRemainTime; set { Set(ref sealBoxRemainTime, value); } } + + private bool isSealBoxOverTime; + public bool IsSealBoxOverTime { get => isSealBoxOverTime; set { Set(ref isSealBoxOverTime, value); } } + /// + /// 过期时间 + /// + public DateTime? SealBoxPackOverTime { get; set; } /// /// 封箱id /// @@ -56,5 +66,10 @@ namespace BBWY.Client.Models.SealBox /// public string Logo { get; set; } + /// + /// 任务状态 + /// + public TaskState? TaskState { get; set; } + } } diff --git a/BBWY.Client/Models/SealBox/SealBoxWaitConfigureModel.cs b/BBWY.Client/Models/SealBox/SealBoxWaitConfigureModel.cs index 22bd2083..0508740c 100644 --- a/BBWY.Client/Models/SealBox/SealBoxWaitConfigureModel.cs +++ b/BBWY.Client/Models/SealBox/SealBoxWaitConfigureModel.cs @@ -35,5 +35,7 @@ namespace BBWY.Client.Models /// public TaskState? TaskState { get; set; } + public string BrandName { get; set; } + } } diff --git a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs index 418a559b..a6e6e48f 100644 --- a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs @@ -477,6 +477,9 @@ namespace BBWY.Client.ViewModels.PackTask private bool IsStartThread = false; + private Thread qualityOverTimeThread = null; + private Thread packOverTimeThread = null; + private Thread sealboxOverTimeThread = null; private Thread fallwareOverTimeThread = null; /// /// 搜索任务列表 @@ -545,7 +548,9 @@ namespace BBWY.Client.ViewModels.PackTask BrandName = item.BrandName, OrderId = item.OrderId, TaskState = item.TaskState, - + QualityCompletionOverTime = item.QualityCompletionOverTime, + PackCompletionOverTime = item.PackCompletionOverTime, + ExpressOrderList = item.ExpressOrderList, // IsWorry = (Worry)item.IsWorry, }; if (item.BarCodeDTO != null && item.BarCodeDTO.Id > 0) @@ -582,7 +587,94 @@ namespace BBWY.Client.ViewModels.PackTask })); } + Thread.Sleep(500); + //任务状态为待验收 + var packtasks = PackTaskList.Where(p => p.TaskState == Models.TaskState.待验收 && p.QualityCompletionOverTime != null).ToList(); + if (packtasks.Count() > 0 && TaskState == Models.TaskState.待验收) + { + //if (qualityOverTimeThread!=null) + //{ + // qualityOverTimeThread.Abort(); + //} + + qualityOverTimeThread = new Thread(() => + { + IsStartThread = true; + while (IsStartThread) + { + App.Current.Dispatcher.BeginInvoke(new Action(() => + { + foreach (var item in packtasks) + { + var datetime = item.QualityCompletionOverTime.Value.Subtract(DateTime.Now); + if (datetime.TotalMilliseconds > 0) + { + item.IsQualityOverTime = false; + //item.QualityRemainTime = $"{datetime.Days}天{datetime.Hours}小时{datetime.Minutes}分{datetime.Seconds}秒"; + item.QualityRemainTime = $"{datetime.Days}天{datetime.Hours}小时{datetime.Minutes}分"; + } + else + { + item.IsQualityOverTime = true; + //item.QualityRemainTime = $"{-datetime.Days}天{-datetime.Hours}小时{-datetime.Minutes}分{-datetime.Seconds}秒"; + item.QualityRemainTime = $"{-datetime.Days}天{-datetime.Hours}小时{-datetime.Minutes}分"; + } + + } + })); + Thread.Sleep(1000); + } + + }); + //任务倒计时数据 + qualityOverTimeThread.IsBackground = true; + qualityOverTimeThread.Start(); + + + } + var packCompletedTasks = PackTaskList.Where(p => p.TaskState == Models.TaskState.待打包 && p.PackCompletionOverTime != null).ToList(); + if (packCompletedTasks.Count() > 0 && TaskState == Models.TaskState.待打包) + { + //if (packOverTimeThread!=null) + //{ + // packOverTimeThread.Abort(); + //} + packOverTimeThread = new Thread(() => + { + IsStartThread = true; + while (IsStartThread) + { + App.Current.Dispatcher.BeginInvoke(new Action(() => + { + foreach (var item in packCompletedTasks) + { + var datetime = item.PackCompletionOverTime.Value.Subtract(DateTime.Now); + if (datetime.TotalMilliseconds > 0) + { + item.IsPackOverTime = false; + item.PackRemainTime = $"{datetime.Days}天{datetime.Hours}小时{datetime.Minutes}分"; + } + else + { + item.IsPackOverTime = true; + item.PackRemainTime = $"{-datetime.Days}天{-datetime.Hours}小时{-datetime.Minutes}分"; + } + + } + })); + Thread.Sleep(1000); + } + + }); + //任务倒计时数据 + packOverTimeThread.IsBackground = true; + packOverTimeThread.Start(); + + + } + + //任务状态为待打包 } @@ -662,6 +754,46 @@ namespace BBWY.Client.ViewModels.PackTask SealBoxConfiguredList.Add(item); })); } + + Thread.Sleep(500); + var sealboxTasks = SealBoxConfiguredList.Where(p => p.SealBoxPackOverTime != null).ToList(); + if (sealboxTasks.Count() > 0 && TaskState == Models.TaskState.待封箱) + { + + + sealboxOverTimeThread = new Thread(() => + { + IsStartThread = true; + while (IsStartThread) + { + App.Current.Dispatcher.BeginInvoke(new Action(() => + { + foreach (var item in sealboxTasks) + { + var datetime = item.SealBoxPackOverTime.Value.Subtract(DateTime.Now); + if (datetime.TotalMilliseconds > 0) + { + item.IsSealBoxOverTime = false; + item.SealBoxRemainTime = $"{datetime.Hours}小时{datetime.Minutes}分"; + } + else + { + item.IsSealBoxOverTime = true; + item.SealBoxRemainTime = datetime.Days == 0 ? $"{-datetime.Hours}小时{-datetime.Minutes}分" : $"{-datetime.Days}天{-datetime.Hours}小时{-datetime.Minutes}分"; + } + + } + })); + Thread.Sleep(1000); + } + + }); + //任务倒计时数据 + sealboxOverTimeThread.IsBackground = true; + sealboxOverTimeThread.Start(); + + + } } IsLoadSealBoxCount(); IsLoadCount(); diff --git a/BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml b/BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml new file mode 100644 index 00000000..3dd41984 --- /dev/null +++ b/BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml @@ -0,0 +1,439 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml.cs b/BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml.cs new file mode 100644 index 00000000..7d5638eb --- /dev/null +++ b/BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Text; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace BBWY.Client.Views.PackTask +{ + /// + /// ShopWaitPackageControl.xaml 的交互逻辑 + /// + public partial class ShopWaitPackageControl : UserControl + { + public ShopWaitPackageControl() + { + InitializeComponent(); + } + } +} diff --git a/BBWY.Client/Views/PackTask/TaskList.xaml b/BBWY.Client/Views/PackTask/TaskList.xaml index 43cd76c7..0bacb8ea 100644 --- a/BBWY.Client/Views/PackTask/TaskList.xaml +++ b/BBWY.Client/Views/PackTask/TaskList.xaml @@ -4,6 +4,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:BBWY.Client.Views.PackTask" + xmlns:waitquality="clr-namespace:BBWY.Client.Views.QualityTask" xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls" xmlns:ctr="clr-namespace:BBWY.Client.Converters" xmlns:cmodel="clr-namespace:BBWY.Client.Models" @@ -165,15 +166,22 @@ /> + - - - - + + + + + + - - - - + + + + - - - + - - - - - - - - - - - - + + + + + + + + + + + + @@ -92,16 +90,14 @@ - - - - + + + + - - - + @@ -112,7 +108,10 @@ CommandParameter="{Binding TaskId}" Margin=" 5,0,7,0"/> - - - - - - - + - - - - + + + + - - - + - - @@ -211,7 +198,7 @@ - + @@ -234,16 +221,7 @@ /> - - - - - + @@ -259,7 +237,7 @@ - + - + @@ -286,45 +264,9 @@ - - - - - - - - - - - + + + @@ -369,21 +311,55 @@ - + + + + + + + + + + + + + + + + + - + + - + + + + + + + + - + + + + + + - + - + - + @@ -407,7 +385,7 @@ Style="{StaticResource path_question}" Width="14" Margin="5,0,0,0" Fill="{StaticResource Text.Pink}" ToolTipService.InitialShowDelay="0" - Visibility="{Binding IsShowFees,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed }" + ToolTipService.ShowDuration="20000"> @@ -420,15 +398,13 @@ - - - - - + + + + diff --git a/BBWY.Client/Views/PackTask/WareHouseListControl.xaml b/BBWY.Client/Views/PackTask/WareHouseListControl.xaml index 1c5099db..8c02a93e 100644 --- a/BBWY.Client/Views/PackTask/WareHouseListControl.xaml +++ b/BBWY.Client/Views/PackTask/WareHouseListControl.xaml @@ -32,7 +32,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -108,9 +108,8 @@ Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" CommandParameter="{Binding TaskId}" Margin=" 5,0,7,0"/> - - + + + + + diff --git a/BBWY.Client/Views/QualityTask/QualityWindow.xaml b/BBWY.Client/Views/QualityTask/QualityWindow.xaml index 2c07a5e1..cc317aeb 100644 --- a/BBWY.Client/Views/QualityTask/QualityWindow.xaml +++ b/BBWY.Client/Views/QualityTask/QualityWindow.xaml @@ -37,7 +37,7 @@ - + @@ -474,7 +474,7 @@ - diff --git a/BBWY.Client/Views/QualityTask/ShopWaitQualityControl.xaml b/BBWY.Client/Views/QualityTask/ShopWaitQualityControl.xaml new file mode 100644 index 00000000..5e5fa0a3 --- /dev/null +++ b/BBWY.Client/Views/QualityTask/ShopWaitQualityControl.xaml @@ -0,0 +1,460 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/BBWY.Client/Views/QualityTask/ShopWaitQualityControl.xaml.cs b/BBWY.Client/Views/QualityTask/ShopWaitQualityControl.xaml.cs new file mode 100644 index 00000000..84de3d6d --- /dev/null +++ b/BBWY.Client/Views/QualityTask/ShopWaitQualityControl.xaml.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Text; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace BBWY.Client.Views.QualityTask +{ + /// + /// ShopWaitQualityControl.xaml 的交互逻辑 + /// + public partial class ShopWaitQualityControl : UserControl + { + public ShopWaitQualityControl() + { + InitializeComponent(); + } + } +} diff --git a/BBWY.Client/Views/SealBox/SealBoxConfiguredControl.xaml b/BBWY.Client/Views/SealBox/SealBoxConfiguredControl.xaml index 1dfcd99f..70fa4fd9 100644 --- a/BBWY.Client/Views/SealBox/SealBoxConfiguredControl.xaml +++ b/BBWY.Client/Views/SealBox/SealBoxConfiguredControl.xaml @@ -37,15 +37,16 @@ + - - - - + + + + @@ -84,10 +85,16 @@ + + + + @@ -141,7 +149,7 @@ - + + + + + @@ -201,15 +213,32 @@ + + + + + + + + + + + + - - + - + diff --git a/BBWY.Client/Views/SealBox/SealBoxWaitConfigureControl.xaml b/BBWY.Client/Views/SealBox/SealBoxWaitConfigureControl.xaml index f5a2e238..3ea29b04 100644 --- a/BBWY.Client/Views/SealBox/SealBoxWaitConfigureControl.xaml +++ b/BBWY.Client/Views/SealBox/SealBoxWaitConfigureControl.xaml @@ -36,11 +36,11 @@ - + - + @@ -77,20 +77,26 @@ - + - - + + + + + + - + + + @@ -105,7 +111,7 @@ - + + + + + + + + + - + + + + - - + - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - + + + + + + + diff --git a/BBWY.Client/Views/WaitTransport/WareWaitTransportControl.xaml b/BBWY.Client/Views/WaitTransport/WareWaitTransportControl.xaml index 5a3d68a7..65d04de0 100644 --- a/BBWY.Client/Views/WaitTransport/WareWaitTransportControl.xaml +++ b/BBWY.Client/Views/WaitTransport/WareWaitTransportControl.xaml @@ -92,7 +92,11 @@ - + + - - + Date: Thu, 29 Jun 2023 22:10:34 +0800 Subject: [PATCH 2/9] 10139 --- BBWY.Client/GlobalContext.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs index f5cb2ab6..106752ce 100644 --- a/BBWY.Client/GlobalContext.cs +++ b/BBWY.Client/GlobalContext.cs @@ -13,7 +13,7 @@ namespace BBWY.Client { ShopServiceGroupList = new List(); ShopServiceGroupLowerList = new List(); - ClientVersion = "10138"; + ClientVersion = "10139"; } private User user; From 3715ea5e6916e135d4d42ab6ea860d6e048fd91b Mon Sep 17 00:00:00 2001 From: "506583276@qq.com" <506583276@qq.com> Date: Fri, 30 Jun 2023 15:12:57 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=A9=E6=B5=81?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWY.Client/APIServices/ProductService.cs | 21 ++++++++ .../APIServices/QiKu/PackTaskService.cs | 14 +++++ BBWY.Client/App.xaml.cs | 4 +- BBWY.Client/GlobalContext.cs | 2 + BBWY.Client/Helpers/ExpressOrderHelper.cs | 27 ++++++++++ .../PackTask/SearchTaskListResponse.cs | 8 +-- BBWY.Client/Models/PackTask/PackTaskModel.cs | 22 ++++---- .../ViewModels/PackTask/TaskListViewModel.cs | 22 +++++++- .../PackTask/WareHouseListViewModel.cs | 28 ++++++++-- .../QualityTask/QualityViewModel.cs | 51 +++++++++++++++++-- .../PackTask/ShopWaitPackageControl.xaml | 4 +- .../Views/PackTask/WaitPackageControl.xaml | 50 ++++++++++-------- BBWY.Client/Views/PackTask/WareHouseList.xaml | 12 +++-- .../Views/PackTask/WareHouseListControl.xaml | 4 +- .../QualityTask/ShopWaitQualityControl.xaml | 4 +- .../Views/QualityTask/WaitQualityControl.xaml | 4 +- 16 files changed, 215 insertions(+), 62 deletions(-) create mode 100644 BBWY.Client/Helpers/ExpressOrderHelper.cs 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..88bfc506 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,9 +167,10 @@ + - - + + @@ -296,10 +300,8 @@ - - - - - + @@ -410,7 +416,7 @@ - + @@ -428,7 +434,7 @@ - + - + diff --git a/BBWY.Client/Views/PackTask/WareHouseList.xaml b/BBWY.Client/Views/PackTask/WareHouseList.xaml index fb02bcea..408f7115 100644 --- a/BBWY.Client/Views/PackTask/WareHouseList.xaml +++ b/BBWY.Client/Views/PackTask/WareHouseList.xaml @@ -198,11 +198,13 @@ - - + + + + + + @@ -210,7 +212,7 @@ - + - diff --git a/BBWY.Client/Views/QualityTask/ShopWaitQualityControl.xaml b/BBWY.Client/Views/QualityTask/ShopWaitQualityControl.xaml index 5e5fa0a3..294bd059 100644 --- a/BBWY.Client/Views/QualityTask/ShopWaitQualityControl.xaml +++ b/BBWY.Client/Views/QualityTask/ShopWaitQualityControl.xaml @@ -118,9 +118,9 @@ Margin=" 5,0,0,0"/> - diff --git a/BBWY.Client/Views/QualityTask/WaitQualityControl.xaml b/BBWY.Client/Views/QualityTask/WaitQualityControl.xaml index 17b89124..d320af3b 100644 --- a/BBWY.Client/Views/QualityTask/WaitQualityControl.xaml +++ b/BBWY.Client/Views/QualityTask/WaitQualityControl.xaml @@ -118,9 +118,9 @@ Margin=" 5,0,0,0"/> - From a2817cca51f25f58a88542d609c4a7741f90ae15 Mon Sep 17 00:00:00 2001 From: "506583276@qq.com" <506583276@qq.com> Date: Fri, 30 Jun 2023 15:13:07 +0800 Subject: [PATCH 4/9] 1 --- BBWY.Client/Views/PackTask/WaitPackageControl.xaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/BBWY.Client/Views/PackTask/WaitPackageControl.xaml b/BBWY.Client/Views/PackTask/WaitPackageControl.xaml index 88bfc506..281fe2ee 100644 --- a/BBWY.Client/Views/PackTask/WaitPackageControl.xaml +++ b/BBWY.Client/Views/PackTask/WaitPackageControl.xaml @@ -98,7 +98,7 @@ - + @@ -167,13 +167,12 @@ - + - Date: Fri, 30 Jun 2023 15:14:02 +0800 Subject: [PATCH 5/9] 1 --- BBWY.Client/Views/PackTask/WareHouseList.xaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/BBWY.Client/Views/PackTask/WareHouseList.xaml b/BBWY.Client/Views/PackTask/WareHouseList.xaml index 408f7115..9f6a5fde 100644 --- a/BBWY.Client/Views/PackTask/WareHouseList.xaml +++ b/BBWY.Client/Views/PackTask/WareHouseList.xaml @@ -137,7 +137,6 @@