1

2 years ago · 80676027e8
8 changed files with 193 additions and 25 deletions
--- a/BBWY.Client/APIServices/PackTaskService.cs
+++ b/BBWY.Client/APIServices/PackTaskService.cs
@ -329,7 +329,7 @@ namespace BBWY.Client.APIServices
        /// </summary>
        /// <param name="orderId"></param>
        /// <returns></returns>
-        public ApiResponse<bool> CompeteSealBox( List<CompeteSealBox> CompeteSealBoxs)
+        public ApiResponse<bool> CompeteSealBox( CompeteSealBox CompeteSealBoxs)
        {
            return SendRequest<bool>(globalContext.QKApiHost, "api/PackTask/CompeteSealBox", new
            {
@ -346,11 +346,14 @@ namespace BBWY.Client.APIServices
        /// <summary>
        /// 任务Id
        /// </summary>
-        public long TaskId { get; set; }
+        public long[] TaskId { get; set; }
        /// <summary>
        /// 仓库Id
        /// </summary>
        public string WareId { get; set; }
+
+        public int BoxCount { get; set; }
+
    }


--- a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
@ -21,6 +21,7 @@ using NPOI.SS.Formula.Functions;
 using GalaSoft.MvvmLight.Messaging;
 using BBWY.Client.Models.APIModel;
 using BBWY.Client.Models.PackTask;
+using BBWY.Client.Views.SealBox;

 namespace BBWY.Client.ViewModels.PackTask
 {
@ -261,6 +262,17 @@ namespace BBWY.Client.ViewModels.PackTask
            UpdateTaskStateCommand = new RelayCommand<object>(UpdateTaskState);

            CompeteSealBoxCommand = new RelayCommand<object>(CompeteSealBox);
+
+            SetSealBoxCommand = new RelayCommand<object>(SetSealBox);
+        }
+
+        private void SetSealBox(object obj)
+        {
+            SetSealBoxWindow setSealBoxWindow = new SetSealBoxWindow();
+            setSealBoxWindow.SendBoxCount= boxCount => {
+                BoxCount = boxCount;
+            };
+            setSealBoxWindow.ShowDialog();
        }


@ -302,27 +314,34 @@ namespace BBWY.Client.ViewModels.PackTask
        /// </summary>
        public ICommand TaskPageIndexChangedCommand { get; set; }

+        /// <summary>
+        /// 设置分箱数量
+        /// </summary>
+        public ICommand SetSealBoxCommand { get; set; }
+

        BatchPurchaseService batchPurchaseService;

+
+        public int  BoxCount { get; set; }  
+
        private void CompeteSealBox(object obj)
        {
-            var objList = obj as SealBoxModel;

-            List<CompeteSealBox> CompeteSealBoxs = new List<CompeteSealBox>();
-            string wareId = objList.WareId;
-            foreach (var item in objList.SealBoxSkus)
-            {

-                CompeteSealBoxs.Add(new APIServices.CompeteSealBox
-                {
-                    WareId = wareId,
-                    TaskId = item.TaskId,
+            if (BoxCount<=0)
+            {
+                System.Windows.MessageBox.Show("请先设置封箱数量");
+                return;
+            }

-                });
+            var objList = obj as SealBoxModel;

-            }
-            var res = packTaskService.CompeteSealBox(CompeteSealBoxs);
+            CompeteSealBox competeSealBox = new CompeteSealBox();
+            competeSealBox.WareId = objList.WareId;
+            competeSealBox.BoxCount = BoxCount;
+            competeSealBox.TaskId = objList.SealBoxSkus.Select(s => s.TaskId).ToArray();
+            var res = packTaskService.CompeteSealBox(competeSealBox);
            if (res != null && res.Success)
            {
                SearchTaskList();
--- a/BBWY.Client/Views/PackTask/TipsWindow.xaml
+++ b/BBWY.Client/Views/PackTask/TipsWindow.xaml
@ -30,7 +30,7 @@
            <TextBlock Text="提示"  HorizontalAlignment="Center" VerticalAlignment="Center"/>
        </Border>
        <TextBox Name="tbContent" IsReadOnly="True" AcceptsReturn="True" TextWrapping="Wrap" Grid.Row="1" Margin="10"
-            Text="请设置合格证内容 请设置合格证内容" BorderBrush="White"  VerticalAlignment="Center" HorizontalAlignment="Center"/>
+            Text="请设置合格证内容" BorderBrush="White"  VerticalAlignment="Center" HorizontalAlignment="Center"/>

        
        <!--<c:BButton Grid.Row="2" Content="确定" HorizontalAlignment="Right" Width="100" VerticalAlignment="Stretch" Click="BButton_Click"  />-->
--- a/BBWY.Client/Views/PackTask/TipsWindow.xaml.cs
+++ b/BBWY.Client/Views/PackTask/TipsWindow.xaml.cs
@ -20,7 +20,7 @@ namespace BBWY.Client.Views.PackTask
    public partial class TipsWindow : BWindow
    {
        private DispatcherTimer timer;
-        public TipsWindow(string Content,int waitTime=2)
+        public TipsWindow(string Content, int waitTime =3)
        {
            InitializeComponent();
            tbContent.Text = Content;
@ -31,16 +31,38 @@ namespace BBWY.Client.Views.PackTask
            timer.Tick += OnTimerTick;
            timer.Start();

+            this.Closed += TipsWindow_Closed;
        }

+        private void TipsWindow_Closed(object sender, EventArgs e)
+        {
+            IsClosed = true;
+        }
+
+        private bool IsClosed;
        private void OnTimerTick(object sender, EventArgs e)
        {
            timer.Stop();
-            Close();
+
+            CloseWindow();
        }
+
+        object closeWindow = new object();
+        private void CloseWindow()
+        {
+            if (IsClosed)
+                return;
+            lock (closeWindow)
+            {
+                if (!IsClosed)
+                    Close();
+            }
+
+        }
+
        private void BButton_Click(object sender, RoutedEventArgs e)
        {
-            this.Close();
+            CloseWindow();
        }
    }
 }
--- a/BBWY.Client/Views/PackTask/WaitSealBoxControl.xaml
+++ b/BBWY.Client/Views/PackTask/WaitSealBoxControl.xaml
@ -4,7 +4,7 @@
             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
             xmlns:local="clr-namespace:BBWY.Client.Views.PackTask"
-             mc:Ignorable="d" 
+             mc:Ignorable="d"  Background="white"
            xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
             xmlns:ctr="clr-namespace:BBWY.Client.Converters"
             xmlns:sys="clr-namespace:System;assembly=mscorlib"
@ -33,19 +33,22 @@
            <Grid.ColumnDefinitions>
                <ColumnDefinition Width="400"/>
                <ColumnDefinition Width="80"/>
+                <ColumnDefinition Width="80"/>
                <ColumnDefinition MinWidth="80"/>
                <ColumnDefinition Width="100"/>
            </Grid.ColumnDefinitions>
            <TextBlock Text="商品信息" Style="{StaticResource middleTextBlock}"/>
            <TextBlock Text="数量" Grid.Column="1" Style="{StaticResource middleTextBlock}"/>
-            <TextBlock Text=" " Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
-            <TextBlock Text="操作" Grid.Column="3"   Style="{StaticResource middleTextBlock}"/>
+            <TextBlock Text="封箱数量" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
+            <TextBlock Text=" " Grid.Column="3" Style="{StaticResource middleTextBlock}"/>
+            <TextBlock Text="操作" Grid.Column="4"   Style="{StaticResource middleTextBlock}"/>
            <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>
            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="1"/>
            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="2"/>
            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="3"/>
            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="4"/>
+            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>
            <!--<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>-->
            <!--<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="6"/>
            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="7"/>
@ -75,6 +78,7 @@
                            <Grid.ColumnDefinitions>
                                <ColumnDefinition Width="400"/>
                                <ColumnDefinition Width="80"/>
+                                <ColumnDefinition Width="80"/>
                                <ColumnDefinition MinWidth="80"/>
                                <ColumnDefinition Width="100"/>
                            </Grid.ColumnDefinitions>
@ -110,6 +114,7 @@
                            <Grid.ColumnDefinitions>
                                <ColumnDefinition Width="400"/>
                                <ColumnDefinition Width="80"/>
+                                <ColumnDefinition Width="80"/>
                                <ColumnDefinition MinWidth="80"/>
                                <ColumnDefinition Width="100"/>
                            </Grid.ColumnDefinitions>
@ -223,13 +228,30 @@
                                    </DataTemplate>
                                </ListBox.ItemTemplate>
                            </ListBox>
-                            
-          
+
+
+
+
                            <Grid Grid.Column="2" >
+                                <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
+
+
+                                    <c:BButton Grid.Column="11" HorizontalAlignment="Stretch"   Style="{StaticResource LinkButton}"     VerticalAlignment="Center" Content="设置" 
+                                             Command="{Binding DataContext.SetSealBoxCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
+                                               CommandParameter="{Binding}"
+                                               >
+
+                                    </c:BButton>
+
+
+
+                                </StackPanel>
+                            </Grid>
+                            <Grid Grid.Column="3" >
                           
                            </Grid>
                           
-                            <Grid Grid.Column="3" >
+                            <Grid Grid.Column="4" >
                                <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
                                   

@ -250,6 +272,7 @@
                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="2"/>
                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="3"/>
                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="4"/>
+                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>
                            <!--<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>
                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="6"/>
                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="7"/>
--- a/BBWY.Client/Views/PackTask/WareHouseList.xaml.cs
+++ b/BBWY.Client/Views/PackTask/WareHouseList.xaml.cs
@ -236,7 +236,7 @@ namespace BBWY.Client.Views.PackTask
                    }

                }
-
+                if (tipBoxShop!=null)
                tipBoxShop.Visibility = Visibility.Visible;
            }
            catch (Exception)
