diff --git a/BBWY.Client/Models/Enums.cs b/BBWY.Client/Models/Enums.cs index b9b9b2ec..10791c88 100644 --- a/BBWY.Client/Models/Enums.cs +++ b/BBWY.Client/Models/Enums.cs @@ -476,4 +476,12 @@ /// B端 = 1 } + + /// + /// 落仓状态 + /// + public enum PositionState + { + 待封箱, 待落仓, 待完结 + } } diff --git a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs index fdfe8d8c..a236cdb0 100644 --- a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs @@ -33,6 +33,11 @@ namespace BBWY.Client.ViewModels.PackTask { #region 属性绑定 + private ObservableCollection sealBoxWaitConfigureList; + + public ObservableCollection SealBoxWaitConfigureList { get => sealBoxWaitConfigureList; set { Set(ref sealBoxWaitConfigureList, value); } } + + /// /// 查询时间段 /// diff --git a/BBWY.Client/Views/SealBox/SealBoxConfiguredControl.xaml b/BBWY.Client/Views/SealBox/SealBoxConfiguredControl.xaml new file mode 100644 index 00000000..9911732f --- /dev/null +++ b/BBWY.Client/Views/SealBox/SealBoxConfiguredControl.xaml @@ -0,0 +1,12 @@ + + + + + diff --git a/BBWY.Client/Views/SealBox/SealBoxConfiguredControl.xaml.cs b/BBWY.Client/Views/SealBox/SealBoxConfiguredControl.xaml.cs new file mode 100644 index 00000000..e2fdad0c --- /dev/null +++ b/BBWY.Client/Views/SealBox/SealBoxConfiguredControl.xaml.cs @@ -0,0 +1,26 @@ +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.Navigation; +using System.Windows.Shapes; + +namespace BBWY.Client.Views.SealBox +{ + /// + /// SealBoxConfiguredControl.xaml 的交互逻辑 + /// + public partial class SealBoxConfiguredControl : UserControl + { + public SealBoxConfiguredControl() + { + InitializeComponent(); + } + } +} diff --git a/BBWY.Client/Views/SealBox/SealBoxWaitConfigureControl.xaml b/BBWY.Client/Views/SealBox/SealBoxWaitConfigureControl.xaml new file mode 100644 index 00000000..6b85605f --- /dev/null +++ b/BBWY.Client/Views/SealBox/SealBoxWaitConfigureControl.xaml @@ -0,0 +1,299 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BBWY.Client/Views/SealBox/SealBoxWaitConfigureControl.xaml.cs b/BBWY.Client/Views/SealBox/SealBoxWaitConfigureControl.xaml.cs new file mode 100644 index 00000000..3a275f1c --- /dev/null +++ b/BBWY.Client/Views/SealBox/SealBoxWaitConfigureControl.xaml.cs @@ -0,0 +1,26 @@ +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.Navigation; +using System.Windows.Shapes; + +namespace BBWY.Client.Views.SealBox +{ + /// + /// SealBoxNoConfigureControl.xaml 的交互逻辑 + /// + public partial class SealBoxWaitConfigureControl : UserControl + { + public SealBoxWaitConfigureControl() + { + InitializeComponent(); + } + } +}