修复bug

2 years ago · c83cb6c14f
13 changed files with 113 additions and 99 deletions
--- a/BBWY.Client/Models/Enums.cs
+++ b/BBWY.Client/Models/Enums.cs
@ -291,14 +291,14 @@
        No3C = 0,
        Is3C = 1
    }
-    /// <summary>
-    /// 合格证是否3c
-    /// </summary>
-    public enum CerHave3C
-    {
-        No3C = 0,
-        Is3C = 1
-    }
+    ///// <summary>
+    ///// 合格证是否3c
+    ///// </summary>
+    //public enum CerHave3C
+    //{
+    //    No3C = 0,
+    //    Is3C = 1
+    //}
    /// <summary>
    /// 加急
    /// </summary>
--- a/BBWY.Client/Models/PackTask/PackItemModel.cs
+++ b/BBWY.Client/Models/PackTask/PackItemModel.cs
@ -34,10 +34,31 @@ namespace BBWY.Client.Models.PackTask
        public int ItemCount { get => itemCount; set { Set(ref itemCount, value); } }


-        public ObservableCollection<IncreateServiceModel> IncreateServiceList { get; set; }
-        public ObservableCollection<PackUser> MemberList { get; set; }
-        public ObservableCollection<ConsumableModel> ConsumableList { get; set; }
-        public ObservableCollection<WorkProcessModel> PackServiceList { get; set; }
+
+
+        private ObservableCollection<IncreateServiceModel> increateServiceList;
+        public ObservableCollection<IncreateServiceModel> IncreateServiceList
+        {
+            get => increateServiceList; set
+            {
+                Set(ref increateServiceList, value);
+            }
+        }
+
+        private ObservableCollection<PackUser> memberList;
+        public ObservableCollection<PackUser> MemberList
+        {
+            get => memberList; set
+            {
+                Set(ref memberList, value);
+            }
+        }
+        private ObservableCollection<ConsumableModel> consumableList;
+        public ObservableCollection<ConsumableModel> ConsumableList
+        { get => consumableList; set { Set(ref consumableList, value); } }
+
+        private ObservableCollection<WorkProcessModel> packServiceList;
+        public ObservableCollection<WorkProcessModel> PackServiceList { get => packServiceList; set { Set(ref packServiceList, value); } }
        /// <summary>
        /// 设置列表的 是否编辑属性
        /// </summary>
@ -45,27 +66,15 @@ namespace BBWY.Client.Models.PackTask

        public ICommand DeleteServiceCommand { get; set; }

-        public PackItemModel(ObservableCollection<IncreateServiceModel> IncreateServiceList=null,
-            ObservableCollection<PackUser> MemberList=null,
-            ObservableCollection<ConsumableModel> ConsumableList=null,
-            ObservableCollection<WorkProcessModel> PackServiceList=null
-            )
+        public PackItemModel()
        {
-           
            DeleteServiceCommand = new RelayCommand<object>(DeleteService);
-           this. IncreateServiceList = IncreateServiceList;
-            this.PackServiceList = PackServiceList;
-            this.MemberList = MemberList;
-            this.ConsumableList = ConsumableList;        
        }

        private void DeleteService(object obj)
        {
-            ObservableCollection<PackItemModel> list= obj as ObservableCollection<PackItemModel>;
-
-
+            ObservableCollection<PackItemModel> list = obj as ObservableCollection<PackItemModel>;
            list.Remove(this);
-
        }
    }
 }
--- a/BBWY.Client/Models/PackTask/PackTaskModel.cs
+++ b/BBWY.Client/Models/PackTask/PackTaskModel.cs
@ -27,7 +27,8 @@ namespace BBWY.Client.Models

        public long Id { get => id; set { Set(ref id, value); } }
        private readonly PackTaskService packTaskService;
-        WorkProcessService workProcessService;
+        readonly WorkProcessService workProcessService;
+        readonly IncreateServiceService increateServiceService;
        public ICommand SetTaskStatusCommand { get; set; }
        public ICommand PrintBarcodeCommand { get; set; }

@ -35,7 +36,7 @@ namespace BBWY.Client.Models
        public ICommand LookCerCommand { get; set; }
        public ICommand LookBarCommand { get; set; }
        public ICommand SetServiceCommand { get; set; }
-        IncreateServiceService increateServiceService;
+
        public ConsumableService consumableService;

        /// <summary>
