pengcong001
/
bbwy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

新增待排单状态

AddValidOverTime
506583276@qq.com 2 years ago
parent
a759475064
commit
a8e7359ef4
12 changed files with 281 additions and 106 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      BBWY.Client/Models/APIModel/Response/PackTask/ProductSkuCountsResponse.cs
  2. 9
      BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs
  3. 17
      BBWY.Client/Models/Enums.cs
  4. 23
      BBWY.Client/Models/PackTask/PackTaskModel.cs
  5. 56
      BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
  6. 120
      BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
  7. 46
      BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml
  8. 6
      BBWY.Client/Views/PackTask/TaskList.xaml
  9. 93
      BBWY.Client/Views/PackTask/WaitPackageControl.xaml
  10. 6
      BBWY.Client/Views/PackTask/WareHouseList.xaml
  11. 2
      BBWY.Client/Views/QualityTask/WaitQualityControl.xaml
  12. 4
      BBWY.Client/Views/TaskOverTime/SubmitOverTimeMarkMsgWindow.xaml.cs

5
BBWY.Client/Models/APIModel/Response/PackTask/ProductSkuCountsResponse.cs
View File

@ -52,5 +52,10 @@ namespace BBWY.Client.Models.APIModel.Response.PackTask
/// 待转运 /// 待转运
/// </summary> /// </summary>
public int? WaitTransportCount { get; set; } public int? WaitTransportCount { get; set; }
/// <summary>
/// 待排单
/// </summary>
public int? WaitScheduleCount { get; set; }
} }
} }

9
BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs
View File

@ -196,6 +196,15 @@ namespace BBWY.Client.Models.APIModel
/// 采购方案 /// 采购方案
/// </summary> /// </summary>
public string SkuPurchaseSchemeId { get; set; } public string SkuPurchaseSchemeId { get; set; }
/// <summary>
/// 排单超时备注信息
/// </summary>
public string ScheduleOverTimeMarkMsg { get; set; }
/// <summary>
/// 排单超时时间
/// </summary>
public DateTime? ScheduleOverTime { get; set; }
} }
public class ExpressOrderResponse public class ExpressOrderResponse
{ {

17
BBWY.Client/Models/Enums.cs
View File

@ -216,18 +216,7 @@
未到货 = 2, 未到货 = 2,
} }
/////// <summary>
/////// 快递到货情况
/////// </summary>
//public enum TaskState
//{
// 已到货 = 0,
// 部分到货 = 1,
// 未到货 = 2,
// 已完成 = 3,
// 全部 = 4,
// 加急 = 5
//}
/// <summary> /// <summary>
/// 仓库打包任务状态 /// 仓库打包任务状态
/// </summary> /// </summary>
@ -245,7 +234,8 @@
//待完结 = 9, //待完结 = 9,
商家自取 = 10, 商家自取 = 10,
待转运=11, 待转运=11,
已超时=12 已超时=12,
待排单 =13,
} }
@ -528,6 +518,7 @@
待封箱 = 4, 待封箱 = 4,
待落仓 = 8, 待落仓 = 8,
待转运 = 11, 待转运 = 11,
待排单=13,
} }
/// <summary> /// <summary>

23
BBWY.Client/Models/PackTask/PackTaskModel.cs
View File

@ -396,6 +396,23 @@ namespace BBWY.Client.Models
private bool isPackOverTime; private bool isPackOverTime;
public bool IsPackOverTime { get => isPackOverTime; set { Set(ref isPackOverTime, value); } } public bool IsPackOverTime { get => isPackOverTime; set { Set(ref isPackOverTime, value); } }
private bool isScheduleOverTime;
public bool IsScheduleOverTime { get => isScheduleOverTime; set { Set(ref isScheduleOverTime, value); } }
private string scheduleRemainTime;
/// <summary>
/// 打包剩余时间
/// </summary>
public string ScheduleRemainTime { get => scheduleRemainTime; set { Set(ref scheduleRemainTime, value); } }
/// <summary>
/// 排单超时备注信息
/// </summary>
public string ScheduleOverTimeMarkMsg { get; set; }
/// <summary> /// <summary>
/// 物流信息 /// 物流信息
/// </summary> /// </summary>
@ -436,6 +453,12 @@ namespace BBWY.Client.Models
/// </summary> /// </summary>
public string SkuPurchaseSchemeId { get; set; } public string SkuPurchaseSchemeId { get; set; }
/// <summary>
/// 排单超时时间
/// </summary>
public DateTime? ScheduleOverTime { get; set; }
} }
public class SkuMessage : NotifyObject public class SkuMessage : NotifyObject

