From 1bc2df66bc88a6405df345dccc24a5031e18b592 Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期一, 21 十二月 2020 09:54:48 +0800
Subject: [PATCH] 1. gocator添加byte2/byte4的配置，目前测试byte4不成功，暂时还是使用byte2配置。 2. 添加键名代码映射配置和NG键名代码上传功能
---
src/Bro.Common.Model/Model/Spec.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/Bro.Common.Model/Model/Spec.cs b/src/Bro.Common.Model/Model/Spec.cs
index 9eaef91..d3898db 100644
--- a/src/Bro.Common.Model/Model/Spec.cs
+++ b/src/Bro.Common.Model/Model/Spec.cs
@@ -15,7 +15,7 @@
{
[Category("閫氱敤閰嶇疆")]
[Description("鏍囧噯浠ｇ爜")]
- public string Code { get; set; }
+ public virtual string Code { get; set; }
[Category("閫氱敤閰嶇疆")]
[Description("鍚敤鐘舵�侊紝true锛氬惎鐢紱false锛氱鐢�")]
@@ -25,22 +25,22 @@
[Category("鏍囧噯閰嶇疆")]
[Description("鏍囧噯鍊�")]
[DisplayName("鏍囧噯鍊�")]
- public float StandardValue { get; set; }
+ public double StandardValue { get; set; }
[Category("鏍囧噯閰嶇疆")]
[Description("姝ｅ叕宸�")]
[DisplayName("姝ｅ叕宸�")]
- public float Tolrenance_Positive { get; set; }
+ public double Tolrenance_Positive { get; set; }
[Category("鏍囧噯閰嶇疆")]
[Description("璐熷叕宸�")]
[DisplayName("璐熷叕宸�")]
- public float Tolrenance_Negative { get; set; }
+ public double Tolrenance_Negative { get; set; }
- protected float? actualValue = null;
+ protected double? actualValue = null;
[Browsable(false)]
[JsonIgnore]
- public virtual float? ActualValue
+ public virtual double? ActualValue
{
get
{
@@ -67,7 +67,7 @@
[Browsable(false)]
[JsonIgnore]
- public bool MeasureResult { get; set; } = false;
+ public bool? MeasureResult { get; set; } = null;
public virtual string GetCSVHead()
{
--
Gitblit v1.8.0