From e933b23ec9a14723d34e6699421e9a7123dbfbcc Mon Sep 17 00:00:00 2001 From: "506583276@qq.com" <506583276@qq.com> Date: Wed, 1 Nov 2023 10:54:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=85=E7=AB=AF=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=89=93=E5=8D=B0=20=EF=BC=8C=E4=BB=93=E5=BA=93=E7=AB=AF?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=8C=85=E8=A3=85=E8=B4=B9=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=8C=85=E8=A3=85=E6=94=B6=E7=9B=8A=20=E5=B9=B6=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E4=B8=BA0.85=E6=8A=98=E6=89=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWY.Client/App.xaml.cs | 2 +- BBWY.Client/GlobalContext.cs | 11 ++- .../Response/PackTask/FeesItemResponse.cs | 11 +++ .../PackTask/GetPackDetailResponse.cs | 5 ++ .../Models/PackUser/PackerTaskModel.cs | 6 ++ BBWY.Client/ViewModels/MainViewModel.cs | 5 +- .../PackTask/PackDetailViewModel.cs | 16 ++++- .../PackTask/WareHouseListViewModel.cs | 42 +++++++----- .../PackerTask/PackerTaskViewModel.cs | 50 ++++++++++++++ BBWY.Client/Views/MainWindow.xaml | 2 +- .../Views/PackTask/PackDetailWindow.xaml | 4 +- .../Views/PackTask/PackDetailWindow.xaml.cs | 6 +- .../PackerTask/AddOneItemWeightWindow.xaml | 2 +- .../PackerPackCompletedControl.xaml | 67 +++++++++++++++---- .../Views/PackerTask/PackerTaskList.xaml | 2 +- .../PackerTask/PackerWaitPackageControl.xaml | 45 ++++++++++++- 16 files changed, 234 insertions(+), 42 deletions(-) diff --git a/BBWY.Client/App.xaml.cs b/BBWY.Client/App.xaml.cs index d508f4a2..990851d2 100644 --- a/BBWY.Client/App.xaml.cs +++ b/BBWY.Client/App.xaml.cs @@ -68,7 +68,7 @@ namespace BBWY.Client // userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjI0OTUxNjgzNTc2NTAwMjI0IiwidGVhbUlkIjoiMTYyMDM0MjAxNDcwNjk3ODgxNiIsInNvblRlYW1JZHMiOiIxNjIwMzQyMDE0NzA2OTc4ODE2LDE2MjAzNDQxNDA4NTAwMDgwNjQsMTQxMDk1NTYwNDYxMjA5MTkwNCIsImV4cCI6MTcyNDkxNDM5M30.tIgo70tzRxZyUQkX1Jsh9I4ySciX0VC9HMMOoTnwVtM"; //包装组 - userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxMzk1NzA4MjA4NjU1MzcyMjg4IiwidGVhbUlkIjoiMTcxODU0MTA2MzM5NzgzODg0OCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE3MzAyODcxNjh9.lpiLJjP0prtQgZZfpG0NN6n60LNKstbFCJc-nLgb62A"; + /// userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxMzk1NzA4MjA4NjU1MzcyMjg4IiwidGVhbUlkIjoiMTcxODU0MTA2MzM5NzgzODg0OCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE3MzAyODcxNjh9.lpiLJjP0prtQgZZfpG0NN6n60LNKstbFCJc-nLgb62A"; //齐越琳琳 diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs index 0f362b99..6ea5dee6 100644 --- a/BBWY.Client/GlobalContext.cs +++ b/BBWY.Client/GlobalContext.cs @@ -13,11 +13,20 @@ namespace BBWY.Client { ShopServiceGroupList = new List(); ShopServiceGroupLowerList = new List(); - ClientVersion = "10193"; + ClientVersion = "10194"; } + + private string title; + + public string Title { get=> title; set { Set(ref title, value); } } + + + private User user; + + public User User { get => user; set { Set(ref user, value); } } public string UserToken { get; set; } diff --git a/BBWY.Client/Models/APIModel/Response/PackTask/FeesItemResponse.cs b/BBWY.Client/Models/APIModel/Response/PackTask/FeesItemResponse.cs index b74a8b83..27647fa9 100644 --- a/BBWY.Client/Models/APIModel/Response/PackTask/FeesItemResponse.cs +++ b/BBWY.Client/Models/APIModel/Response/PackTask/FeesItemResponse.cs @@ -62,6 +62,17 @@ namespace BBWY.Client.Models.APIModel.Response.PackTask /// public decimal PackFees { get; set; } + + /// + /// 包装人员折扣 + /// + public decimal? PackerDiscount { get; set; } + + /// + /// 包装收益（包装员收益） + /// + public decimal? PackerPackFees { get; set; } + /// /// 增值费用小计(待移除) /// diff --git a/BBWY.Client/Models/APIModel/Response/PackTask/GetPackDetailResponse.cs b/BBWY.Client/Models/APIModel/Response/PackTask/GetPackDetailResponse.cs index fdc49def..b05529bb 100644 --- a/BBWY.Client/Models/APIModel/Response/PackTask/GetPackDetailResponse.cs +++ b/BBWY.Client/Models/APIModel/Response/PackTask/GetPackDetailResponse.cs @@ -7,6 +7,11 @@ namespace BBWY.Client.Models { public class GetPackDetailResponse { + ///// + ///// 打包折扣 + ///// + //public decimal PackDiscount { get; set; } + public string ProcessTypeName { get; set; } public string ProcessComboName { get; set; } diff --git a/BBWY.Client/Models/PackUser/PackerTaskModel.cs b/BBWY.Client/Models/PackUser/PackerTaskModel.cs index 3dff6ca3..64051e5b 100644 --- a/BBWY.Client/Models/PackUser/PackerTaskModel.cs +++ b/BBWY.Client/Models/PackUser/PackerTaskModel.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Text; +using System.Windows.Input; namespace BBWY.Client.Models.PackUser { @@ -39,5 +40,10 @@ namespace BBWY.Client.Models.PackUser /// 展示留言信息 /// public bool ShowMoreMsg { get => showMoreMsg; set { Set(ref showMoreMsg, value); } } + + + + + } } diff --git a/BBWY.Client/ViewModels/MainViewModel.cs b/BBWY.Client/ViewModels/MainViewModel.cs index 204425e7..b7ae82d9 100644 --- a/BBWY.Client/ViewModels/MainViewModel.cs +++ b/BBWY.Client/ViewModels/MainViewModel.cs @@ -329,7 +329,7 @@ namespace BBWY.Client.ViewModels CreateMenu(); - + GlobalContext.Title = GlobalContext.User.Name; try { var res = packTaskExpressService.GetExpressNameList(); @@ -441,6 +441,7 @@ namespace BBWY.Client.ViewModels { Environment.Exit(Environment.ExitCode); } + }); } catch (Exception ex) @@ -502,6 +503,8 @@ namespace BBWY.Client.ViewModels } GlobalContext.User.Shop = shop; + + GlobalContext.Title = GlobalContext.User.Shop.ShopName; //ShowShopChoosePanel = false; Task.Factory.StartNew(GetLogisticsList); if (shop.Platform == Platform.京东) diff --git a/BBWY.Client/ViewModels/PackTask/PackDetailViewModel.cs b/BBWY.Client/ViewModels/PackTask/PackDetailViewModel.cs index 33d5223b..e9317963 100644 --- a/BBWY.Client/ViewModels/PackTask/PackDetailViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/PackDetailViewModel.cs @@ -23,6 +23,7 @@ using System.IO; using BBWY.Client.Models.APIModel; using Org.BouncyCastle.Bcpg; using System.Threading; +using Org.BouncyCastle.Ocsp; namespace BBWY.Client.ViewModels.PackTask { @@ -445,6 +446,13 @@ namespace BBWY.Client.ViewModels.PackTask public string PackUserName { get => packUserName; set { Set(ref packUserName, value); } } + private decimal? packerFee; + /// + /// 包装员费用 + /// + public decimal? PackerFee { get => packerFee; set { Set(ref packerFee, value); } } + + private int incrementPartTaskCount; /// /// 配件任务数量 @@ -674,6 +682,9 @@ namespace BBWY.Client.ViewModels.PackTask } + + + private List productResistantList; public List ProductResistantList { get => productResistantList; set { Set(ref productResistantList, value); } } /// @@ -733,6 +744,7 @@ namespace BBWY.Client.ViewModels.PackTask if (!packDetailRes.Success) { + App.Current.Dispatcher.Invoke(() => { MessageBox.Show(packDetailRes.Msg); @@ -740,8 +752,10 @@ namespace BBWY.Client.ViewModels.PackTask } if (packDetailRes.Success && packDetailRes.Data != null) { + var resData = packDetailRes.Data; + PackProcessType = resData.PackProcessType; switch (PackProcessType) @@ -909,7 +923,7 @@ namespace BBWY.Client.ViewModels.PackTask /// private void UpLoadPack(object obj) { - if (PackUserModelList==null|| PackUserModelList.Count<=0) + if (PackUserModelList == null || PackUserModelList.Count <= 0) { System.Windows.MessageBox.Show("信息不完整,打包人设置有误"); return; diff --git a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs index 141fe8c1..1c10ffc3 100644 --- a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs @@ -26,6 +26,8 @@ using BBWY.Client.Models.SealBox; using Newtonsoft.Json; using System.Diagnostics; using BBWY.Client.Extensions; +using BBWY.Client.APIServices.QiKu; +using BBWY.Client.Views.PackerTask; namespace BBWY.Client.ViewModels.PackTask { @@ -593,7 +595,7 @@ namespace BBWY.Client.ViewModels.PackTask private readonly PackTaskService packTaskService; private readonly SealBoxService sealBoxService; public GlobalContext globalContext; - public WareHouseListViewModel(PackTaskService packTaskService, GlobalContext globalContext, SealBoxService sealBoxService) + public WareHouseListViewModel(PackTaskService packTaskService, GlobalContext globalContext, SealBoxService sealBoxService, PackUserService packUserService) { @@ -684,6 +686,7 @@ namespace BBWY.Client.ViewModels.PackTask LoadTransportSkuDataCommand = new RelayCommand(LoadTransportSkuData); LoadCompletedSkuDataCommand = new RelayCommand(LoadCompletedSkuData); + this.packUserService = packUserService; } private void LoadCompletedSkuData(WareWaitCompleted model) @@ -955,6 +958,7 @@ namespace BBWY.Client.ViewModels.PackTask Task.Factory.StartNew(() => SearchTaskList()); } + PackUserService packUserService; private void CompletedPackTask(object obj) { var model = (PackTaskModel)obj; @@ -964,23 +968,29 @@ namespace BBWY.Client.ViewModels.PackTask System.Windows.MessageBox.Show("请先设置打包费用!"); return; } - if (System.Windows.MessageBox.Show("是否完成打包?", "提示", - MessageBoxButton.YesNo, - MessageBoxImage.Warning) != MessageBoxResult.Yes) - return; - var res = packTaskService.CompletedPackTask(model.TaskId); - if (res == null) - { - return; - } - if (!res.Success) - { - System.Windows.MessageBox.Show(res.Msg); - return; - } + //if (System.Windows.MessageBox.Show("是否完成打包?", "提示", + // MessageBoxButton.YesNo, + // MessageBoxImage.Warning) != MessageBoxResult.Yes) + // return; - Task.Factory.StartNew(() => SearchTaskList()); + AddOneItemWeightWindow addOneItemWeightWindow = new AddOneItemWeightWindow(ReflashTask, packUserService, model.TaskId); + addOneItemWeightWindow.ShowDialog(); + + + //var res = packTaskService.CompletedPackTask(model.TaskId); + //if (res == null) + //{ + // return; + //} + //if (!res.Success) + //{ + // System.Windows.MessageBox.Show(res.Msg); + // return; + //} + + + //Task.Factory.StartNew(() => SearchTaskList()); } private void StoreGetBySelf(long taskId) diff --git a/BBWY.Client/ViewModels/PackerTask/PackerTaskViewModel.cs b/BBWY.Client/ViewModels/PackerTask/PackerTaskViewModel.cs index 6c7cda6c..711d8604 100644 --- a/BBWY.Client/ViewModels/PackerTask/PackerTaskViewModel.cs +++ b/BBWY.Client/ViewModels/PackerTask/PackerTaskViewModel.cs @@ -17,6 +17,7 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; using System.Net.Mail; +using System.Reflection; using System.Text; using System.Threading; using System.Threading.Tasks; @@ -383,8 +384,54 @@ namespace BBWY.Client.ViewModels.PackerTask this.globalContext = globalContext; ShowMoreMessageCommand = new RelayCommand(ShowMoreMessage); + + PrintBarcodeCommand = new RelayCommand(PrintBarcode); + PrintCerCommand = new RelayCommand(PrintCer); + } + + private void PrintCer(CertificateModel[] certificateModel) + { + if (certificateModel == null) + { + new TipsWindow("该任务无设置合格证信息,无法打印!").Show(); + return; + } + PrintWindow printWindow = new PrintWindow(); + + printWindow.CertificateModel = certificateModel; + printWindow.LoadData(); + //printWindow.Datas = LoadCerLabelModels(); + printWindow.ShowDialog(); + } + + /// + /// 打印条形码 + /// + private void PrintBarcode(BarCodeModel BarCodeModel) + { + if (BarCodeModel == null) + { + new TipsWindow("该任务无设置条形码信息,无法打印!").Show(); + return; + } + + PrintWindow printWindow = new PrintWindow(); + printWindow.BarCodeModel = new BarCodeModel + { + Brand = BarCodeModel.Brand, + BrandName = BarCodeModel.BrandName, + LabelModel = BarCodeModel.LabelModel, + ProductNo = BarCodeModel.ProductNo, + SkuId = BarCodeModel.SkuId, + SkuName = BarCodeModel.SkuName, + ShopName = BarCodeModel.ShopName + }; + printWindow.LoadData(); + //printWindow.Datas = LoadBarLabelModels(); + printWindow.ShowDialog(); } + private void ShowMoreMessage(long taskId) { var model = PackerTaskModelList?.SingleOrDefault(p => p.TaskId == taskId); @@ -474,6 +521,9 @@ namespace BBWY.Client.ViewModels.PackerTask public ICommand AppendMarkMessageCommand { get; set; } public ICommand ShowMoreMessageCommand { get; set; } + + public ICommand PrintBarcodeCommand { get; set; } + public ICommand PrintCerCommand { get; set; } public void SetTaskState() { PageIndex = 1; diff --git a/BBWY.Client/Views/MainWindow.xaml b/BBWY.Client/Views/MainWindow.xaml index 612f61f6..4c62d86a 100644 --- a/BBWY.Client/Views/MainWindow.xaml +++ b/BBWY.Client/Views/MainWindow.xaml @@ -9,7 +9,7 @@ DataContext="{Binding Main,Source={StaticResource Locator}}" mc:Ignorable="d" Style="{StaticResource bwstyle}" - Title="{Binding GlobalContext.User.Shop.ShopName,StringFormat=步步为盈 \{0\}}" Height="450" Width="800"> + Title="{Binding GlobalContext.Title}" Height="450" Width="800"> diff --git a/BBWY.Client/Views/PackTask/PackDetailWindow.xaml b/BBWY.Client/Views/PackTask/PackDetailWindow.xaml index 0cc4083f..746b409d 100644 --- a/BBWY.Client/Views/PackTask/PackDetailWindow.xaml +++ b/BBWY.Client/Views/PackTask/PackDetailWindow.xaml @@ -621,8 +621,8 @@ - - + + diff --git a/BBWY.Client/Views/PackTask/PackDetailWindow.xaml.cs b/BBWY.Client/Views/PackTask/PackDetailWindow.xaml.cs index d53bb815..38885f60 100644 --- a/BBWY.Client/Views/PackTask/PackDetailWindow.xaml.cs +++ b/BBWY.Client/Views/PackTask/PackDetailWindow.xaml.cs @@ -65,6 +65,8 @@ namespace BBWY.Client.Views.PackTask serviceViewModel.OrderId = model.OrderId; serviceViewModel.SkuId = model.SkuId; serviceViewModel.PackUserName = model.PackUser?.Replace("\r\n", ",")?.Replace("\n", ",")?.Replace("\r", ","); + + serviceViewModel.PackerFee = model.FeesItemResponse?.PackFees*(model.FeesItemResponse?.PackerDiscount??0.85m) ; serviceViewModel.LoadPackDatas(); if (reflashWindow != null) serviceViewModel.ReflashWindow = reflashWindow; @@ -151,8 +153,6 @@ namespace BBWY.Client.Views.PackTask { try { - - using (HttpClient client = new HttpClient()) { // 发送 HTTP 请求并获取图片数据 @@ -180,8 +180,6 @@ namespace BBWY.Client.Views.PackTask private void DownloadImags(string url) { var client = new HttpClient(); - - var uri = new Uri(Uri.EscapeUriString(url)); byte[] urlContents = client.GetByteArrayAsync(uri).Result; var applicationPath = System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); diff --git a/BBWY.Client/Views/PackerTask/AddOneItemWeightWindow.xaml b/BBWY.Client/Views/PackerTask/AddOneItemWeightWindow.xaml index 6d34ebff..cf8ca2a8 100644 --- a/BBWY.Client/Views/PackerTask/AddOneItemWeightWindow.xaml +++ b/BBWY.Client/Views/PackerTask/AddOneItemWeightWindow.xaml @@ -32,7 +32,7 @@