56
BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
View File

@ -186,6 +186,13 @@ namespace BBWY.Client.ViewModels.PackTask
public bool IsLoading { get => isLoading; set { Set(ref isLoading, value); } } public bool IsLoading { get => isLoading; set { Set(ref isLoading, value); } }
private string waitScheduleCount;
/// <summary>
/// 待排单任务数
/// </summary>
public string WaitScheduleCount { get => waitScheduleCount; set { Set(ref waitScheduleCount, value); } }
private string waitPackCount; private string waitPackCount;
/// <summary> /// <summary>
/// 待打包任务数 /// 待打包任务数
@ -412,6 +419,7 @@ namespace BBWY.Client.ViewModels.PackTask
WaitSealBoxCount = packTaskResult.Data.WaitSealBox?.ToString(); WaitSealBoxCount = packTaskResult.Data.WaitSealBox?.ToString();
WaitFallWareCount = packTaskResult.Data.WaitFallWareCount?.ToString(); WaitFallWareCount = packTaskResult.Data.WaitFallWareCount?.ToString();
WaitCompleted = packTaskResult.Data.WaitCompleted?.ToString(); WaitCompleted = packTaskResult.Data.WaitCompleted?.ToString();
WaitScheduleCount = packTaskResult.Data.WaitScheduleCount?.ToString();
})); }));
} }
} }
@ -508,6 +516,7 @@ namespace BBWY.Client.ViewModels.PackTask
private Thread packOverTimeThread = null; private Thread packOverTimeThread = null;
private Thread sealboxOverTimeThread = null; private Thread sealboxOverTimeThread = null;
private Thread fallwareOverTimeThread = null; private Thread fallwareOverTimeThread = null;
private Thread scheduleOverTimeThread = null;
/// <summary> /// <summary>
/// 搜索任务列表 /// 搜索任务列表
/// </summary> /// </summary>
@ -578,6 +587,8 @@ namespace BBWY.Client.ViewModels.PackTask
PackCompletionOverTime = item.PackCompletionOverTime, PackCompletionOverTime = item.PackCompletionOverTime,
ShopName = item.ShopName, ShopName = item.ShopName,
SkuPurchaseSchemeId = item.SkuPurchaseSchemeId, SkuPurchaseSchemeId = item.SkuPurchaseSchemeId,
ScheduleOverTimeMarkMsg = item.ScheduleOverTimeMarkMsg,
ScheduleOverTime = item.ScheduleOverTime
}; };
if (!item.OrderId.IsNullOrEmpty() && !item.SkuId.IsNullOrEmpty())//加载物流信息 if (!item.OrderId.IsNullOrEmpty() && !item.SkuId.IsNullOrEmpty())//加载物流信息
@ -719,8 +730,51 @@ namespace BBWY.Client.ViewModels.PackTask
} }
} }
if (TaskState == Models.TaskState.待排单)
{
var packCompletedTasks = PackTaskList.Where(p => p.TaskState == Models.TaskState.待排单 && p.ScheduleOverTime != null).ToList();
if (packCompletedTasks.Count() > 0)
{
//if (packOverTimeThread!=null)
//{
// packOverTimeThread.Abort();
//}
scheduleOverTimeThread = new Thread(() =>
{
IsStartThread = true;
while (IsStartThread)
{
App.Current.Dispatcher.BeginInvoke(new Action(() =>
{
foreach (var item in packCompletedTasks)
{
var datetime = item.ScheduleOverTime.Value.Subtract(DateTime.Now);
if (datetime.TotalMilliseconds > 0)
{
item.IsScheduleOverTime = false;
item.ScheduleRemainTime = OverTimeHelper.GetTimeString(datetime);
}
else
{
item.IsScheduleOverTime = true;
item.ScheduleRemainTime = OverTimeHelper.GetTimeString(datetime);
}
}
}));
Thread.Sleep(1000);
}
});
//任务倒计时数据
scheduleOverTimeThread.IsBackground = true;
scheduleOverTimeThread.Start();
}
}
} }

