|
|
@@ -70,43 +70,11 @@ namespace BPASmartClient |
|
|
|
/// </summary> |
|
|
|
private void NoCompleteOrderInit() |
|
|
|
{ |
|
|
|
|
|
|
|
|
|
|
|
#region 模拟数据 |
|
|
|
for (int i = 0; i < 5; i++) |
|
|
|
if (Json<KeepDataBase>.Data.orderLists.Count > 0) |
|
|
|
{ |
|
|
|
|
|
|
|
ObservableCollection<MorkOrder> morkOrders = new ObservableCollection<MorkOrder>(); |
|
|
|
for (int m = 0; m < 10; m++) |
|
|
|
{ |
|
|
|
morkOrders.Add(new MorkOrder() |
|
|
|
{ |
|
|
|
OrderPush = new MorkOrderPush(), |
|
|
|
OrderStatus = ORDER_STATUS.WAIT |
|
|
|
}); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Json<KeepDataBase>.Data.orderLists.Add(new OrderData() |
|
|
|
{ |
|
|
|
DeviceId = Convert.ToString((i % 2) == 0 ? 1 : 2), |
|
|
|
IsAllSelect = true, |
|
|
|
morkOrderPushes = morkOrders |
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
OrderListDialogView listDialogView = new OrderListDialogView(); |
|
|
|
listDialogView.ShowDialog(); |
|
|
|
} |
|
|
|
|
|
|
|
OrderListDialogView listDialogView = new OrderListDialogView(); |
|
|
|
listDialogView.ShowDialog(); |
|
|
|
#endregion |
|
|
|
|
|
|
|
//if (Json<KeepDataBase>.Data.orderLists.Count > 0) |
|
|
|
//{ |
|
|
|
// OrderListDialogView listDialogView = new OrderListDialogView(); |
|
|
|
// listDialogView.ShowDialog(); |
|
|
|
//} |
|
|
|
} |
|
|
|
|
|
|
|
private void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) |
|
|
|