diff --git a/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl1.xaml b/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl1.xaml
index 8cfb8fd9..1eb12eb5 100644
--- a/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl1.xaml
+++ b/BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl1.xaml
@@ -1,188 +1,189 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 设备是否运行
-
-
-
- 今日刷卡数
-
-
-
-
-
-
-
-
-
-
-
- 前一位刷卡人
-
-
-
- 当前刷卡人
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 设备是否运行
-
-
-
- 今日刷卡数
-
-
-
-
-
-
-
-
-
-
-
- 前一位刷卡人
-
-
-
- 当前刷卡人
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 设备是否运行
+
+
+
+ 今日刷卡数
+
+
+
+
+
+
+
+
+
+
+
+ 前一位刷卡人
+
+
+
+ 当前刷卡人
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 设备是否运行
+
+
+
+ 今日刷卡数
+
+
+
+
+
+
+
+
+
+
+
+ 前一位刷卡人
+
+
+
+ 当前刷卡人
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/BPASmartClient.ScreenLib/总监视大屏/ScreenALLControl.xaml b/BPASmartClient.ScreenLib/总监视大屏/ScreenALLControl.xaml
index 69fafb1d..1af604f5 100644
--- a/BPASmartClient.ScreenLib/总监视大屏/ScreenALLControl.xaml
+++ b/BPASmartClient.ScreenLib/总监视大屏/ScreenALLControl.xaml
@@ -373,7 +373,7 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 设备状态
+
+
+
+
+
+
+
+ 工作状态
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 炒锅加热挡位
+
+
+
+ 炒锅搅拌挡位
+
+
+
+
+
+
+
+
+
+
+ 炒锅翻转速度
+
+
+
+ 当前锅底温度
+
+
+
+
+
+
\ No newline at end of file
diff --git a/BPASmartClient.ScreenLib/炒锅/ScreenMinWokControl.xaml b/BPASmartClient.ScreenLib/炒锅/ScreenMinWokControl.xaml
index 402c3304..2c85b329 100644
--- a/BPASmartClient.ScreenLib/炒锅/ScreenMinWokControl.xaml
+++ b/BPASmartClient.ScreenLib/炒锅/ScreenMinWokControl.xaml
@@ -1,404 +1,404 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 设备状态
-
-
-
-
-
-
-
- 工作状态
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 炒锅加热挡位
-
-
-
- 炒锅搅拌挡位
-
-
-
-
-
-
-
-
-
-
- 炒锅翻转速度
-
-
-
- 当前锅底温度
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 设备状态
-
-
-
-
-
-
-
- 工作状态
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 炒锅加热挡位
-
-
-
- 炒锅搅拌挡位
-
-
-
-
-
-
-
-
-
-
- 炒锅翻转速度
-
-
-
- 当前锅底温度
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 设备状态
+
+
+
+
+
+
+
+ 工作状态
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 炒锅加热挡位
+
+
+
+ 炒锅搅拌挡位
+
+
+
+
+
+
+
+
+
+
+ 炒锅翻转速度
+
+
+
+ 当前锅底温度
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 设备状态
+
+
+
+
+
+
+
+ 工作状态
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 炒锅加热挡位
+
+
+
+ 炒锅搅拌挡位
+
+
+
+
+
+
+
+
+
+
+ 炒锅翻转速度
+
+
+
+ 当前锅底温度
+
+
+
+
+
+
\ No newline at end of file
diff --git a/BPASmartClient.ScreenLib/煮面机/ScreenMorksControl.xaml b/BPASmartClient.ScreenLib/煮面机/ScreenMorksControl.xaml
index c03ac645..e3f23ade 100644
--- a/BPASmartClient.ScreenLib/煮面机/ScreenMorksControl.xaml
+++ b/BPASmartClient.ScreenLib/煮面机/ScreenMorksControl.xaml
@@ -1,392 +1,393 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 设备状态
-
-
-
-
-
-
-
- 工作状态
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 今日订单数
-
-
-
-
-
-
-
- 机器人状态
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 煮面炉1号
-
-
-
-
-
-
-
- 煮面炉2号
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 煮面炉3号
-
-
-
-
-
-
-
- 煮面炉4号
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 煮面炉5号
-
-
-
-
-
-
-
- 煮面炉6号
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 温度状态
-
-
-
-
-
-
-
- 缺碗检测
-
-
-
-
-
-
-
-
-
-
-
-
- 料仓位置
-
-
-
-
-
-
-
- 料仓物料检测
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 设备状态
+
+
+
+
+
+
+
+ 工作状态
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 今日订单数
+
+
+
+
+
+
+
+ 机器人状态
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 煮面炉1号
+
+
+
+
+
+
+
+ 煮面炉2号
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 煮面炉3号
+
+
+
+
+
+
+
+ 煮面炉4号
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 煮面炉5号
+
+
+
+
+
+
+
+ 煮面炉6号
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 温度状态
+
+
+
+
+
+
+
+ 缺碗检测
+
+
+
+
+
+
+
+
+
+
+
+
+ 料仓位置
+
+
+
+
+
+
+
+ 料仓物料检测
+
+
+
+
+
+
\ No newline at end of file
diff --git a/WpfTest/MainWindow.xaml.cs b/WpfTest/MainWindow.xaml.cs
index e78dcae9..41174e5d 100644
--- a/WpfTest/MainWindow.xaml.cs
+++ b/WpfTest/MainWindow.xaml.cs
@@ -107,11 +107,14 @@ namespace WpfTest
public void Send(ScreenDeviceType screen)
{
+ int k2 =new Random().Next(0, 2);
SendScreenDataModel sendScreenData = new SendScreenDataModel();
List oRDER_STATUS = new List() { ORDER_STATUS.WAIT, ORDER_STATUS.COOKING, ORDER_STATUS.COMPLETED_COOK, ORDER_STATUS.COMPLETED_TAKE, ORDER_STATUS.ERR_NOT_REPLY_WHEN_COOKING };
- List name_s = new List() { "担担面", "鸡蛋面", "火鸡面", "扬州炒饭", "回锅肉盖饭" };
- List name_XM = new List() { "张三", "李四", "王五", "王麻子", "二狗子" };
+ List name_s = new List() { "回锅肉", "烂肉豇豆", "火爆腰花", "尖椒鸡杂", "回锅肉" };
+ List name_s_zm = new List() { "清汤面", "鸡蛋面", "火鸡面", "回锅肉面", "鸡杂面" };
+
+ List name_XM = new List() { "王权贵", "张哲", "李青古", "龙西", "李富贵" };
int k = new Random().Next(0, 5);
int M = new Random().Next(0, 5);
if (screen == ScreenDeviceType.大炒)
@@ -119,15 +122,15 @@ namespace WpfTest
sendScreenData.Name = screen;
sendScreenData.Value = new ScreenModelMaxWok
{
- IsRun = new Random().Next(0, 2) == 0 ? IsRun.运行 : IsRun.停止,
- WorkStatus_1 = new Random().Next(0, 2) == 0 ? WorkStatus.工作 : WorkStatus.待机,
- WorkStatus_2 = new Random().Next(0, 2) == 0 ? WorkStatus.工作 : WorkStatus.待机,
- RobotStatu = new Random().Next(0, 2) == 0 ? WorkStatus.工作 : WorkStatus.待机,
- Alarm = new List {
- new AlarmModel { AlarmTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), AlarmMs = "XXXX机构出现故障!!!!" },
- new AlarmModel { AlarmTime = DateTime.Now.AddSeconds(1).ToString("yyyy-MM-dd HH:mm:ss"), AlarmMs = "XXXX机构出现故障!!!!" },
- new AlarmModel { AlarmTime = DateTime.Now.AddSeconds(2).ToString("yyyy-MM-dd HH:mm:ss"), AlarmMs = "XXXX机构出现故障!!!!" },
- },
+ IsRun = k2 == 0 ? IsRun.运行 : IsRun.停止,
+ WorkStatus_1 = k2 == 0 ? WorkStatus.工作 : WorkStatus.待机,
+ WorkStatus_2 = k2 == 0 ? WorkStatus.工作 : WorkStatus.待机,
+ RobotStatu = k2 == 0 ? WorkStatus.工作 : WorkStatus.待机,
+ // Alarm = new List {
+ // new AlarmModel { AlarmTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), AlarmMs = "XXXX机构出现故障!!!!" },
+ // new AlarmModel { AlarmTime = DateTime.Now.AddSeconds(1).ToString("yyyy-MM-dd HH:mm:ss"), AlarmMs = "XXXX机构出现故障!!!!" },
+ // new AlarmModel { AlarmTime = DateTime.Now.AddSeconds(2).ToString("yyyy-MM-dd HH:mm:ss"), AlarmMs = "XXXX机构出现故障!!!!" },
+ //},
FailuresCount = 0,
StatsCount = new List {
new StatsModel{Name= name_s[0],Count=new Random().Next(0, 100)},
@@ -136,7 +139,7 @@ namespace WpfTest
new StatsModel{Name= name_s[3],Count=new Random().Next(0, 100)},
new StatsModel{Name= name_s[4],Count=new Random().Next(0, 100)},
},
- MaxWok_Dishes_1 = "猪肉炖粉条",
+ MaxWok_Dishes_1 = "回锅肉",
MaxWok_Task_1 = "炒菜中",
MaxWok_Process_1 = new List {
new ProcessModel{ Id=0,Name= "清洗", Status=(M==0) ? ProcessStatus.正在执行:((M>0)?ProcessStatus.执行完成:ProcessStatus.未执行)},
@@ -152,8 +155,8 @@ namespace WpfTest
MaxWok_OrderCount_1 = new Random().Next(0, 100),
MaxWok_ErrorOrderCount_1 = new Random().Next(0, 100),
- MaxWok_Dishes_2 = "烂肉排骨",
- MaxWok_Task_2 = "结算中",
+ MaxWok_Dishes_2 = "烂肉豇豆",
+ MaxWok_Task_2 = "炒菜中",
MaxWok_Process_2 = new List {
new ProcessModel{ Id=0,Name= "清洗", Status=(k==0) ? ProcessStatus.正在执行:((k>0)?ProcessStatus.执行完成:ProcessStatus.未执行)},
new ProcessModel{ Id=1,Name= "到菜", Status=(k==1) ? ProcessStatus.正在执行:((k>1)?ProcessStatus.执行完成:ProcessStatus.未执行)},
@@ -174,15 +177,15 @@ namespace WpfTest
sendScreenData.Name = screen;
sendScreenData.Value = new ScreenModelMinWok
{
- IsRun = new Random().Next(0, 2) == 0 ? IsRun.运行 : IsRun.停止,
- WorkStatus_1 = new Random().Next(0, 2) == 0 ? WorkStatus.工作 : WorkStatus.待机,
- WorkStatus_2 = new Random().Next(0, 2) == 0 ? WorkStatus.工作 : WorkStatus.待机,
- RobotStatu = new Random().Next(0, 2) == 0 ? WorkStatus.工作 : WorkStatus.待机,
- Alarm = new List {
- new AlarmModel { AlarmTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), AlarmMs = "XXXX机构出现故障!!!!" },
- new AlarmModel { AlarmTime = DateTime.Now.AddSeconds(1).ToString("yyyy-MM-dd HH:mm:ss"), AlarmMs = "XXXX机构出现故障!!!!" },
- new AlarmModel { AlarmTime = DateTime.Now.AddSeconds(2).ToString("yyyy-MM-dd HH:mm:ss"), AlarmMs = "XXXX机构出现故障!!!!" },
- },
+ IsRun = k2 == 0 ? IsRun.运行 : IsRun.停止,
+ WorkStatus_1 = k2 == 0 ? WorkStatus.工作 : WorkStatus.待机,
+ WorkStatus_2 = k2 == 0 ? WorkStatus.工作 : WorkStatus.待机,
+ RobotStatu = k2 == 0 ? WorkStatus.工作 : WorkStatus.待机,
+ // Alarm = new List {
+ // new AlarmModel { AlarmTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), AlarmMs = "XXXX机构出现故障!!!!" },
+ // new AlarmModel { AlarmTime = DateTime.Now.AddSeconds(1).ToString("yyyy-MM-dd HH:mm:ss"), AlarmMs = "XXXX机构出现故障!!!!" },
+ // new AlarmModel { AlarmTime = DateTime.Now.AddSeconds(2).ToString("yyyy-MM-dd HH:mm:ss"), AlarmMs = "XXXX机构出现故障!!!!" },
+ //},
FailuresCount = 0,
StatsCount = new List {
new StatsModel{Name= name_s[0],Count=new Random().Next(0, 100)},
@@ -191,7 +194,7 @@ namespace WpfTest
new StatsModel{Name= name_s[3],Count=new Random().Next(0, 100)},
new StatsModel{Name= name_s[4],Count=new Random().Next(0, 100)},
},
- MinWok_Dishes_1 = "猪肉炖粉条",
+ MinWok_Dishes_1 = "回锅肉",
MinWok_Task_1 = "炒菜中",
MinWok_Process_1 = new List {
new ProcessModel{ Id=0,Name= "清洗", Status=(M==0) ? ProcessStatus.正在执行:((M>0)?ProcessStatus.执行完成:ProcessStatus.未执行)},
@@ -207,8 +210,8 @@ namespace WpfTest
MinWok_OrderCount_1 = new Random().Next(0, 100),
MinWok_ErrorOrderCount_1 = new Random().Next(0, 100),
- MinWok_Dishes_2 = "烂肉排骨",
- MinWok_Task_2 = "结算中",
+ MinWok_Dishes_2 = "烂肉豇豆",
+ MinWok_Task_2 = "炒菜中",
MinWok_Process_2 = new List {
new ProcessModel{ Id=0,Name= "清洗", Status=(k==0) ? ProcessStatus.正在执行:((k>0)?ProcessStatus.执行完成:ProcessStatus.未执行)},
new ProcessModel{ Id=1,Name= "到菜", Status=(k==1) ? ProcessStatus.正在执行:((k>1)?ProcessStatus.执行完成:ProcessStatus.未执行)},
@@ -229,47 +232,47 @@ namespace WpfTest
sendScreenData.Name = screen;
sendScreenData.Value = new ScreenModelMorkS
{
- IsRun = new Random().Next(0, 2) == 0 ? IsRun.运行 : IsRun.停止,
- WorkStatus = new Random().Next(0, 2) == 0 ? WorkStatus.工作 : WorkStatus.待机,
- RobotStatu = new Random().Next(0, 2) == 0 ? WorkStatus.工作 : WorkStatus.待机,
+ IsRun = k2 == 0 ? IsRun.运行 : IsRun.停止,
+ WorkStatus = k2 == 0 ? WorkStatus.工作 : WorkStatus.待机,
+ RobotStatu = k2 == 0 ? WorkStatus.工作 : WorkStatus.待机,
Alarm = new List {
- new AlarmModel { AlarmTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), AlarmMs = "XXXX机构出现故障!!!!" },
- new AlarmModel { AlarmTime = DateTime.Now.AddSeconds(1).ToString("yyyy-MM-dd HH:mm:ss"), AlarmMs = "XXXX机构出现故障!!!!" },
- new AlarmModel { AlarmTime = DateTime.Now.AddSeconds(2).ToString("yyyy-MM-dd HH:mm:ss"), AlarmMs = "XXXX机构出现故障!!!!" },
- },
+ new AlarmModel { AlarmTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), AlarmMs = "煮面机警告,水温过低!!!!" },
+ //new AlarmModel { AlarmTime = DateTime.Now.AddSeconds(1).ToString("yyyy-MM-dd HH:mm:ss"), AlarmMs = "XXXX机构出现故障!!!!" },
+ //new AlarmModel { AlarmTime = DateTime.Now.AddSeconds(2).ToString("yyyy-MM-dd HH:mm:ss"), AlarmMs = "XXXX机构出现故障!!!!" },
+ },
FailuresCount = 0,
StatsCount = new List {
- new StatsModel{Name= name_s[0],Count=new Random().Next(0, 100)},
- new StatsModel{Name= name_s[1],Count=new Random().Next(0, 100)},
- new StatsModel{Name= name_s[2],Count=new Random().Next(0, 100)},
- new StatsModel{Name= name_s[3],Count=new Random().Next(0, 100)},
- new StatsModel{Name= name_s[4],Count=new Random().Next(0, 100)},
- },
+ new StatsModel { Name = name_s_zm[0], Count = new Random().Next(0, 100) },
+ new StatsModel { Name = name_s_zm[1], Count = new Random().Next(0, 100) },
+ new StatsModel { Name = name_s_zm[2], Count = new Random().Next(0, 100) },
+ new StatsModel { Name = name_s_zm[3], Count = new Random().Next(0, 100) },
+ new StatsModel { Name = name_s_zm[4], Count = new Random().Next(0, 100) },
+ },
MorkS_OrderCount = new Random().Next(0, 100),
MorkS_ErrorOrderCount = new Random().Next(0, 100),
- MorkS_NoodleUpOrDown_1 = new Random().Next(0, 2) == 0 ? "true" : "false",
- MorkS_NoodleUpOrDown_2 = new Random().Next(0, 2) == 0 ? "true" : "false",
- MorkS_NoodleUpOrDown_3 = new Random().Next(0, 2) == 0 ? "true" : "false",
- MorkS_NoodleUpOrDown_4 = new Random().Next(0, 2) == 0 ? "true" : "false",
- MorkS_NoodleUpOrDown_5 = new Random().Next(0, 2) == 0 ? "true" : "false",
- MorkS_NoodleUpOrDown_6 = new Random().Next(0, 2) == 0 ? "true" : "false",
+ MorkS_NoodleUpOrDown_1 = k2 == 0 ? "true" : "false",
+ MorkS_NoodleUpOrDown_2 = k2 == 0 ? "true" : "false",
+ MorkS_NoodleUpOrDown_3 = k2 == 0 ? "true" : "false",
+ MorkS_NoodleUpOrDown_4 = k2 == 0 ? "true" : "false",
+ MorkS_NoodleUpOrDown_5 = k2 == 0 ? "true" : "false",
+ MorkS_NoodleUpOrDown_6 = k2 == 0 ? "true" : "false",
- MorkS_Temp = new Random().Next(0, 2) == 0 ? "true" : "false",
+ MorkS_Temp = "false",// k2 == 0 ? "true" : "false",
MorkS_BinLocation = new Random().Next(0, 6).ToString(),
- MorkS_SiloMeas = new Random().Next(0, 2) == 0 ? "true" : "false",
- MorkS_NoBowMeas = new Random().Next(0, 2) == 0 ? "true" : "false",
+ MorkS_SiloMeas = k2 == 0 ? "true" : "false",
+ MorkS_NoBowMeas = k2 == 0 ? "true" : "false",
MakeOrder = new List {
- new OrderMakeModel { GoodName= name_s[new Random().Next(0, 5)], StartTime=DateTime.Now.ToString("HH:mm:ss"), Status=oRDER_STATUS[new Random().Next(0, 5)], SortNum=new Random().Next(0,100).ToString()},
- new OrderMakeModel { GoodName= name_s[new Random().Next(0, 5)], StartTime=DateTime.Now.ToString("HH:mm:ss"), Status=oRDER_STATUS[new Random().Next(0, 5)], SortNum=new Random().Next(0,100).ToString()},
- new OrderMakeModel { GoodName= name_s[new Random().Next(0, 5)], StartTime=DateTime.Now.ToString("HH:mm:ss"), Status=oRDER_STATUS[new Random().Next(0, 5)], SortNum=new Random().Next(0,100).ToString()},
- new OrderMakeModel { GoodName= name_s[new Random().Next(0, 5)], StartTime=DateTime.Now.ToString("HH:mm:ss"), Status=oRDER_STATUS[new Random().Next(0, 5)], SortNum=new Random().Next(0,100).ToString()},
- new OrderMakeModel { GoodName= name_s[new Random().Next(0, 5)], StartTime=DateTime.Now.ToString("HH:mm:ss"), Status=oRDER_STATUS[new Random().Next(0, 5)], SortNum=new Random().Next(0,100).ToString()},
- new OrderMakeModel { GoodName= name_s[new Random().Next(0, 5)], StartTime=DateTime.Now.ToString("HH:mm:ss"), Status=oRDER_STATUS[new Random().Next(0, 5)], SortNum=new Random().Next(0,100).ToString()},
- new OrderMakeModel { GoodName= name_s[new Random().Next(0, 5)], StartTime=DateTime.Now.ToString("HH:mm:ss"), Status=oRDER_STATUS[new Random().Next(0, 5)], SortNum=new Random().Next(0,100).ToString()},
- new OrderMakeModel { GoodName= name_s[new Random().Next(0, 5)], StartTime=DateTime.Now.ToString("HH:mm:ss"), Status=oRDER_STATUS[new Random().Next(0, 5)], SortNum=new Random().Next(0,100).ToString()},
- new OrderMakeModel { GoodName= name_s[new Random().Next(0, 5)], StartTime=DateTime.Now.ToString("HH:mm:ss"), Status=oRDER_STATUS[new Random().Next(0, 5)], SortNum=new Random().Next(0,100).ToString()},
- new OrderMakeModel { GoodName= name_s[new Random().Next(0, 5)], StartTime=DateTime.Now.ToString("HH:mm:ss"), Status=oRDER_STATUS[new Random().Next(0, 5)], SortNum=new Random().Next(0,100).ToString()},
- new OrderMakeModel { GoodName= name_s[new Random().Next(0, 5)], StartTime=DateTime.Now.ToString("HH:mm:ss"), Status=oRDER_STATUS[new Random().Next(0, 5)], SortNum=new Random().Next(0,100).ToString()},
+ new OrderMakeModel { GoodName= name_s_zm[new Random().Next(0, 5)], StartTime=DateTime.Now.ToString("HH:mm:ss"), Status=ORDER_STATUS.WAIT, SortNum="007".ToString()},
+ new OrderMakeModel { GoodName= name_s_zm[new Random().Next(0, 5)], StartTime=DateTime.Now.ToString("HH:mm:ss"), Status=ORDER_STATUS.WAIT, SortNum="008".ToString()},
+ new OrderMakeModel { GoodName= name_s_zm[new Random().Next(0, 5)], StartTime=DateTime.Now.ToString("HH:mm:ss"), Status=ORDER_STATUS.WAIT, SortNum="009".ToString()},
+ new OrderMakeModel { GoodName= name_s_zm[new Random().Next(0, 5)], StartTime=DateTime.Now.ToString("HH:mm:ss"), Status=ORDER_STATUS.WAIT, SortNum="010".ToString()},
+ new OrderMakeModel { GoodName= name_s_zm[new Random().Next(0, 5)], StartTime=DateTime.Now.ToString("HH:mm:ss"), Status=ORDER_STATUS.WAIT, SortNum="011".ToString()},
+ new OrderMakeModel { GoodName= name_s_zm[new Random().Next(0, 5)], StartTime=DateTime.Now.ToString("HH:mm:ss"), Status=ORDER_STATUS.COMPLETED_COOK, SortNum="006".ToString()},
+ new OrderMakeModel { GoodName= name_s_zm[new Random().Next(0, 5)], StartTime=DateTime.Now.ToString("HH:mm:ss"), Status=ORDER_STATUS.COMPLETED_TAKE, SortNum="005".ToString()},
+ new OrderMakeModel { GoodName= name_s_zm[new Random().Next(0, 5)], StartTime=DateTime.Now.ToString("HH:mm:ss"), Status=ORDER_STATUS.COMPLETED_TAKE, SortNum="004".ToString()},
+ new OrderMakeModel { GoodName= name_s_zm[new Random().Next(0, 5)], StartTime=DateTime.Now.ToString("HH:mm:ss"), Status=ORDER_STATUS.COMPLETED_TAKE, SortNum="003".ToString()},
+ new OrderMakeModel { GoodName= name_s_zm[new Random().Next(0, 5)], StartTime=DateTime.Now.ToString("HH:mm:ss"), Status=ORDER_STATUS.COMPLETED_TAKE, SortNum="002".ToString()},
+ new OrderMakeModel { GoodName= name_s_zm[new Random().Next(0, 5)], StartTime=DateTime.Now.ToString("HH:mm:ss"), Status=ORDER_STATUS.COMPLETED_TAKE, SortNum="001".ToString()},
},
};
@@ -279,14 +282,14 @@ namespace WpfTest
sendScreenData.Name = screen;
sendScreenData.Value = new ScreenModelSplitMeals
{
- IsRun = new Random().Next(0, 2) == 0 ? IsRun.运行 : IsRun.停止,
- WorkStatus = new Random().Next(0, 2) == 0 ? WorkStatus.工作 : WorkStatus.待机,
- RobotStatu = new Random().Next(0, 2) == 0 ? WorkStatus.工作 : WorkStatus.待机,
- Alarm = new List {
- new AlarmModel { AlarmTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), AlarmMs = "XXXX机构出现故障!!!!" },
- new AlarmModel { AlarmTime = DateTime.Now.AddSeconds(1).ToString("yyyy-MM-dd HH:mm:ss"), AlarmMs = "XXXX机构出现故障!!!!" },
- new AlarmModel { AlarmTime = DateTime.Now.AddSeconds(2).ToString("yyyy-MM-dd HH:mm:ss"), AlarmMs = "XXXX机构出现故障!!!!" },
- },
+ IsRun = k2 == 0 ? IsRun.运行 : IsRun.停止,
+ WorkStatus = k2 == 0 ? WorkStatus.工作 : WorkStatus.待机,
+ RobotStatu = k2 == 0 ? WorkStatus.工作 : WorkStatus.待机,
+ //Alarm = new List {
+ // new AlarmModel { AlarmTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), AlarmMs = "XXXX机构出现故障!!!!" },
+ //new AlarmModel { AlarmTime = DateTime.Now.AddSeconds(1).ToString("yyyy-MM-dd HH:mm:ss"), AlarmMs = "XXXX机构出现故障!!!!" },
+ //new AlarmModel { AlarmTime = DateTime.Now.AddSeconds(2).ToString("yyyy-MM-dd HH:mm:ss"), AlarmMs = "XXXX机构出现故障!!!!" },
+ //},
FailuresCount = 0,
StatsCount = new List {
new StatsModel { Name = name_s[0], Count = new Random().Next(0, 100) },
@@ -298,32 +301,32 @@ namespace WpfTest
SplitMeals_CreditCardCount_1 = new Random().Next(0, 100),
SplitMeals_CreditCardNameBefore_1 = name_XM[new Random().Next(0, 5)],
SplitMeals_CreditCardName_1 = name_XM[new Random().Next(0, 5)],
- SplitMeals_CookType_1 = new List() { "担担面", "鸡蛋面", "火鸡面" },
+ SplitMeals_CookType_1 = new List() { "回锅肉", "烂肉豇豆", "火爆腰花" },
SplitMeals_CreditCardCount_2 = new Random().Next(0, 100),
SplitMeals_CreditCardNameBefore_2 = name_XM[new Random().Next(0, 5)],
SplitMeals_CreditCardName_2 = name_XM[new Random().Next(0, 5)],
- SplitMeals_CookType_2 = new List() { "担担面", "鸡蛋面", "火鸡面" },
+ SplitMeals_CookType_2 = new List() { "回锅肉", "烂肉豇豆", "火爆腰花" },
SplitMeals_CreditCardCount_3 = new Random().Next(0, 100),
SplitMeals_CreditCardNameBefore_3 = name_XM[new Random().Next(0, 5)],
SplitMeals_CreditCardName_3 = name_XM[new Random().Next(0, 5)],
- SplitMeals_CookType_3 = new List() { "担担面", "鸡蛋面", "火鸡面" },
+ SplitMeals_CookType_3 = new List() { "回锅肉", "烂肉豇豆", "火爆腰花" },
SplitMeals_CreditCardCount_4 = new Random().Next(0, 100),
SplitMeals_CreditCardNameBefore_4 = name_XM[new Random().Next(0, 5)],
SplitMeals_CreditCardName_4 = name_XM[new Random().Next(0, 5)],
- SplitMeals_CookType_4 = new List() { "担担面", "鸡蛋面", "火鸡面" },
+ SplitMeals_CookType_4 = new List() { "回锅肉", "烂肉豇豆", "火爆腰花" },
SplitMeals_CreditCardCount_5 = new Random().Next(0, 100),
SplitMeals_CreditCardNameBefore_5 = name_XM[new Random().Next(0, 5)],
SplitMeals_CreditCardName_5 = name_XM[new Random().Next(0, 5)],
- SplitMeals_CookType_5 = new List() { "担担面", "鸡蛋面", "火鸡面" },
+ SplitMeals_CookType_5 = new List() { "回锅肉", "烂肉豇豆", "火爆腰花" },
SplitMeals_CreditCardCount_6 = new Random().Next(0, 100),
SplitMeals_CreditCardNameBefore_6 = name_XM[new Random().Next(0, 5)],
SplitMeals_CreditCardName_6 = name_XM[new Random().Next(0, 5)],
- SplitMeals_CookType_6 = new List() { "担担面", "鸡蛋面", "火鸡面" },
+ SplitMeals_CookType_6 = new List() { "回锅肉", "烂肉豇豆", "火爆腰花" },
};
}
diff --git a/WpfTest/WpfTest.csproj b/WpfTest/WpfTest.csproj
index 3be6b765..e72a3145 100644
--- a/WpfTest/WpfTest.csproj
+++ b/WpfTest/WpfTest.csproj
@@ -8,7 +8,7 @@
-
+