120
BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
View File

@ -199,7 +199,7 @@ namespace BBWY.Client.ViewModels.PackTask
public ObservableCollection<OverTimeTaskResponse> OverTimeTaskList { get => overTimeTaskList; set { Set(ref overTimeTaskList, value); } } public ObservableCollection<OverTimeTaskResponse> OverTimeTaskList { get => overTimeTaskList; set { Set(ref overTimeTaskList, value); } }
private ObservableCollection<OverTimeTaskType> overTimeTaskTypeList = new ObservableCollection<OverTimeTaskType> { private ObservableCollection<OverTimeTaskType> overTimeTaskTypeList = new ObservableCollection<OverTimeTaskType> {
OverTimeTaskType.全部, OverTimeTaskType.待验收, OverTimeTaskType.待打包, OverTimeTaskType.待封箱, OverTimeTaskType.待落仓, OverTimeTaskType.待转运 OverTimeTaskType.全部, OverTimeTaskType.待验收, OverTimeTaskType.待排单, OverTimeTaskType.待打包, OverTimeTaskType.待封箱, OverTimeTaskType.待落仓, OverTimeTaskType.待转运
}; };
/// <summary> /// <summary>
///超时任务类型 ///超时任务类型
@ -406,9 +406,16 @@ namespace BBWY.Client.ViewModels.PackTask
/// </summary> /// </summary>
public string ArrivedCount { get => arrivedCount; set { Set(ref arrivedCount, value); } } public string ArrivedCount { get => arrivedCount; set { Set(ref arrivedCount, value); } }
private string waitScheduleCount;
/// <summary>
/// 待排单任务数
/// </summary>
public string WaitScheduleCount { get => waitScheduleCount; set { Set(ref waitScheduleCount, value); } }
private string waitPackCount; private string waitPackCount;
/// <summary> /// <summary>
/// 待打包任务数 /// 待打包任务数
@ -582,6 +589,9 @@ namespace BBWY.Client.ViewModels.PackTask
case Models.TaskState.待验收: case Models.TaskState.待验收:
overTimeTaskType = Models.OverTimeTaskType.待验收; overTimeTaskType = Models.OverTimeTaskType.待验收;
break; break;
case Models.TaskState.待排单:
overTimeTaskType = Models.OverTimeTaskType.待排单;
break;
case Models.TaskState.待打包: case Models.TaskState.待打包:
overTimeTaskType = Models.OverTimeTaskType.待打包; overTimeTaskType = Models.OverTimeTaskType.待打包;
break; break;
@ -1133,6 +1143,7 @@ namespace BBWY.Client.ViewModels.PackTask
private bool IsStartThread = false; private bool IsStartThread = false;
private Thread qualityOverTimeThread = null; private Thread qualityOverTimeThread = null;
private Thread packOverTimeThread = null; private Thread packOverTimeThread = null;
private Thread scheduleOverTimeThread = null;
private Thread sealboxOverTimeThread = null; private Thread sealboxOverTimeThread = null;
private Thread fallwareOverTimeThread = null; private Thread fallwareOverTimeThread = null;
private Thread waitTransportOverTimeThread = null; private Thread waitTransportOverTimeThread = null;
@ -1320,50 +1331,7 @@ namespace BBWY.Client.ViewModels.PackTask
}); });
})); }));
} }
//var fallWareTasks = WaitFallWareList.Where(p => p.SetPurchaseOrderOverTime != null).ToList();
//if (fallWareTasks.Count() > 0 && TaskState == Models.TaskState.待落仓 && SealBoxConfigureType == SealBoxConfigureType.待配置)
//{
// //if (packOverTimeThread!=null)
// //{
// // packOverTimeThread.Abort();
// //}
// fallwareOverTimeThread = new Thread(() =>
// {
// IsStartThread = true;
// while (IsStartThread)
// {
// App.Current.Dispatcher.BeginInvoke(new Action(() =>
// {
// foreach (var item in fallWareTasks)
// {
// var datetime = item.SetPurchaseOrderOverTime.Value.Subtract(DateTime.Now);
// if (datetime.TotalMilliseconds > 0)
// {
// item.IsFallWareOverTime = false;
// item.FallWareRemainTime = $"{datetime.Hours}小时{datetime.Minutes}分";
// }
// else
// {
// item.IsFallWareOverTime = true;
// item.FallWareRemainTime = datetime.Days == 0 ? $"{-datetime.Hours}小时{-datetime.Minutes}分" : $"{-datetime.Days}天{-datetime.Hours}小时{-datetime.Minutes}分";
// }
// }
// }));
// Thread.Sleep(1000);
// }
// });
// //任务倒计时数据
// fallwareOverTimeThread.IsBackground = true;
// fallwareOverTimeThread.Start();
//}
} }
else else
{ {
@ -1377,8 +1345,7 @@ namespace BBWY.Client.ViewModels.PackTask
else if (TaskState == Models.TaskState.待封箱) else if (TaskState == Models.TaskState.待封箱)
Task.Factory.StartNew(() => Task.Factory.StartNew(() =>
{ {
//var randNum = new Random().Next(81, 90);
var randNum = 90;
if (SealBoxConfigureType == SealBoxConfigureType.已配置) if (SealBoxConfigureType == SealBoxConfigureType.已配置)
{ {
@ -1401,7 +1368,7 @@ namespace BBWY.Client.ViewModels.PackTask
SealBoxSkus = item.SealBoxSkus.Select(s => SealBoxSkus = item.SealBoxSkus.Select(s =>
{ {
s.Logo = s.Logo.Replace("80x80", $"{randNum}x{randNum}"); s.Logo = s.Logo;
return s; return s;
}).ToList(), }).ToList(),
ShopId = item.ShopId, ShopId = item.ShopId,
@ -1480,7 +1447,7 @@ namespace BBWY.Client.ViewModels.PackTask
DepartmentName = item.DepartmentName, DepartmentName = item.DepartmentName,
SealBoxSkus = item.SealBoxSkus.Select(s => SealBoxSkus = item.SealBoxSkus.Select(s =>
{ {
s.Logo = s.Logo.Replace("80x80", $"{randNum}x{randNum}"); s.Logo = s.Logo;
return s; return s;
}).ToList(), }).ToList(),
ShopId = item.ShopId, ShopId = item.ShopId,
@ -1547,7 +1514,9 @@ namespace BBWY.Client.ViewModels.PackTask
QualityOverTimeMarkMsg = item.QualityOverTimeMarkMsg, QualityOverTimeMarkMsg = item.QualityOverTimeMarkMsg,
PackOverTimeMarkMsg = item.PackOverTimeMarkMsg, PackOverTimeMarkMsg = item.PackOverTimeMarkMsg,
ShowMarkMessage = item.ShowMarkMessage, ShowMarkMessage = item.ShowMarkMessage,
SkuPurchaseSchemeId = item.SkuPurchaseSchemeId SkuPurchaseSchemeId = item.SkuPurchaseSchemeId,
ScheduleOverTimeMarkMsg = item.ScheduleOverTimeMarkMsg,
ScheduleOverTime = item.ScheduleOverTime
}; };
@ -1663,11 +1632,7 @@ namespace BBWY.Client.ViewModels.PackTask
var packCompletedTasks = PackTaskList.Where(p => p.TaskState == Models.TaskState.待打包 && p.PackCompletionOverTime != null).ToList(); var packCompletedTasks = PackTaskList.Where(p => p.TaskState == Models.TaskState.待打包 && p.PackCompletionOverTime != null).ToList();
if (packCompletedTasks.Count() > 0) if (packCompletedTasks.Count() > 0)
{ {
//if (packOverTimeThread!=null)
//{
// packOverTimeThread.Abort();
//}
packOverTimeThread = new Thread(() => packOverTimeThread = new Thread(() =>
{ {
IsStartThread = true; IsStartThread = true;
@ -1704,6 +1669,52 @@ namespace BBWY.Client.ViewModels.PackTask
} }
if (TaskState == Models.TaskState.待排单)
{
var packCompletedTasks = PackTaskList.Where(p => p.TaskState == Models.TaskState.待排单 && p.ScheduleOverTime != null).ToList();
if (packCompletedTasks.Count() > 0)
{
//if (packOverTimeThread!=null)
//{
// packOverTimeThread.Abort();
//}
scheduleOverTimeThread = new Thread(() =>
{
IsStartThread = true;
while (IsStartThread)
{
App.Current.Dispatcher.BeginInvoke(new Action(() =>
{
foreach (var item in packCompletedTasks)
{
var datetime = item.ScheduleOverTime.Value.Subtract(DateTime.Now);
if (datetime.TotalMilliseconds > 0)
{
item.IsScheduleOverTime = false;
item.ScheduleRemainTime = OverTimeHelper.GetTimeString(datetime);
}
else
{
item.IsScheduleOverTime = true;
item.ScheduleRemainTime = OverTimeHelper.GetTimeString(datetime);
}
}
}));
Thread.Sleep(1000);
}
});
//任务倒计时数据
scheduleOverTimeThread.IsBackground = true;
scheduleOverTimeThread.Start();
}
}
//任务状态为待打包 //任务状态为待打包
} }
@ -1767,6 +1778,7 @@ namespace BBWY.Client.ViewModels.PackTask
WaitFallWareCount = packTaskResult.Data.WaitFallWareCount?.ToString(); WaitFallWareCount = packTaskResult.Data.WaitFallWareCount?.ToString();
WaitCompleted = packTaskResult.Data.WaitCompleted?.ToString(); WaitCompleted = packTaskResult.Data.WaitCompleted?.ToString();
WaitTransportCount = packTaskResult.Data.WaitTransportCount?.ToString(); WaitTransportCount = packTaskResult.Data.WaitTransportCount?.ToString();
WaitScheduleCount = packTaskResult.Data.WaitScheduleCount?.ToString();
})); }));
} }
} }

