From d1d809fdd5438badf007e725950ca82f47d742bb Mon Sep 17 00:00:00 2001 From: "506583276@qq.com" <506583276@qq.com> Date: Tue, 9 May 2023 17:00:15 +0800 Subject: [PATCH] 1 --- .../Converters/EnumToColorConverter.cs | 10 +- .../PackTask/CreatePackTaskViewModel.cs | 4 +- BBWY.Client/Views/PackTask/CerControl.xaml | 2 +- BBWY.Client/Views/PackTask/SetBarCode.xaml | 2 +- BBWY.Client/Views/PackTask/SetBarCode.xaml.cs | 29 ++++-- .../Views/PackTask/SetCerControl.xaml.cs | 12 --- BBWY.Client/Views/PackTask/SetCerWindow.xaml | 96 +------------------ .../Views/PackTask/SetSpuCerWindow.xaml | 91 +----------------- 8 files changed, 40 insertions(+), 206 deletions(-) diff --git a/BBWY.Client/Converters/EnumToColorConverter.cs b/BBWY.Client/Converters/EnumToColorConverter.cs index a5c50883..dc4d8eb4 100644 --- a/BBWY.Client/Converters/EnumToColorConverter.cs +++ b/BBWY.Client/Converters/EnumToColorConverter.cs @@ -20,16 +20,20 @@ namespace BBWY.Client.Converters if (value == null) return DependencyProperty.UnsetValue; Assembly assem = Assembly.GetExecutingAssembly(); Type type = assem.GetType(parameter.ToString()); + + var enumName = Enum.Parse(type, value.ToString()); - if (value.ToString() == TaskState.已到货.GetName()) + if (enumName == null) return DependencyProperty.UnsetValue; + int enumIndex = (int)enumName; + if ((enumIndex == 0)) { return "#C1FFC1"; } - if (value.ToString() == "部分到货") + if (enumIndex == 1) { return "#FFDEAD"; } - if (value.ToString() == "未到货") + if(enumIndex==2) { return "#FFDAB9"; diff --git a/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs b/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs index 6a4fee61..16867f10 100644 --- a/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs @@ -483,7 +483,7 @@ namespace BBWY.Client.ViewModels.PackTask //InseartCerCommand = new RelayCommand(InseartCer); //SaveCerCommand = new RelayCommand(SaveCer); - //BarLabelCheckCommand = new RelayCommand(BarLabelCheck); + BarLabelCheckCommand = new RelayCommand(BarLabelCheck); //CerLabelCheckCommand = new RelayCommand(CerLabelCheck); //SpuCerLabelCheckCommand = new RelayCommand(SpuCerLabelCheck); @@ -493,7 +493,7 @@ namespace BBWY.Client.ViewModels.PackTask delayTrigger = new DelayTrigger(500); delayTrigger.OnExecute = OnSearchIncreateKeyWordChanged; - //BarLabelCheck(BarcodeLabelModel.精简模板);//默认精简模式 + BarLabelCheck(BarcodeLabelModel.精简模板);//默认精简模式 } //private void InseartCer() diff --git a/BBWY.Client/Views/PackTask/CerControl.xaml b/BBWY.Client/Views/PackTask/CerControl.xaml index 8da8a66b..594d12da 100644 --- a/BBWY.Client/Views/PackTask/CerControl.xaml +++ b/BBWY.Client/Views/PackTask/CerControl.xaml @@ -38,7 +38,7 @@ - + diff --git a/BBWY.Client/Views/PackTask/SetBarCode.xaml b/BBWY.Client/Views/PackTask/SetBarCode.xaml index c37d61c0..f797d050 100644 --- a/BBWY.Client/Views/PackTask/SetBarCode.xaml +++ b/BBWY.Client/Views/PackTask/SetBarCode.xaml @@ -137,6 +137,6 @@ + Click="BButton_Click" /> diff --git a/BBWY.Client/Views/PackTask/SetBarCode.xaml.cs b/BBWY.Client/Views/PackTask/SetBarCode.xaml.cs index 1a00bf89..32397bc1 100644 --- a/BBWY.Client/Views/PackTask/SetBarCode.xaml.cs +++ b/BBWY.Client/Views/PackTask/SetBarCode.xaml.cs @@ -2,6 +2,7 @@ using BBWY.Client.Models; using BBWY.Client.Models.APIModel.Request; using BBWY.Controls; +using GalaSoft.MvvmLight.Command; using System; using System.Collections.Generic; using System.Text; @@ -19,14 +20,14 @@ namespace BBWY.Client.Views.PackTask /// /// SetBarCode.xaml 的交互逻辑 /// - public partial class SetBarCodeWindow : BWindow + public partial class SetBarCodeWindow : BWindow { public SetBarCodeWindow() { InitializeComponent(); - + BarLabelCheckCommand = new RelayCommand(BarLabelCheck); } - public void LoadData(BarCodeModel barCodeModel,PackTaskService PackTaskService) + public void LoadData(BarCodeModel barCodeModel, PackTaskService PackTaskService) { BarCodeModel = barCodeModel; packTaskService = PackTaskService; this.DataContext = this; @@ -36,6 +37,9 @@ namespace BBWY.Client.Views.PackTask public PackTaskService packTaskService { get; set; } public Action SaveResult { get; set; } + + + private void BButton_Click(object sender, RoutedEventArgs e) { if (BarCodeModel.LabelModel == BarcodeLabelModel.标准模板)//标准版 判断数据是否异常 @@ -68,13 +72,26 @@ namespace BBWY.Client.Views.PackTask BarCodeModel.Id = resData.Data; if (SaveResult != null) SaveResult(BarCodeModel); - // IsNeedBarCode = "需要"; - //IsSetBarCode = false; - // setBarCodeWindow.Close(); + // IsNeedBarCode = "需要"; + //IsSetBarCode = false; + // setBarCodeWindow.Close(); this.Close(); } + public ICommand BarLabelCheckCommand { get; set; } + public void BarLabelCheck(BarcodeLabelModel labelModel) + { + if (labelModel == BarcodeLabelModel.标准模板)//标准版 判断数据是否异常 + { + if (string.IsNullOrEmpty(BarCodeModel.ProductNo) || BarCodeModel.ProductNo == "待填写") + { + TipsWindow tips = new TipsWindow("该SKU无货号信息,将影响条形码打印\r\n请先设置好货号信息或调整打印模板类型"); + tips.ShowDialog(); + } + } + + } } } diff --git a/BBWY.Client/Views/PackTask/SetCerControl.xaml.cs b/BBWY.Client/Views/PackTask/SetCerControl.xaml.cs index de951363..f6229de0 100644 --- a/BBWY.Client/Views/PackTask/SetCerControl.xaml.cs +++ b/BBWY.Client/Views/PackTask/SetCerControl.xaml.cs @@ -28,8 +28,6 @@ namespace BBWY.Client.Views.PackTask InitializeComponent(); } - - //CertificateModel public CertificateModel model @@ -62,22 +60,12 @@ namespace BBWY.Client.Views.PackTask private static void ChangedProperty(DependencyObject d, DependencyPropertyChangedEventArgs e) { - - - var control = d as SetCerControl; - var newValue = e.NewValue as CertificateModel; if (control != null && newValue != null) { control.model = newValue; - //control.DataContext = newValue; - - //control.OnPropertyChanged(e); - } - - } private void RadioButton_Checked(object sender, RoutedEventArgs e) diff --git a/BBWY.Client/Views/PackTask/SetCerWindow.xaml b/BBWY.Client/Views/PackTask/SetCerWindow.xaml index 908fef8c..6f4415cc 100644 --- a/BBWY.Client/Views/PackTask/SetCerWindow.xaml +++ b/BBWY.Client/Views/PackTask/SetCerWindow.xaml @@ -35,103 +35,15 @@ - + + Click="InseartCer_Click" /> - + Click="save_btn_Click" /> diff --git a/BBWY.Client/Views/PackTask/SetSpuCerWindow.xaml b/BBWY.Client/Views/PackTask/SetSpuCerWindow.xaml index e40559ee..34edc24d 100644 --- a/BBWY.Client/Views/PackTask/SetSpuCerWindow.xaml +++ b/BBWY.Client/Views/PackTask/SetSpuCerWindow.xaml @@ -17,7 +17,7 @@ MinButtonVisibility="Collapsed" MaxButtonVisibility="Collapsed" RightButtonGroupMargin="0,5,5,0"> - + @@ -30,94 +30,7 @@ - +