From e3fc5777052674348bf26fbe218a0f2bf4740975 Mon Sep 17 00:00:00 2001 From: "506583276@qq.com" <506583276@qq.com> Date: Wed, 6 Sep 2023 18:23:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=9A=E5=8A=A1=E7=AB=AF?= =?UTF-8?q?=E5=B0=81=E7=AE=B1=E4=BB=BB=E5=8A=A1=E5=88=9B=E5=BB=BA=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWY.Client/GlobalContext.cs | 2 +- .../Models/APIModel/Request/CerRequest.cs | 4 +- .../Models/SealBox/SealBoxConfiguredModel.cs | 2 + .../SealBox/SealBoxWaitConfigureModel.cs | 2 + .../PackTask/UpdatePurchaseTaskViewModel.cs | 2 +- .../QualityTask/QualityViewModel.cs | 2 +- .../FallWare/FallWareConfiguredControl.xaml | 9 ++- .../FallWareWaitConfigureControl.xaml | 10 +++- .../FallWare/SetJDWareBoxWindow2.xaml.cs | 9 ++- .../PackTask/ShopWaitCompletedControl.xaml | 7 +++ .../QualityTask/QualitySetCerWindow.xaml.cs | 9 ++- .../SealBox/SealBoxConfiguredControl.xaml | 59 ++++++++++--------- .../SealBox/SealBoxWaitConfigureControl.xaml | 18 ++++-- 13 files changed, 92 insertions(+), 43 deletions(-) diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs index bc313f8d..bb586ac3 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 = "10180"; + ClientVersion = "10181"; } private User user; diff --git a/BBWY.Client/Models/APIModel/Request/CerRequest.cs b/BBWY.Client/Models/APIModel/Request/CerRequest.cs index ebd0f15c..eef08d47 100644 --- a/BBWY.Client/Models/APIModel/Request/CerRequest.cs +++ b/BBWY.Client/Models/APIModel/Request/CerRequest.cs @@ -79,6 +79,8 @@ namespace BBWY.Client.Models.APIModel.Request public string PurchaseSkuId { get; set; } public SaveType? SaveType { get; set; } - + + public string OrderId { get; set; } + } } diff --git a/BBWY.Client/Models/SealBox/SealBoxConfiguredModel.cs b/BBWY.Client/Models/SealBox/SealBoxConfiguredModel.cs index 868d4165..eafa994e 100644 --- a/BBWY.Client/Models/SealBox/SealBoxConfiguredModel.cs +++ b/BBWY.Client/Models/SealBox/SealBoxConfiguredModel.cs @@ -77,5 +77,7 @@ namespace BBWY.Client.Models.SealBox /// public TaskState? TaskState { get; set; } + public DateTime? CreateTime { get; set; } + } } diff --git a/BBWY.Client/Models/SealBox/SealBoxWaitConfigureModel.cs b/BBWY.Client/Models/SealBox/SealBoxWaitConfigureModel.cs index 0e1db8a5..e7f1583f 100644 --- a/BBWY.Client/Models/SealBox/SealBoxWaitConfigureModel.cs +++ b/BBWY.Client/Models/SealBox/SealBoxWaitConfigureModel.cs @@ -35,5 +35,7 @@ namespace BBWY.Client.Models public WareType? WareType { get; set; } + public DateTime? CreateTime { get; set; } + } } diff --git a/BBWY.Client/ViewModels/PackTask/UpdatePurchaseTaskViewModel.cs b/BBWY.Client/ViewModels/PackTask/UpdatePurchaseTaskViewModel.cs index 3d255f19..cba17e72 100644 --- a/BBWY.Client/ViewModels/PackTask/UpdatePurchaseTaskViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/UpdatePurchaseTaskViewModel.cs @@ -436,7 +436,7 @@ namespace BBWY.Client.ViewModels.PackTask if (!string.IsNullOrEmpty(BrandName)) model.CerDTO.BrandName = BrandName; - QualitySetCerWindow setCerWindow = new QualitySetCerWindow(false); + QualitySetCerWindow setCerWindow = new QualitySetCerWindow(false,OrderId); setCerWindow.LoadData(model.IsNeedCer, model.CerDTO, packPurchaseTaskService, spuCertificateModel, IsSetSpuCertificate, SaveType); setCerWindow.SaveResult = (s, PackCerState) => { diff --git a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs index 5dae0e15..8e72a7f2 100644 --- a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs +++ b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs @@ -606,7 +606,7 @@ namespace BBWY.Client.ViewModels isNeedClick = model.IsSetCertificate; } - QualitySetCerWindow setCerWindow = new QualitySetCerWindow(isNeedClick); + QualitySetCerWindow setCerWindow = new QualitySetCerWindow(isNeedClick,OrderId); setCerWindow.LoadData(model.IsNeedCer, model.CerDTO, packPurchaseTaskService, spuCertificateModel, IsSetSpuCertificate, saveType); setCerWindow.SaveResult = (s, PackCerState) => { diff --git a/BBWY.Client/Views/FallWare/FallWareConfiguredControl.xaml b/BBWY.Client/Views/FallWare/FallWareConfiguredControl.xaml index 542cc549..56c8d761 100644 --- a/BBWY.Client/Views/FallWare/FallWareConfiguredControl.xaml +++ b/BBWY.Client/Views/FallWare/FallWareConfiguredControl.xaml @@ -174,7 +174,7 @@ Foreground="{StaticResource Text.Link.Color}" FontSize="18" HorizontalAlignment= - + + + + + + + + diff --git a/BBWY.Client/Views/FallWare/FallWareWaitConfigureControl.xaml b/BBWY.Client/Views/FallWare/FallWareWaitConfigureControl.xaml index b4a5f594..e02d2348 100644 --- a/BBWY.Client/Views/FallWare/FallWareWaitConfigureControl.xaml +++ b/BBWY.Client/Views/FallWare/FallWareWaitConfigureControl.xaml @@ -201,7 +201,7 @@ Foreground="{StaticResource Text.Link.Color}" FontSize="18" HorizontalAlignment= - + + + + + + + + + diff --git a/BBWY.Client/Views/FallWare/SetJDWareBoxWindow2.xaml.cs b/BBWY.Client/Views/FallWare/SetJDWareBoxWindow2.xaml.cs index 301b73d7..c6bf04ed 100644 --- a/BBWY.Client/Views/FallWare/SetJDWareBoxWindow2.xaml.cs +++ b/BBWY.Client/Views/FallWare/SetJDWareBoxWindow2.xaml.cs @@ -94,8 +94,15 @@ namespace BBWY.Client.Views.FallWare { - if (wareType == WareType.京仓) + if (wareType == WareType.京仓)//EPL { + + if (!JDWareBoxModel.PurchaseOrder.ToUpper().StartsWith("EPL")) + { + MessageBox.Show("入库采购单号必须以EPL开头"); + return; + } + JDWareBoxModel.PurchaseOrder= JDWareBoxModel.PurchaseOrder.ToUpper(); if (string.IsNullOrEmpty(JDWareBoxModel.ProductTitle) || string.IsNullOrEmpty(JDWareBoxModel.PrewOrder) || string.IsNullOrEmpty(JDWareBoxModel.PurchaseOrder)) diff --git a/BBWY.Client/Views/PackTask/ShopWaitCompletedControl.xaml b/BBWY.Client/Views/PackTask/ShopWaitCompletedControl.xaml index af900616..d2e7e59e 100644 --- a/BBWY.Client/Views/PackTask/ShopWaitCompletedControl.xaml +++ b/BBWY.Client/Views/PackTask/ShopWaitCompletedControl.xaml @@ -217,6 +217,13 @@ Foreground="{StaticResource Text.Link.Color}" FontSize="18" HorizontalAlignment= CommandParameter="{Binding TaskId}" Margin=" 5,0,0,0"/> + + + + + + + @@ -111,8 +111,8 @@ - - + + - + + + + + + + - + - +