46
BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml
View File

@ -349,22 +349,52 @@
</StackPanel> </StackPanel>
</Grid> </Grid>
<Grid Grid.Column="8" > <Grid Grid.Column="8" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:Visible:Collapsed}">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding PackRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}" Visibility="{Binding PackRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
> >
<StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" <StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding IsPackOverTime,Converter={StaticResource objConverter},ConverterParameter=false:Visible:Collapsed}" Visibility="{Binding IsPackOverTime,Converter={StaticResource objConverter},ConverterParameter=false:Visible:Collapsed}"
> >
<TextBlock Text="剩余: " /> <TextBlock Text="剩余: " />
<TextBlock Text="{Binding PackRemainTime}"/> <TextBlock Text="{Binding PackRemainTime}"/>
</StackPanel>
<StackPanel Margin="10,5" Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding IsPackOverTime,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}">
<StackPanel Orientation="Horizontal"
>
<TextBlock Foreground="Red" Text="超时: "/>
<TextBlock Foreground="Red" Text="{Binding PackRemainTime}"/>
</StackPanel>
</StackPanel>
</StackPanel> </StackPanel>
<StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" </StackPanel>
Visibility="{Binding IsPackOverTime,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}" <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待排单:Visible:Collapsed}"
>
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding ScheduleRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
>
<StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding IsScheduleOverTime,Converter={StaticResource objConverter},ConverterParameter=false:Visible:Collapsed}"
> >
<TextBlock Foreground="Red" Text="超时: "/> <TextBlock Text="剩余: " />
<TextBlock Foreground="Red" Text="{Binding PackRemainTime}"/> <TextBlock Text="{Binding ScheduleRemainTime}"/>
</StackPanel>
<StackPanel Margin="10,5" Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding IsScheduleOverTime,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}">
<StackPanel Orientation="Horizontal"
>
<TextBlock Foreground="Red" Text="超时: "/>
<TextBlock Foreground="Red" Text="{Binding ScheduleRemainTime}"/>
</StackPanel>
</StackPanel>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</Grid> </Grid>