@ -64,7 +65,7 @@ namespace BBWY.Client.Models
        private void UpdateTask()
        {

-
+            CreatePackTask create = new CreatePackTask();

            ViewModelLocator viewModel = new ViewModelLocator();
            var createViewModel = viewModel.CreateTaskView;
@ -72,15 +73,9 @@ namespace BBWY.Client.Models
            {
                createViewModel.ReflashWindow = ReflashTask;
            }
-
-            CreatePackTask create = new CreatePackTask();
-            //ViewModelLocator viewModel = new ViewModelLocator();
-            //var createViewModel = viewModel.CreateTaskView;
-            //if (ReflashTask != null)
-            //    createViewModel.ReflashWindow = ReflashTask;
-            create.SendData(this);
+            create.SendData(this);//初始化数据
            create.ShowDialog();
-          
+

        }

@ -105,15 +100,19 @@ namespace BBWY.Client.Models

        private void SetService()
        {
+            ServiceWindow service = new ServiceWindow();
            //加载数据
-
-            ServiceWindow service = new ServiceWindow(packTaskService, TaskId, SkuCount, consumableService, workProcessService, increateServiceService);//设置
-            service.model.SetAllFees = new Action<FeesItemResponse, List<string>>((feesItem, packUsers) =>
-            {
-                FeesItemResponse = feesItem;
-                PackUser = string.Join("\r\n", packUsers);
-                IsShowFees = feesItem.AllFees > 0 ? true : false;
-            });
+            ViewModelLocator viewModelLocator = new ViewModelLocator();
+            var serviceViewModel = viewModelLocator.PackServiceList;
+            serviceViewModel.TaskCount = SkuCount;
+            serviceViewModel.TaskId = TaskId;
+            serviceViewModel.LoadPackDatas();
+            serviceViewModel.SetAllFees = new Action<FeesItemResponse, List<string>>((feesItem, packUsers) =>
+             {
+                 FeesItemResponse = feesItem;
+                 PackUser = string.Join("\r\n", packUsers);
+                 IsShowFees = feesItem.AllFees > 0 ? true : false;
+             });
            service.Show();
        }

@ -163,11 +162,8 @@ namespace BBWY.Client.Models
                return;
            }
            PrintWindow printWindow = new PrintWindow();
-            printWindow.LabelName = CertificateModel.LabelModel.ToString();//加载模板信息
-
            printWindow.certificateModel = certificateModel;
            printWindow.LoadData();
-            printWindow.Datas = LoadCerLabelModels();
            printWindow.Show();
        }

@ -182,8 +178,7 @@ namespace BBWY.Client.Models
                return;
            }

-            PrintWindow printWindow = new PrintWindow();
-            printWindow.LabelName = BarCodeModel.LabelModel.ToString();//加载模板信息
+            PrintWindow printWindow = new PrintWindow();       
            printWindow.barCodeModel = new BarCodeModel
            {
                Brand = BarCodeModel.Brand,
@ -194,7 +189,6 @@ namespace BBWY.Client.Models
                SkuName = BarCodeModel.SkuName
            };
            printWindow.LoadData();
-            printWindow.Datas = LoadBarLabelModels();
            printWindow.Show();
        }

@ -214,7 +208,7 @@ namespace BBWY.Client.Models
                new TipsWindow("修改成功").Show();
            }
        }
-
+        /* 拼接模板数据
        public Dictionary<string, string> LoadBarLabelModels()
        {
            Dictionary<string, string> data = new Dictionary<string, string>();
@ -278,7 +272,7 @@ namespace BBWY.Client.Models

            return data;
        }
-
+        */

        private DateTime endTime;
        /// <summary>
@ -289,7 +283,7 @@ namespace BBWY.Client.Models

        private long taskId;
        /// <summary>
-        /// 绑定数据
+        /// 任务id
        /// </summary>
        public long TaskId { get => taskId; set { Set(ref taskId, value); } }

--- a/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs
@ -487,7 +487,7 @@ namespace BBWY.Client.ViewModels.PackTask

            SaveCerCommand = new RelayCommand(SaveCer);
            BarLabelCheckCommand = new RelayCommand<BarcodeLabelModel>(BarLabelCheck);
-            CerLabelCheckCommand = new RelayCommand<CerHave3C>(CerLabelCheck);
+            CerLabelCheckCommand = new RelayCommand<CertificateLabelModel>(CerLabelCheck);

            LookBarCommand = new RelayCommand(LookBar);
            LookCerCommand = new RelayCommand(LookCer);
@ -558,7 +558,7 @@ namespace BBWY.Client.ViewModels.PackTask
            look.Show();
        }

-        private void CerLabelCheck(CerHave3C cer)
+        private void CerLabelCheck(CertificateLabelModel cer)
        {
            CertificateModel.IsLogo = (int)cer;
        }
