From 468bed2e964cbaa1a05d2827c8bfbc0ad319ac78 Mon Sep 17 00:00:00 2001 From: "506583276@qq.com" <506583276@qq.com> Date: Fri, 26 May 2023 19:49:08 +0800 Subject: [PATCH 1/5] 1 --- BBWY.Client/GlobalContext.cs | 2 +- .../QualityTask/QualityViewModel.cs | 7 ++-- .../Views/PackTask/WareHouseListControl.xaml | 33 ++++++++++++++----- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs index 19089230..8c304142 100644 --- a/BBWY.Client/GlobalContext.cs +++ b/BBWY.Client/GlobalContext.cs @@ -9,7 +9,7 @@ namespace BBWY.Client { ShopServiceGroupList = new List(); ShopServiceGroupLowerList = new List(); - ClientVersion = "10113"; + ClientVersion = "10114"; } private User user; diff --git a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs index 1c2ad88f..839d9098 100644 --- a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs +++ b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs @@ -137,8 +137,8 @@ namespace BBWY.Client.ViewModels public string SkuId { get => skuId; set { Set(ref skuId, value); } } - - public string OrderId { get; set; } + public string orderId; + public string OrderId { get => orderId; set { Set(ref orderId, value); } } private string logo; /// @@ -614,9 +614,10 @@ namespace BBWY.Client.ViewModels ArrivalQuantity = 0; GoodProductQuantity = 0; - + IncreateList = new ObservableCollection(); string[] increateDatas = model.Increment1?.Split(','); bool isSelected = false; + foreach (var item in increates) { isSelected = false; diff --git a/BBWY.Client/Views/PackTask/WareHouseListControl.xaml b/BBWY.Client/Views/PackTask/WareHouseListControl.xaml index 3af203f9..dc000639 100644 --- a/BBWY.Client/Views/PackTask/WareHouseListControl.xaml +++ b/BBWY.Client/Views/PackTask/WareHouseListControl.xaml @@ -123,9 +123,13 @@ Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" CommandParameter="{Binding DepartmentName}" Margin=" 5,0,0,0"/> - - - + + + + + + + @@ -292,20 +296,33 @@ - + + - + + + - + - + + From 14a9371ff915349777038c71af3d4141c6487692 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Sat, 27 May 2023 00:54:35 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=87=87=E8=B4=ADSKU=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/PurchaseSchemeController.cs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/BBWY.Server.API/Controllers/PurchaseSchemeController.cs b/BBWY.Server.API/Controllers/PurchaseSchemeController.cs index 80ea4cd7..404845b1 100644 --- a/BBWY.Server.API/Controllers/PurchaseSchemeController.cs +++ b/BBWY.Server.API/Controllers/PurchaseSchemeController.cs @@ -81,5 +81,16 @@ namespace BBWY.Server.API.Controllers { return purchaseSchemeBusiness.BatchUpdateQTPurchaseSchemeBelongPurchaser(request); } + + /// + /// 查询采购SKU基本信息 + /// + /// + /// + [HttpPost] + public IList BatchGetPurchaseSkuBasicInfo([FromBody]BatchPurchaseSkuBasicInfoRequest request) + { + return purchaseSchemeBusiness.BatchGetPurchaseSkuBasicInfo(request); + } } } From 51b5ccb9b78eb4b140b94c545a3c4778f9221532 Mon Sep 17 00:00:00 2001 From: "506583276@qq.com" <506583276@qq.com> Date: Sun, 28 May 2023 13:33:45 +0800 Subject: [PATCH 3/5] 1 --- BBWY.Client/BBWYAppSettings.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BBWY.Client/BBWYAppSettings.json b/BBWY.Client/BBWYAppSettings.json index 34888905..ef760e08 100644 --- a/BBWY.Client/BBWYAppSettings.json +++ b/BBWY.Client/BBWYAppSettings.json @@ -4,6 +4,6 @@ "MDSApiHost": "http://mdsapi.qiyue666.com", "JOSApiHost": "", "1688ApiHost": "", - "QKApiHost": "http://localhost:8080" - // "QKApiHost": "http://qiku.qiyue666.com" + // "QKApiHost": "http://localhost:8080" + "QKApiHost": "http://qiku.qiyue666.com" } \ No newline at end of file From 88e8a45af9141083f91ef888341134661034beec Mon Sep 17 00:00:00 2001 From: "506583276@qq.com" <506583276@qq.com> Date: Mon, 29 May 2023 13:50:51 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=89=93=E5=8C=85=E7=AB=AF=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=A1=AE=E8=AE=A4=E6=94=B6=E8=B4=A7=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWY.Client/BBWYAppSettings.json | 4 ++-- .../PackTask/WareHouseListViewModel.cs | 10 ++++++-- .../Views/PackTask/WareHouseListControl.xaml | 23 +++++++++++++++++++ 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/BBWY.Client/BBWYAppSettings.json b/BBWY.Client/BBWYAppSettings.json index ef760e08..0bc0e98f 100644 --- a/BBWY.Client/BBWYAppSettings.json +++ b/BBWY.Client/BBWYAppSettings.json @@ -4,6 +4,6 @@ "MDSApiHost": "http://mdsapi.qiyue666.com", "JOSApiHost": "", "1688ApiHost": "", - // "QKApiHost": "http://localhost:8080" - "QKApiHost": "http://qiku.qiyue666.com" + "QKApiHost": "http://localhost:8080" + // "QKApiHost": "http://qiku.qiyue666.com" } \ No newline at end of file diff --git a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs index 955b182e..14cc413c 100644 --- a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs @@ -341,8 +341,14 @@ namespace BBWY.Client.ViewModels.PackTask switch (packTaskState) { case PackTaskState.未到货: - break; case PackTaskState.部分到货: + + if (System.Windows.MessageBox.Show("是否确认收货?","提示", + MessageBoxButton.YesNo, + MessageBoxImage.Warning) != MessageBoxResult.Yes) + return; + + res = packTaskService.SetPackTaskState(taskId, PackTaskState.待质检); break; case PackTaskState.待质检: break; @@ -498,7 +504,7 @@ namespace BBWY.Client.ViewModels.PackTask { PackTaskList = new ObservableCollection();//初始化数据 - var datas = packTaskService.GetWareHouseList(SearchWayBillNo,SearchExpressName,IsWorry, SearchDepartment, SearchSkuId, SearchTaskId, StartTime, EndTime, (this.TaskState), SearchShopName, + var datas = packTaskService.GetWareHouseList(SearchWayBillNo, SearchExpressName, IsWorry, SearchDepartment, SearchSkuId, SearchTaskId, StartTime, EndTime, (this.TaskState), SearchShopName, PageIndex, PageSize); if (datas != null && datas.Data != null && datas.Success) { diff --git a/BBWY.Client/Views/PackTask/WareHouseListControl.xaml b/BBWY.Client/Views/PackTask/WareHouseListControl.xaml index dc000639..806b6e4e 100644 --- a/BBWY.Client/Views/PackTask/WareHouseListControl.xaml +++ b/BBWY.Client/Views/PackTask/WareHouseListControl.xaml @@ -454,6 +454,29 @@ + + + + + + + + + + + + + + + + + + + From 36a0fefe70a3b7b30ed582d59e44720a2a60d814 Mon Sep 17 00:00:00 2001 From: "506583276@qq.com" <506583276@qq.com> Date: Mon, 29 May 2023 17:10:44 +0800 Subject: [PATCH 5/5] 1 --- 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 8c304142..2af078a4 100644 --- a/BBWY.Client/GlobalContext.cs +++ b/BBWY.Client/GlobalContext.cs @@ -9,7 +9,7 @@ namespace BBWY.Client { ShopServiceGroupList = new List(); ShopServiceGroupLowerList = new List(); - ClientVersion = "10114"; + ClientVersion = "10115"; } private User user;