6
BBWY.Client/Views/PackTask/TaskList.xaml
View File

@ -93,6 +93,9 @@
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:True:False}" IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:True:False}"
/> />
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待排单}" Content="待排单" Tag="{Binding WaitScheduleCount,Mode=TwoWay}"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待排单:True:False}"
/>
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待打包}" Content="待打包" Tag="{Binding WaitPackCount,Mode=TwoWay}" <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待打包}" Content="待打包" Tag="{Binding WaitPackCount,Mode=TwoWay}"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:True:False}" IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:True:False}"
/> />
@ -184,7 +187,7 @@
<Grid Grid.Row="3" Margin="0,5,0,0"> <Grid Grid.Row="3" Margin="0,5,0,0">
<local:TaskListControl x:Name="listbox_task" <local:TaskListControl x:Name="listbox_task"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱|待落仓|待验收|待打包|待出库:Collapsed:Visible}" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱|待落仓|待验收|待打包|待出库|待排单:Collapsed:Visible}"
/> />
@ -194,6 +197,7 @@
<waitquality:ShopWaitQualityControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:Visible:Collapsed}" /> <waitquality:ShopWaitQualityControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:Visible:Collapsed}" />
<local:ShopWaitPackageControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待排单:Visible:Collapsed}" />
<local:ShopWaitPackageControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:Visible:Collapsed}" /> <local:ShopWaitPackageControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:Visible:Collapsed}" />
<local:ShopWaitCompletedControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待出库:Visible:Collapsed}" /> <local:ShopWaitCompletedControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待出库:Visible:Collapsed}" />

