diff --git a/SlnMesnac.Config/DeviceInfoConfig.cs b/SlnMesnac.Config/DeviceInfoConfig.cs
index 9396fa6..b54ca6e 100644
--- a/SlnMesnac.Config/DeviceInfoConfig.cs
+++ b/SlnMesnac.Config/DeviceInfoConfig.cs
@@ -69,9 +69,14 @@ namespace SlnMesnac.Config
public int? WriteCount { get; set; }
///
- /// 盘点间隔时间(秒)
+ /// 盘点间隔时间(毫秒)
///
public int? InventoryIntervalSeconds { get; set; }
+
+ ///
+ /// 二次验证超时时间(毫秒)
+ ///
+ public int? VerifyTimeoutMilliseconds { get; set; }
}
}
\ No newline at end of file
diff --git a/SlnMesnac.WPF/ViewModel/IndexPage/ChangeTypeViewModel.cs b/SlnMesnac.WPF/ViewModel/IndexPage/ChangeTypeViewModel.cs
index e473e86..2f0388c 100644
--- a/SlnMesnac.WPF/ViewModel/IndexPage/ChangeTypeViewModel.cs
+++ b/SlnMesnac.WPF/ViewModel/IndexPage/ChangeTypeViewModel.cs
@@ -187,8 +187,8 @@ namespace SlnMesnac.WPF.ViewModel.IndexPage
Console.WriteLine("调用MES获取订单接口");
//调用MES接口获取生产订单信息
//MessageBox.Show("MES订单获取成功!", "系统提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
- string response = "{\"code\":200,\"msg\":\"success\",\"data\":[{\"OrderNo\":\"SS042\",\"ProductCode\":\"4030502500100006\",\"ProductType\":\"钢丝带-ST-井下阻燃钢丝带\",\"ProductName\":\"输送带-井下阻燃钢丝带-ST\",\"ProductSpec\":\"1400mm;ST/S2500*1;8+8;MT/MT;D7.2;P15;N89\",\"PlanQty\":130.00,\"NextProductNo\":2}]}\r\n";
- //string response = await _httpclient.GetMesOrderInfo(lineno, BeginDate.ToString("yyyy-MM-dd"));
+ //string response = "{\"code\":200,\"msg\":\"success\",\"data\":[{\"OrderNo\":\"SS042\",\"ProductCode\":\"4030502500100006\",\"ProductType\":\"钢丝带-ST-井下阻燃钢丝带\",\"ProductName\":\"输送带-井下阻燃钢丝带-ST\",\"ProductSpec\":\"1400mm;ST/S2500*1;8+8;MT/MT;D7.2;P15;N89\",\"PlanQty\":130.00,\"NextProductNo\":2}]}\r\n";
+ string response = await _httpclient.GetMesOrderInfo(lineno, BeginDate.ToString("yyyy-MM-dd"));
Console.WriteLine("接收MES接口返回:" + response);
// 反序列化
try
diff --git a/SlnMesnac.WPF/ViewModel/IndexPage/ProductionLineViewModel.cs b/SlnMesnac.WPF/ViewModel/IndexPage/ProductionLineViewModel.cs
index 16217a8..8f77098 100644
--- a/SlnMesnac.WPF/ViewModel/IndexPage/ProductionLineViewModel.cs
+++ b/SlnMesnac.WPF/ViewModel/IndexPage/ProductionLineViewModel.cs
@@ -43,6 +43,8 @@ namespace SlnMesnac.WPF.ViewModel.IndexPage
[RegisterAsSingletonAttribute]
public class ProductionLineViewModel : ViewModelBase
{
+ #region 参数定义
+
private static StringChange _StringChange;
private String SerialNo = "";
private SerilogHelper _logger;
@@ -61,6 +63,11 @@ namespace SlnMesnac.WPF.ViewModel.IndexPage
private bool IsVerify = false;
private string LastWrite;
private string LastRFIDEPC;
+ private CancellationTokenSource? _verifyCts;
+
+ #endregion
+
+ #region 关联属性
public ObservableCollection RFIDHistoryRecords
{
@@ -85,7 +92,7 @@ namespace SlnMesnac.WPF.ViewModel.IndexPage
RaisePropertyChanged(() => Deviceinfo);
}
}
-
+
///
/// 日期时间
///
@@ -137,6 +144,10 @@ namespace SlnMesnac.WPF.ViewModel.IndexPage
}
}
+ #endregion
+
+ #region 构造函数
+
public ProductionLineViewModel()
{
GetOrderInfoCommand = new RelayCommand