--- a/BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs
@ -62,9 +62,9 @@ namespace BBWY.Client.ViewModels.PackTask

        readonly WorkProcessService workProcessService;
        readonly IncreateServiceService increateService;
-        public PackServiceViewModel(PackTaskService packTaskService, ConsumableService consumableService, WorkProcessService workProcessService, IncreateServiceService increateService, long taskId)
+        public PackServiceViewModel(PackTaskService packTaskService, ConsumableService consumableService, WorkProcessService workProcessService, IncreateServiceService increateService)//, long taskId
        {
-            TaskId = taskId;
+            //TaskId = taskId;
            this.consumableService = consumableService;
            this.packTaskService = packTaskService;
            this.workProcessService = workProcessService;
@ -156,14 +156,14 @@ namespace BBWY.Client.ViewModels.PackTask


            //加载数据
-            LoadPackDatas();
+            //LoadPackDatas();

        }
        
        /// <summary>
        /// 加载任务数据
        /// </summary>
-        private void LoadPackDatas()
+        public void LoadPackDatas()
        {
            Task task = Task.Factory.StartNew(() =>
            {
@ -177,8 +177,10 @@ namespace BBWY.Client.ViewModels.PackTask
                        {
                            App.Current.Dispatcher.Invoke(() =>
                            {
-                                IncreateList.Add(new PackItemModel(IncreateServiceList, MemberList)
+                                IncreateList.Add(new PackItemModel()
                                {
+                                    MemberList = MemberList,
+                                    IncreateServiceList = IncreateServiceList,
                                    ItemCount = item.ItemCount,
                                    ItemName = item.ItemName,
                                    SelectId = item.SelectId,
@ -196,8 +198,10 @@ namespace BBWY.Client.ViewModels.PackTask
                        {
                            App.Current.Dispatcher.Invoke(() =>
                            {
-                                PackList.Add(new PackItemModel(null, MemberList, null, PackServiceList)
+                                PackList.Add(new PackItemModel()
                                {
+                                    PackServiceList= PackServiceList,
+                                    MemberList =MemberList,
                                    ItemCount = item.ItemCount,
                                    ItemName = item.ItemName,
                                    SelectId = item.SelectId,
@ -215,13 +219,14 @@ namespace BBWY.Client.ViewModels.PackTask
                        {
                            App.Current.Dispatcher.Invoke(() =>
                            {
-                                ConsumableServiceList.Add(new PackItemModel(null, MemberList, ConsumableList)
+                                ConsumableServiceList.Add(new PackItemModel()
                                {
+                                    MemberList = MemberList,
+                                    ConsumableList = ConsumableList,
                                    ItemCount = item.ItemCount,
                                    ItemName = item.ItemName,
                                    SelectId = item.SelectId,
-                                    // SelectUserId = item.SelectUserId,
-                                    //MemberName = item.MemberName
+                                   

                                });
                            });
@ -583,25 +588,30 @@ namespace BBWY.Client.ViewModels.PackTask

        private void AddPackService()
        {
-            PackList.Add(new PackItemModel(null, MemberList, null, PackServiceList)
+            PackList.Add(new PackItemModel()
            {
-                ItemCount = TaskCount
+                ItemCount = TaskCount,
+                MemberList = MemberList,
+                PackServiceList = PackServiceList
            });
        }

        private void AddIncreateService()
        {
-            IncreateList.Add(new PackItemModel(IncreateServiceList, MemberList)
+            IncreateList.Add(new PackItemModel()
            {
-                ItemCount = TaskCount
+                ItemCount = TaskCount,
+                IncreateServiceList = IncreateServiceList,
+                MemberList = MemberList,
            });
        }

        private void AddConsumable()
        {
-            ConsumableServiceList.Add(new PackItemModel(null, null, ConsumableList)
+            ConsumableServiceList.Add(new PackItemModel()
            {
-                ItemCount = TaskCount
+                ItemCount = TaskCount,
+                 ConsumableList = ConsumableList
            });
        }
    }
--- a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
@ -275,7 +275,7 @@ namespace BBWY.Client.ViewModels.PackTask
                    taskStatus = 1;
                    break;
                case Models.TaskState.加急:
-
+                    taskStatus = 0;
                    IsWorry = 1;
                    break;
                default:
--- a/BBWY.Client/Views/PackTask/LookBarCodeWindow.xaml
+++ b/BBWY.Client/Views/PackTask/LookBarCodeWindow.xaml
@ -7,7 +7,7 @@
        xmlns:local="clr-namespace:BBWY.Client.Views.PackTask"
        mc:Ignorable="d"
        Style="{StaticResource bwstyle}"
-        Height="259" Width="320"          
+        Height="245" Width="320"          
        xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
        xmlns:ctr="clr-namespace:BBWY.Client.Converters"
        xmlns:cmodel="clr-namespace:BBWY.Client.Models"
@ -16,7 +16,9 @@
        CloseButtonColor="{StaticResource WindowButtonColor}"
        MinButtonVisibility="Collapsed"
        MaxButtonVisibility="Collapsed"
-        RightButtonGroupMargin="0,5,5,0">
+        RightButtonGroupMargin="0,5,5,0"
+           ResizeMode="NoResize"
+           >
    <!--   DataContext="{Binding CreateSetBarCodeView,Source={StaticResource Locator}}"-->
    <Grid>
        <Grid.RowDefinitions>
@ -46,7 +48,7 @@
                </StackPanel>
            </Border>

-            <Border Name="biaozhun" Visibility="Collapsed" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="220" Margin="5">
+            <Border Name="biaozhun" Visibility="Collapsed" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="220" Margin="1">
                <StackPanel Orientation="Vertical"  >

                    <TextBlock  Margin="10,10,10,0" FontSize="15" FontWeight="Black"  >
--- a/BBWY.Client/Views/PackTask/LookCerWindow.xaml
+++ b/BBWY.Client/Views/PackTask/LookCerWindow.xaml
@ -7,7 +7,7 @@
        xmlns:local="clr-namespace:BBWY.Client.Views.PackTask"
        mc:Ignorable="d"
        Style="{StaticResource bwstyle}"
-        Height="357" Width="386"          
+        Height="340" Width="382"          
        xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
        xmlns:ctr="clr-namespace:BBWY.Client.Converters"
        xmlns:cmodel="clr-namespace:BBWY.Client.Models"
--- a/BBWY.Client/Views/PackTask/PrintWindow.xaml
+++ b/BBWY.Client/Views/PackTask/PrintWindow.xaml
@ -16,7 +16,9 @@
        CloseButtonColor="{StaticResource WindowButtonColor}"
        MinButtonVisibility="Collapsed"
        MaxButtonVisibility="Collapsed"
-        RightButtonGroupMargin="0,5,5,0">
+        RightButtonGroupMargin="0,5,5,0"
+        ResizeMode="NoResize"
+            >
    <!--   DataContext="{Binding CreateSetBarCodeView,Source={StaticResource Locator}}"-->
    <Grid>
        <Grid.RowDefinitions>
--- a/BBWY.Client/Views/PackTask/PrintWindow.xaml.cs
+++ b/BBWY.Client/Views/PackTask/PrintWindow.xaml.cs
@ -142,16 +142,14 @@ namespace BBWY.Client.Views.PackTask

        public BarCodeModel  barCodeModel { get; set; }

-        public string LabelName { get; set; }
-
-        public Dictionary<string, string> Datas { get; set; }
-
        private void BButton_Click(object sender, RoutedEventArgs e)
        {
+
+
+            Task.Factory.StartNew(() => { 
            try
            {
                //string appPath = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
-
                //string path = appPath + $"/Resources/LabelNames/{LabelName}.btw";

                int printCount = Convert.ToInt32(tbCount.Text);//份数
@ -162,20 +160,16 @@ namespace BBWY.Client.Views.PackTask
                document.PrintPage += Document_PrintPage;
                document.PrinterSettings.Copies = (short)printCount;//打印份数
                document.Print();
-
-
-              
-
-               // Task.Factory.StartNew(() => {
-               //     PrintBarCode(path, printCount, printName);
-               //});
                
            }
            catch (Exception ex)
            {
-                new TipsWindow("打印失败").ShowDialog();
+                    App.Current.Dispatcher.Invoke(() => {
+                        new TipsWindow("打印失败").ShowDialog();
+                    });
+               
            }
-            
+            });

        }

--- a/BBWY.Client/Views/PackTask/ServiceWindow.xaml
+++ b/BBWY.Client/Views/PackTask/ServiceWindow.xaml
@ -14,7 +14,7 @@
        CloseButtonVisibility="Visible"
        WindowStartupLocation="CenterScreen"
        CloseButtonColor="{StaticResource WindowButtonColor}"
-        
+        DataContext="{Binding PackServiceList,Source={StaticResource Locator}}"
        MinButtonVisibility="Collapsed"
        MaxButtonVisibility="Collapsed"
        RightButtonGroupMargin="0,5,5,0">
@ -161,8 +161,8 @@

                <TextBlock Text="耗材项目" Margin="19,20,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" />
                <Border Background="Black" HorizontalAlignment="Left" VerticalAlignment="Top" Width="217" Margin="77,27,0,0" Height="1"/>
-                <Border Background="{StaticResource Border.Brush}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="240" Margin="19,56,0,0" Height="1"/>
-                <Border Background="{StaticResource Border.Brush}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="240" Margin="19,86,0,0" Height="1"/>
+                <Border Background="{StaticResource Border.Brush}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="260" Margin="19,56,0,0" Height="1"/>
+                <Border Background="{StaticResource Border.Brush}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="260" Margin="19,86,0,0" Height="1"/>
                <Border Background="{StaticResource Border.Brush}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="1"   Margin="19,56,0,0" Height="30"   />
                <Border Background="{StaticResource Border.Brush}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="1"   Margin="135,56,0,0" Height="30"   />
                <Border Background="{StaticResource Border.Brush}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="1"   Margin="239,56,0,0" Height="30"   />
--- a/BBWY.Client/Views/PackTask/ServiceWindow.xaml.cs
+++ b/BBWY.Client/Views/PackTask/ServiceWindow.xaml.cs
@ -22,7 +22,7 @@ namespace BBWY.Client.Views.PackTask
    /// </summary>
    public partial class ServiceWindow : BWindow
    {
-
+        /*
        public PackServiceViewModel model { get; set; }
        public PackTaskService packTaskService;
        public ConsumableService consumableService;
@ -40,8 +40,11 @@ namespace BBWY.Client.Views.PackTask
            model.TaskCount = taskCount;
            this.DataContext = model;
        }
-        
-       
+        */
+        public ServiceWindow()
+        {
+            InitializeComponent();
+        }

    }
 }
--- a/BBWY.Client/Views/PackTask/SetCerWindow.xaml
+++ b/BBWY.Client/Views/PackTask/SetCerWindow.xaml
@ -38,7 +38,7 @@
            </Grid.ColumnDefinitions>
            <Grid >
                <!--IsChecked="{Binding CertificateModel.IsLogo,Converter={StaticResource objConverter},ConverterParameter=0:true:false}"-->
-                <RadioButton GroupName="cer" IsChecked="{Binding CertificateModel.LabelModel,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:CertificateLabelModel.No3C}}"     Command="{Binding CerLabelCheckCommand}"  CommandParameter="{x:Static cmodel:CerHave3C.No3C}"  Content="标准" Margin="10,20,0,0" Height="30" VerticalAlignment="Top"/>
+                <RadioButton GroupName="cer" IsChecked="{Binding CertificateModel.LabelModel,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:CertificateLabelModel.No3C}}"     Command="{Binding CerLabelCheckCommand}"  CommandParameter="{x:Static cmodel:CertificateLabelModel.No3C}"  Content="标准" Margin="10,20,0,0" Height="30" VerticalAlignment="Top"/>
                <Border BorderBrush="Black" BorderThickness="1" Width="380" Height="297" Margin="13,50" VerticalAlignment="Top" HorizontalAlignment="Left">
                    <Grid>
                        <TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" Text="合格证" FontSize="18" Margin="157,12" />
@ -64,7 +64,7 @@
            </Grid>
            <Grid Grid.Column="1" >
                <!--IsChecked="{Binding CertificateModel.IsLogo,Converter={StaticResource objConverter},ConverterParameter=1:true:false}"-->
-                <RadioButton GroupName="cer" IsChecked="{Binding CertificateModel.LabelModel,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:CertificateLabelModel.Is3C}}"    Command="{Binding CerLabelCheckCommand}"  CommandParameter="{x:Static cmodel:CerHave3C.Is3C}"  Content="带3c标" Margin="10,20,0,0" Height="30" VerticalAlignment="Top"/>
+                <RadioButton GroupName="cer" IsChecked="{Binding CertificateModel.LabelModel,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:CertificateLabelModel.Is3C}}"    Command="{Binding CerLabelCheckCommand}"  CommandParameter="{x:Static cmodel:CertificateLabelModel.Is3C}"  Content="带3c标" Margin="10,20,0,0" Height="30" VerticalAlignment="Top"/>
                <Border BorderBrush="Black" BorderThickness="1" Width="380" Height="297" Margin="13,50" VerticalAlignment="Top" HorizontalAlignment="Left">
                    <Grid >
                        <TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" Text="合格证" FontSize="18" Margin="157,12" />