93
BBWY.Client/Views/PackTask/WaitPackageControl.xaml
View File

@ -528,40 +528,81 @@
</Grid> </Grid>
<Grid Grid.Column="9"> <Grid Grid.Column="9">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:Visible:Collapsed}">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding PackRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}" Visibility="{Binding PackRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
> >
<StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" <StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding IsPackOverTime,Converter={StaticResource objConverter},ConverterParameter=false:Visible:Collapsed}" Visibility="{Binding IsPackOverTime,Converter={StaticResource objConverter},ConverterParameter=false:Visible:Collapsed}"
> >
<TextBlock Text="剩余: " /> <TextBlock Text="剩余: " />
<TextBlock Text="{Binding PackRemainTime}"/> <TextBlock Text="{Binding PackRemainTime}"/>
</StackPanel> </StackPanel>
<StackPanel Margin="10,5" Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Center" <StackPanel Margin="10,5" Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding IsPackOverTime,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}"> Visibility="{Binding IsPackOverTime,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}">
<StackPanel Orientation="Horizontal" <StackPanel Orientation="Horizontal"
> >
<TextBlock Foreground="Red" Text="超时: "/> <TextBlock Foreground="Red" Text="超时: "/>
<TextBlock Foreground="Red" Text="{Binding PackRemainTime}"/> <TextBlock Foreground="Red" Text="{Binding PackRemainTime}"/>
</StackPanel> </StackPanel>
<c:BButton Margin="0 10 0 0" Content="{Binding PackOverTimeMarkMsg ,Converter={StaticResource objConverter},ConverterParameter=#null:提交备注:修改备注}" Style="{StaticResource LinkButton}" <c:BButton Margin="0 10 0 0" Content="{Binding PackOverTimeMarkMsg ,Converter={StaticResource objConverter},ConverterParameter=#null:提交备注:修改备注}" Style="{StaticResource LinkButton}"
CommandParameter="{Binding TaskId}" CommandParameter="{Binding TaskId}"
> >
<b:Interaction.Triggers> <b:Interaction.Triggers>
<b:EventTrigger EventName="PreviewMouseLeftButtonDown"> <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
<b:InvokeCommandAction Command="{Binding DataContext.SubmitOverTimeMarkMsgCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"> <b:InvokeCommandAction Command="{Binding DataContext.SubmitOverTimeMarkMsgCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}">
<b:InvokeCommandAction.CommandParameter> <b:InvokeCommandAction.CommandParameter>
<MultiBinding Converter="{StaticResource mptConverter}"> <MultiBinding Converter="{StaticResource mptConverter}">
<Binding Path="TaskId"/> <Binding Path="TaskId"/>
<Binding Path="PackOverTimeMarkMsg"/> <Binding Path="PackOverTimeMarkMsg"/>
</MultiBinding> </MultiBinding>
</b:InvokeCommandAction.CommandParameter> </b:InvokeCommandAction.CommandParameter>
</b:InvokeCommandAction> </b:InvokeCommandAction>
</b:EventTrigger> </b:EventTrigger>
</b:Interaction.Triggers> </b:Interaction.Triggers>
</c:BButton> </c:BButton>
</StackPanel>
</StackPanel>
</StackPanel>
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待排单:Visible:Collapsed}"
>
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding ScheduleRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
>
<StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding IsScheduleOverTime,Converter={StaticResource objConverter},ConverterParameter=false:Visible:Collapsed}"
>
<TextBlock Text="剩余: " />
<TextBlock Text="{Binding ScheduleRemainTime}"/>
</StackPanel>
<StackPanel Margin="10,5" Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding IsScheduleOverTime,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}">
<StackPanel Orientation="Horizontal"
>
<TextBlock Foreground="Red" Text="超时: "/>
<TextBlock Foreground="Red" Text="{Binding ScheduleRemainTime}"/>
</StackPanel>
<c:BButton Margin="0 10 0 0" Content="{Binding ScheduleOverTimeMarkMsg ,Converter={StaticResource objConverter},ConverterParameter=#null:提交备注:修改备注}" Style="{StaticResource LinkButton}"
>
<b:Interaction.Triggers>
<b:EventTrigger EventName="PreviewMouseLeftButtonDown">
<b:InvokeCommandAction Command="{Binding DataContext.SubmitOverTimeMarkMsgCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}">
<b:InvokeCommandAction.CommandParameter>
<MultiBinding Converter="{StaticResource mptConverter}">
<Binding Path="TaskId"/>
<Binding Path="ScheduleOverTimeMarkMsg"/>
</MultiBinding>
</b:InvokeCommandAction.CommandParameter>
</b:InvokeCommandAction>
</b:EventTrigger>
</b:Interaction.Triggers>
</c:BButton>
</StackPanel>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</Grid> </Grid>
@ -577,7 +618,7 @@
<c:BButton HorizontalAlignment="Center" Height="20" Style="{StaticResource LinkButton}" VerticalAlignment="Center" Grid.Row="1" <c:BButton HorizontalAlignment="Center" Height="20" Style="{StaticResource LinkButton}" VerticalAlignment="Center" Grid.Row="1"
Content="{Binding FeesItemResponse,Converter={StaticResource objConverter},ConverterParameter=#null:打包设置:修改设置 }" Content="{Binding FeesItemResponse,Converter={StaticResource objConverter},ConverterParameter=#null:打包设置:修改设置 }"
Command="{Binding SetServiceCommand}" Command="{Binding SetServiceCommand}"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:Visible:Collapsed}" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包|待排单:Visible:Collapsed}"
/> />
<c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center" Grid.Row="1" Content="验收" <c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center" Grid.Row="1" Content="验收"
@ -611,7 +652,7 @@
<c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center" Grid.Row="1" Content="商家自取" <c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center" Grid.Row="1" Content="商家自取"
CommandParameter="{Binding TaskId}" CommandParameter="{Binding TaskId}"
Command="{Binding DataContext.StoreGetBySelfCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" Command="{Binding DataContext.StoreGetBySelfCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收|待打包:Visible:Collapsed}" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待排单|待打包:Visible:Collapsed}"
/> />
<hc:SplitButton Content="更多操作" Foreground="{StaticResource Button.Background}" BorderThickness="0" HitMode="Hover" HorizontalAlignment="Stretch"> <hc:SplitButton Content="更多操作" Foreground="{StaticResource Button.Background}" BorderThickness="0" HitMode="Hover" HorizontalAlignment="Stretch">
<hc:SplitButton.Resources> <hc:SplitButton.Resources>

