|
@@ -120,6 +120,7 @@ namespace CarMeterSystem
|
|
|
|
|
|
|
|
public void init()
|
|
public void init()
|
|
|
{
|
|
{
|
|
|
|
|
+
|
|
|
PbCache.mwPreFirst = meterWorkCarActualFirst;
|
|
PbCache.mwPreFirst = meterWorkCarActualFirst;
|
|
|
|
|
|
|
|
PbCache.isPre = false;
|
|
PbCache.isPre = false;
|
|
@@ -132,6 +133,8 @@ namespace CarMeterSystem
|
|
|
btnFH.Visible = true;
|
|
btnFH.Visible = true;
|
|
|
}
|
|
}
|
|
|
btnTare.Visible = false;
|
|
btnTare.Visible = false;
|
|
|
|
|
+
|
|
|
|
|
+ btnSave.Enabled = true;
|
|
|
timer1.Start();
|
|
timer1.Start();
|
|
|
lbPointName.Text = PbCache.sportInfo.baseSpotName;
|
|
lbPointName.Text = PbCache.sportInfo.baseSpotName;
|
|
|
ucCarMeterInfoJisco1.setMeterType(PbCache.bussinessTypeName);
|
|
ucCarMeterInfoJisco1.setMeterType(PbCache.bussinessTypeName);
|
|
@@ -2345,6 +2348,32 @@ namespace CarMeterSystem
|
|
|
isHelp = "0",
|
|
isHelp = "0",
|
|
|
wgt = 0
|
|
wgt = 0
|
|
|
});
|
|
});
|
|
|
|
|
+
|
|
|
|
|
+ // 重置局部变量
|
|
|
|
|
+ firstWgt = 0;
|
|
|
|
|
+ bRailwayActual = true;
|
|
|
|
|
+ isVoiceDownCar = false;//车上人员请下车播放一次
|
|
|
|
|
+ firstCode = "";//上次扫码编号
|
|
|
|
|
+ TrackCarNo = "";//预报车号
|
|
|
|
|
+ sPreCarNo = "";//摄像头识别车号
|
|
|
|
|
+ limsMsg = "";
|
|
|
|
|
+ wgt = 0;
|
|
|
|
|
+ temporaryResult = "";
|
|
|
|
|
+ temporaryCarNo = "";
|
|
|
|
|
+
|
|
|
|
|
+ // 清空Message控件
|
|
|
|
|
+ setMsg("");
|
|
|
|
|
+ // 清空显示区
|
|
|
|
|
+ ucWeightCarTJXJG1.setWeightType(" ");
|
|
|
|
|
+ ucCarMeterInfoJisco1.setFormControlValue(new MeterWorkCarActualFirst() { });
|
|
|
|
|
+
|
|
|
|
|
+ // 重置PbCache变量
|
|
|
|
|
+ PbCache.isLockFrm = false; // 清除页面锁定
|
|
|
|
|
+ PbCache.lockCarNo = "";
|
|
|
|
|
+ PbCache.lockWgt = 0;
|
|
|
|
|
+ PbCache.ResultMessage = "";
|
|
|
|
|
+ PbCache.voiceType = 0; // 清除语音
|
|
|
|
|
+ btnSave.Enabled = true;
|
|
|
}
|
|
}
|
|
|
catch (Exception ex)
|
|
catch (Exception ex)
|
|
|
{
|
|
{
|
|
@@ -2485,7 +2514,7 @@ namespace CarMeterSystem
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if(PbCache.collect.weight > 500)
|
|
|
|
|
|
|
+ if(PbCache.collect.weight > 500 && PbCache.voiceType != 0)
|
|
|
{
|
|
{
|
|
|
vicPlayClass.GetVoicePlay(voiceContent, PbCache.lockCarNo);
|
|
vicPlayClass.GetVoicePlay(voiceContent, PbCache.lockCarNo);
|
|
|
}
|
|
}
|