|
@@ -244,7 +244,7 @@ namespace CarMeterSystem
|
|
|
|
|
|
|
|
#region 红外对射及量程验证以及光栅
|
|
#region 红外对射及量程验证以及光栅
|
|
|
valid.ValidMethod();
|
|
valid.ValidMethod();
|
|
|
- if (PbCache.range != null && PbCache.range.upperRange < PbCache.collect.weight)
|
|
|
|
|
|
|
+ if ((PbCache.range != null && PbCache.range.upperRange < PbCache.collect.weight) || PbCache.collect.weight.ToString().Substring(PbCache.collect.weight.ToString().Length - 1, 1) != "0")
|
|
|
{
|
|
{
|
|
|
//超量程
|
|
//超量程
|
|
|
vicPlayClass.GetVoicePlay("已超量程", PbCache.collect.carno);
|
|
vicPlayClass.GetVoicePlay("已超量程", PbCache.collect.carno);
|
|
@@ -1477,7 +1477,7 @@ namespace CarMeterSystem
|
|
|
#region 红外对射及量程验证及停留超时验证
|
|
#region 红外对射及量程验证及停留超时验证
|
|
|
|
|
|
|
|
valid.ValidMethod();
|
|
valid.ValidMethod();
|
|
|
-
|
|
|
|
|
|
|
+ // 重量最后一位不为0,也是超量程 20220816 By BourneCao
|
|
|
if (PbCache.range != null && PbCache.range.upperRange < PbCache.collect.weight)
|
|
if (PbCache.range != null && PbCache.range.upperRange < PbCache.collect.weight)
|
|
|
{
|
|
{
|
|
|
//超量程
|
|
//超量程
|
|
@@ -2831,6 +2831,7 @@ namespace CarMeterSystem
|
|
|
setCar = "",
|
|
setCar = "",
|
|
|
rfidCar = "",
|
|
rfidCar = "",
|
|
|
photoCar = "",
|
|
photoCar = "",
|
|
|
|
|
+ photoCar2 = "",
|
|
|
scanCar = "",
|
|
scanCar = "",
|
|
|
editCar = "",
|
|
editCar = "",
|
|
|
zeroState = "0",
|
|
zeroState = "0",
|