6
BBWY.Client/Views/PackTask/WareHouseList.xaml
View File

@ -99,6 +99,9 @@
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:True:False}" IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:True:False}"
/> />
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待排单}" Content="待排单" Tag="{Binding WaitScheduleCount,Mode=TwoWay}"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待排单:True:False}"
/>
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待打包}" Content="待打包" Tag="{Binding WaitPackCount,Mode=TwoWay}" <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待打包}" Content="待打包" Tag="{Binding WaitPackCount,Mode=TwoWay}"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:True:False}" IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:True:False}"
/> />
@ -143,9 +146,10 @@
<Grid Grid.Row="1" Margin="0,5,0,0"> <Grid Grid.Row="1" Margin="0,5,0,0">
<fallware:WareFallWareListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待落仓:Visible:Collapsed}" /> <fallware:WareFallWareListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待落仓:Visible:Collapsed}" />
<local:WareHouseListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱|待落仓|待验收|待打包|待转运|已超时|待出库:Collapsed:Visible}" /> <local:WareHouseListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱|待落仓|待验收|待打包|待转运|已超时|待出库|待排单:Collapsed:Visible}" />
<fallware:WareFallWareListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱:Visible:Collapsed}" /> <fallware:WareFallWareListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱:Visible:Collapsed}" />
<waitquality:WaitQualityControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:Visible:Collapsed}" /> <waitquality:WaitQualityControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:Visible:Collapsed}" />
<local:WaitPackageControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待排单:Visible:Collapsed}" />
<local:WaitPackageControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:Visible:Collapsed}" /> <local:WaitPackageControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待打包:Visible:Collapsed}" />
<waittransport:WareWaitTransportListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待转运:Visible:Collapsed}" /> <waittransport:WareWaitTransportListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待转运:Visible:Collapsed}" />
<taskovertime:WareTaskOverTimeControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=已超时:Visible:Collapsed}" /> <taskovertime:WareTaskOverTimeControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=已超时:Visible:Collapsed}" />

2
BBWY.Client/Views/QualityTask/WaitQualityControl.xaml
View File

@ -628,7 +628,7 @@
<c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center" Grid.Row="1" Content="商家自取" <c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center" Grid.Row="1" Content="商家自取"
CommandParameter="{Binding TaskId}" CommandParameter="{Binding TaskId}"
Command="{Binding DataContext.StoreGetBySelfCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" Command="{Binding DataContext.StoreGetBySelfCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收|待打包:Visible:Collapsed}" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待排单|待打包:Visible:Collapsed}"
/> />

4
BBWY.Client/Views/TaskOverTime/SubmitOverTimeMarkMsgWindow.xaml.cs
View File

@ -68,7 +68,9 @@ namespace BBWY.Client.Views.TaskOverTime
return; return;
} }
if (reflashWindow != null) reflashWindow(); if (reflashWindow != null) reflashWindow();
this.Close();
App.Current.Dispatcher.Invoke(new Action(() => { this.Close(); }));
} }
} }
} }

Write Preview
Loading…
Cancel
Save