--- a/BBWY.Client/Views/SealBox/SetSealBoxWindow.xaml
+++ b/BBWY.Client/Views/SealBox/SetSealBoxWindow.xaml
@ -0,0 +1,52 @@
+<c:BWindow x:Class="BBWY.Client.Views.SealBox.SetSealBoxWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:BBWY.Client.Views.SealBox"
+        mc:Ignorable="d"
+         xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
+        xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
+        xmlns:ctr="clr-namespace:BBWY.Client.Converters"
+        xmlns:cmodel="clr-namespace:BBWY.Client.Models"
+        xmlns:sys="clr-namespace:System;assembly=mscorlib"   
+        
+        WindowStartupLocation="CenterScreen"
+        
+        MinButtonVisibility="Collapsed"
+        MaxButtonVisibility="Collapsed"
+        CloseButtonVisibility   ="Collapsed" Width="378" Height="219"
+        RightButtonGroupMargin="0,5,5,0">
+    <!--CloseButtonColor="{StaticResource WindowButtonColor}" -->
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="39"/>
+            <RowDefinition/>
+            <RowDefinition Height="36"/>
+        </Grid.RowDefinitions>
+        <Border BorderThickness="0,0,0,1" BorderBrush="{StaticResource MainMenu.BorderBrush}"
+                Background="{StaticResource Border.Background}">
+            <TextBlock Text="封箱数量"  HorizontalAlignment="Center" VerticalAlignment="Center"/>
+        </Border>
+        <Grid Grid.Row="1">
+            <StackPanel  Orientation="Vertical" HorizontalAlignment="Center">
+                <StackPanel Orientation="Horizontal" Margin="0 41 0 0">
+                    <TextBlock Text="封箱数:"  Style="{StaticResource middleTextBlock}"/>
+                    <TextBox x:Name="tbSealBoxCount" Width="200"
+                             Height="25"/>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" Margin="0 5 0 0">
+                    <TextBlock Style="{StaticResource middleTextBlock}" Text="打印机:" />
+                    <ComboBox x:Name="cbPrint" Width="200" Height="25"/>
+                </StackPanel>
+
+            </StackPanel>
+          
+        </Grid>
+
+
+        <c:BButton Grid.Row="2" Content="确定" HorizontalAlignment="Right" Width="105" VerticalAlignment="Center" Height="40" Click="BButton_Click"
+                   />
+
+    </Grid>
+    </c:BWindow>
--- a/BBWY.Client/Views/SealBox/SetSealBoxWindow.xaml.cs
+++ b/BBWY.Client/Views/SealBox/SetSealBoxWindow.xaml.cs
@ -0,0 +1,49 @@
+using BBWY.Controls;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace BBWY.Client.Views.SealBox
+{
+    /// <summary>
+    /// SetSealBoxWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class SetSealBoxWindow : BWindow
+    {
+        public SetSealBoxWindow()
+        {
+            InitializeComponent();
+        }
+
+
+        public Action<int> SendBoxCount { get; set; }
+        private void BButton_Click(object sender, RoutedEventArgs e)
+        {
+            int boxCount = 0;
+            try
+            {
+                boxCount = Convert.ToInt32(tbSealBoxCount.Text);
+            }
+            catch (Exception)
+            {
+                MessageBox.Show("请输入数字!");
+                return;
+            }
+
+
+
+            //todo: 打印单子
+            if (SendBoxCount != null) SendBoxCount(boxCount);
+
+
+        }
+    }
+}