diff --git a/SlnMesnac.Config/DeviceInfoConfig.cs b/SlnMesnac.Config/DeviceInfoConfig.cs
index 0b111f9..9dad17f 100644
--- a/SlnMesnac.Config/DeviceInfoConfig.cs
+++ b/SlnMesnac.Config/DeviceInfoConfig.cs
@@ -57,6 +57,11 @@ namespace SlnMesnac.Config
/// 默认值:
///
public int? Deleteflag { get; set; }
+
+ ///
+ /// 首次读取写入延迟
+ ///
+ public int? WriteDelaySet { get; set; }
}
}
\ No newline at end of file
diff --git a/SlnMesnac.Model/domain/MesOrderInfo.cs b/SlnMesnac.Model/domain/MesOrderInfo.cs
index 6032763..b339522 100644
--- a/SlnMesnac.Model/domain/MesOrderInfo.cs
+++ b/SlnMesnac.Model/domain/MesOrderInfo.cs
@@ -1,4 +1,5 @@
-using System;
+using SQLite;
+using System;
using System.Collections.Generic;
using System.Text;
using System.Text.Json.Serialization;
@@ -13,6 +14,8 @@ namespace SlnMesnac.Model.domain
}
public class MesOrderInfo
{
+ [PrimaryKey]
+ public string ID { get; set; }
[JsonPropertyName("ProductSpec")]
public string ProductSpec { get; set; }
[JsonPropertyName("OrderNo")]
@@ -27,5 +30,7 @@ namespace SlnMesnac.Model.domain
public double PlanQty { get; set; }
[JsonPropertyName("NextProductNo")]
public int NextProductNo { get; set; }
+
+ public DateTime InsertDate { get; set; }
}
}
diff --git a/SlnMesnac.Repository/SQLiteHelper.cs b/SlnMesnac.Repository/SQLiteHelper.cs
index c05bcfd..9136a51 100644
--- a/SlnMesnac.Repository/SQLiteHelper.cs
+++ b/SlnMesnac.Repository/SQLiteHelper.cs
@@ -69,6 +69,30 @@ namespace Sln.Iot.Repository
return _connection.Delete(id);
}
+ ///
+ /// 根据条件批量删除
+ ///
+ /// 删除条件
+ /// 删除的记录数
+ public int Delete(Expression> predExpr)
+ {
+ var items = _connection.Table().Where(predExpr).ToList();
+ int count = 0;
+ foreach (var item in items)
+ {
+ count += _connection.Delete(item);
+ }
+ return count;
+ }
+
+ ///
+ /// 删除所有数据
+ ///
+ public int DeleteAll()
+ {
+ return _connection.DeleteAll();
+ }
+
///
/// sql直接执行
///
diff --git a/SlnMesnac.Repository/service/Impl/MesOrderInfoImpl.cs b/SlnMesnac.Repository/service/Impl/MesOrderInfoImpl.cs
new file mode 100644
index 0000000..ac30812
--- /dev/null
+++ b/SlnMesnac.Repository/service/Impl/MesOrderInfoImpl.cs
@@ -0,0 +1,22 @@
+using Sln.Iot.Repository;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SlnMesnac.Repository.service.Impl
+{
+ public class RealReadDataImpl
+ {
+ private static readonly Lazy lazy = new Lazy(() => new RealReadDataImpl());
+
+ public static RealReadDataImpl Instance
+ {
+ get
+ {
+ return lazy.Value;
+ }
+ }
+
+ public SQLiteHelper _helper = new SQLiteHelper();
+ }
+}
diff --git a/SlnMesnac.Repository/service/Impl/RealReadDataImpl.cs b/SlnMesnac.Repository/service/Impl/RealReadDataImpl.cs
index ac30812..2146181 100644
--- a/SlnMesnac.Repository/service/Impl/RealReadDataImpl.cs
+++ b/SlnMesnac.Repository/service/Impl/RealReadDataImpl.cs
@@ -1,15 +1,16 @@
using Sln.Iot.Repository;
+using SlnMesnac.Model.domain;
using System;
using System.Collections.Generic;
using System.Text;
namespace SlnMesnac.Repository.service.Impl
{
- public class RealReadDataImpl
+ public class MesOrderInfoImpl
{
- private static readonly Lazy lazy = new Lazy(() => new RealReadDataImpl());
+ private static readonly Lazy lazy = new Lazy(() => new MesOrderInfoImpl());
- public static RealReadDataImpl Instance
+ public static MesOrderInfoImpl Instance
{
get
{
@@ -17,6 +18,6 @@ namespace SlnMesnac.Repository.service.Impl
}
}
- public SQLiteHelper _helper = new SQLiteHelper();
+ public SQLiteHelper _helper = new SQLiteHelper();
}
}
diff --git a/SlnMesnac.Rfid/Factory/RflyFactory.cs b/SlnMesnac.Rfid/Factory/RflyFactory.cs
index d3abe0f..0a445e7 100644
--- a/SlnMesnac.Rfid/Factory/RflyFactory.cs
+++ b/SlnMesnac.Rfid/Factory/RflyFactory.cs
@@ -175,7 +175,7 @@ namespace SlnMesnac.Rfid.Factory
}
catch (Exception e)
{
- Log.Information($"{m_deviceID},IP:{m_strIP}数据接收异常" + e.Message);
+ Log.Information($"{m_deviceID},IP:{m_strIP}数据接收异常 Message:" + e.Message);
return false;
}
}
diff --git a/SlnMesnac.WPF/Model/Real_DataInfo.cs b/SlnMesnac.WPF/Model/Real_DataInfo.cs
index deb80ab..ef59214 100644
--- a/SlnMesnac.WPF/Model/Real_DataInfo.cs
+++ b/SlnMesnac.WPF/Model/Real_DataInfo.cs
@@ -221,7 +221,11 @@ namespace SlnMesnac.WPF.Model
///
public string? Connectstr { get; set; }
-
+ ///
+ /// 备 注:
+ /// 默认值:
+ ///
+ public int? WriteDelaySet { get; set; }
private string _isOnline ="未连接";
diff --git a/SlnMesnac.WPF/Page/IndexPage/ChangeType.xaml b/SlnMesnac.WPF/Page/IndexPage/ChangeType.xaml
index 430dd7f..1c22228 100644
--- a/SlnMesnac.WPF/Page/IndexPage/ChangeType.xaml
+++ b/SlnMesnac.WPF/Page/IndexPage/ChangeType.xaml
@@ -99,7 +99,7 @@
-
+