diff --git a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs index f4d9513c..a3723fe8 100644 --- a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs @@ -795,6 +795,8 @@ namespace BBWY.Client.ViewModels.PackTask StoreGetBySelfCommand = new RelayCommand(StoreGetBySelf); + QualityStoreGetBySelfCommand = new RelayCommand(QualityStoreGetBySelf); + CompletedPackTaskCommand = new RelayCommand(CompletedPackTask); SetWareTypeCommand = new RelayCommand(s => @@ -1162,7 +1164,6 @@ namespace BBWY.Client.ViewModels.PackTask AddOneItemWeightWindow addOneItemWeightWindow = new AddOneItemWeightWindow(ReflashTask, packUserService, model.TaskId); addOneItemWeightWindow.ShowDialog(); } - private void StoreGetBySelf(long taskId) { @@ -1196,7 +1197,40 @@ namespace BBWY.Client.ViewModels.PackTask Task.Factory.StartNew(() => SearchTaskList()); return true; - }); + },false); + sorePickProductWindow.ShowDialog(); + + + + } + + private void QualityStoreGetBySelf(long taskId) + { + var data = packTaskService.GetStoreGetSelfData(taskId); + if (!data.Success) + { + MessageBox.Show(data?.Msg); + return; + } + StorePickProductWindow sorePickProductWindow = new StorePickProductWindow(data.Data, (count, UserName) => + { + + var res = packTaskService.StoreGetBySelfV2(taskId, count, UserName); + if (res == null) + { + return false; + } + if (!res.Success) + { + System.Windows.MessageBox.Show(res.Msg, "错误信息"); + return false; + } + + + Task.Factory.StartNew(() => SearchTaskList()); + + return true; + },true); sorePickProductWindow.ShowDialog(); @@ -1319,6 +1353,137 @@ namespace BBWY.Client.ViewModels.PackTask #region 事件绑定 + /// + /// 推送sku配置状态 + /// + public ICommand SendToSetSkuConfigureCommand { get; set; } + /// + /// 提交超时原因 + /// + public ICommand SubmitOverTimeMarkMsgCommand { get; set; } + /// + /// 查看揽收单 + /// + public ICommand LookLSOrderConfigureCommand { get; set; } + /// + /// 打印揽收单 + /// + public ICommand PrintLSOrderConfigureCommand { get; set; } + /// + /// 打印封箱明细 + /// + public ICommand PrintSealBoxDetailsCommand { get; set; } + /// + /// 待完结 完成事件 + /// + public ICommand CompeteWaitCompletedCommand { get; set; } + + /// + /// 待转运 完成事件 + /// + public ICommand CompeteWaitTransportCommand { get; set; } + + /// + /// 设置仓库类型 + /// + public ICommand SetWareTypeCommand { get; set; } + + /// + /// 查看箱唛配置 + /// + public ICommand LookBoxConfigureCommand { get; set; } + /// + /// 待配置 /已配置 + /// + public ICommand SetSealBoxConfigureTypeCommand { get; set; } + public ICommand CompeteFallWareCommand { get; set; } + public ICommand CompeteSealBoxCommand { get; set; } + + public ICommand CompletedPackTaskCommand { get; set; } + + + /// + /// 打开图片链接 + /// + public ICommand OpenSkuDetailCommand { get; set; } + + + /// + /// 筛选数据 + /// + public ICommand SetTaskStateCommand { get; set; } + + /// + /// 修改任务状态 + /// + public ICommand UpdateTaskStateCommand { get; set; } + /// + /// 搜索数据 + /// + public ICommand SearchTaskCommand { get; set; } + + /// + /// 创建任务 + /// + public ICommand CreateTaskCommand { get; set; } + + /// + /// 页面改变事件 + /// + public ICommand TaskPageIndexChangedCommand { get; set; } + + /// + /// 设置分箱数量 + /// + public ICommand SetSealBoxCommand { get; set; } + + + /// + /// 打印封箱数据 + /// + public ICommand PrintBoxConfigureCommand { get; set; } + + + /// + /// 删除任务 + /// + public ICommand DeletedTaskCommand { get; set; } + + + /// + /// 商家自取 + /// + public ICommand StoreGetBySelfCommand { get; set; } + + + /// + /// 商家自取(未验收) + /// + public ICommand QualityStoreGetBySelfCommand { get; set; } + + + /// + /// 加载事件(待封箱) + /// + public ICommand LoadSkuDataCommand { get; set; } + + /// + /// 加载事件(封箱已配置) + /// + public ICommand LoadSealBoxSkuDataCommand { get; set; } + + /// + /// 落仓 + /// + public ICommand LoadFallWareSkuDataCommand { get; set; } + + /// + /// 转运 + /// + public ICommand LoadTransportSkuDataCommand { get; set; } + + + /// /// 完成封箱 diff --git a/BBWY.Client/Views/QualityTask/WaitQualityControl.xaml b/BBWY.Client/Views/QualityTask/WaitQualityControl.xaml index 18cb1c32..15dd02f7 100644 --- a/BBWY.Client/Views/QualityTask/WaitQualityControl.xaml +++ b/BBWY.Client/Views/QualityTask/WaitQualityControl.xaml @@ -614,7 +614,7 @@ diff --git a/BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml b/BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml index bf2cd02f..e2ead9d4 100644 --- a/BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml +++ b/BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml @@ -38,16 +38,16 @@ - + - - - + + + @@ -86,7 +86,7 @@ - + @@ -112,7 +112,7 @@ Command="{Binding DataContext.LoadSkuDataCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}" CommandParameter="{Binding}" /> - + @@ -125,12 +125,12 @@ - + - @@ -141,6 +141,7 @@ + @@ -226,6 +227,13 @@ HorizontalAlignment="Center" VerticalAlignment="Center" /> + + + + @@ -236,7 +244,7 @@ - + diff --git a/BBWY.Client/Views/StorePickSelf/QualityStorePickProductWindow.xaml b/BBWY.Client/Views/StorePickSelf/QualityStorePickProductWindow.xaml new file mode 100644 index 00000000..f244f785 --- /dev/null +++ b/BBWY.Client/Views/StorePickSelf/QualityStorePickProductWindow.xaml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/BBWY.Client/Views/StorePickSelf/QualityStorePickProductWindow.xaml.cs b/BBWY.Client/Views/StorePickSelf/QualityStorePickProductWindow.xaml.cs new file mode 100644 index 00000000..0c365241 --- /dev/null +++ b/BBWY.Client/Views/StorePickSelf/QualityStorePickProductWindow.xaml.cs @@ -0,0 +1,56 @@ +using BBWY.Client.Models.PackTask; +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.StorePickSelf +{ + /// + /// QualityStorePickProductWindow.xaml 的交互逻辑 + /// + public partial class QualityStorePickProductWindow : BWindow + { + public QualityStorePickProductWindow(StoreGetSelfResponse model, Func SaveData) + { + InitializeComponent(); + StoreGetSelfResponse = model; + InitializeComponent(); + this.DataContext = this; + } + private string userName; + /// + /// 用户名 + /// + public string UserName { get => userName; set { Set(ref userName, value); } } + + private int count; + + public int Count { get => count; set { Set(ref count, value); } } + + private StoreGetSelfResponse storeGetSelfResponse; + + public StoreGetSelfResponse StoreGetSelfResponse { get => storeGetSelfResponse; set { Set(ref storeGetSelfResponse, value); } } + private void BButton_Click(object sender, RoutedEventArgs e) + { + if (SaveData != null && SaveData.Invoke(Count, UserName)) + { + this.Close(); + } + + } + private Func SaveData { get; set; } + private void BButton_Click_1(object sender, RoutedEventArgs e) + { + Count = StoreGetSelfResponse.PickMaxCount; + } + } +} diff --git a/BBWY.Client/Views/StorePickSelf/StorePickProductWindow.xaml b/BBWY.Client/Views/StorePickSelf/StorePickProductWindow.xaml index 183ce15a..671a191c 100644 --- a/BBWY.Client/Views/StorePickSelf/StorePickProductWindow.xaml +++ b/BBWY.Client/Views/StorePickSelf/StorePickProductWindow.xaml @@ -22,8 +22,8 @@ - + Background="{StaticResource Button.Background}"> + @@ -33,7 +33,9 @@ - + + + diff --git a/BBWY.Client/Views/StorePickSelf/StorePickProductWindow.xaml.cs b/BBWY.Client/Views/StorePickSelf/StorePickProductWindow.xaml.cs index 6ce46085..f2f3b603 100644 --- a/BBWY.Client/Views/StorePickSelf/StorePickProductWindow.xaml.cs +++ b/BBWY.Client/Views/StorePickSelf/StorePickProductWindow.xaml.cs @@ -22,13 +22,23 @@ namespace BBWY.Client.Views.StorePickSelf /// public partial class StorePickProductWindow : BWindow { - public StorePickProductWindow(StoreGetSelfResponse model, Func SaveData) + public StorePickProductWindow(StoreGetSelfResponse model, Func SaveData,bool _isQuality) { this. SaveData=SaveData; StoreGetSelfResponse =model; InitializeComponent(); this.DataContext = this; + + IsQuality = _isQuality; } + + private bool isQuality; + + public bool IsQuality { get => isQuality; set { Set(ref isQuality, value); } } + + + + private string userName; /// /// 用户名