|
|
@@ -967,7 +967,7 @@ namespace CarMeterSystem
|
|
|
}
|
|
|
try
|
|
|
{
|
|
|
- if (isMeasureSuccess)
|
|
|
+ if (isMeasureSuccess && PbCache.collect.weight > 500)
|
|
|
{
|
|
|
isStop = true;
|
|
|
readVoicd();
|
|
|
@@ -981,6 +981,7 @@ namespace CarMeterSystem
|
|
|
isCalibration = true;
|
|
|
PbCache.addWgt = 0;
|
|
|
this.Hide();
|
|
|
+ hidWindow();
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -1514,7 +1515,10 @@ namespace CarMeterSystem
|
|
|
lg.WriteLog(25, PbCache.lockCarNo + "Sleep前点击保存按钮");
|
|
|
Thread.Sleep(3000);
|
|
|
lg.WriteLog(25, PbCache.lockCarNo + "Sleep后点击保存按钮");
|
|
|
- this.btnSave.PerformClick();
|
|
|
+ if(PbCache.collect.weight > 500)
|
|
|
+ {
|
|
|
+ this.btnSave.PerformClick();
|
|
|
+ }
|
|
|
lg.WriteLog(25, PbCache.lockCarNo + "PerformClick后保存按钮");
|
|
|
}
|
|
|
else if (PbCache.monitor.validMatClick == "0")
|
|
|
@@ -1963,6 +1967,7 @@ namespace CarMeterSystem
|
|
|
{
|
|
|
lg.WriteLog(15, PbCache.lockCarNo + "点击了返回主界面");
|
|
|
this.Hide();
|
|
|
+ hidWindow();
|
|
|
}
|
|
|
|
|
|
private static FrmMessage FrmMess(string strMess, string strBtnSaveInfo)
|
|
|
@@ -2271,6 +2276,11 @@ namespace CarMeterSystem
|
|
|
/// <param name="sender"></param>
|
|
|
/// <param name="e"></param>
|
|
|
private void frmOneYardToEnd_FormClosing(object sender, FormClosingEventArgs e)
|
|
|
+ {
|
|
|
+ hidWindow();
|
|
|
+ }
|
|
|
+
|
|
|
+ private void hidWindow()
|
|
|
{
|
|
|
try
|
|
|
{
|
|
|
@@ -2279,7 +2289,7 @@ namespace CarMeterSystem
|
|
|
meterWorkScheduledHelp1.baseSpotNo = PbCache.sportInfo.baseSpotNo;
|
|
|
meterWorkScheduledHelp1.baseSpotName = PbCache.sportInfo.baseSpotName;
|
|
|
meterWorkScheduledHelp1.carNo = string.IsNullOrEmpty(PbCache.collect.carno) ? temporaryCarNo : PbCache.collect.carno;
|
|
|
- meterWorkScheduledHelp1.helpContent = "车号:" + (string.IsNullOrEmpty(temporaryCarNo) ? "未识别" : temporaryCarNo) +";重量:" + PbCache.resultWgt + ";提示信息:" + PbCache.resultMsgAll;
|
|
|
+ meterWorkScheduledHelp1.helpContent = "车号:" + (string.IsNullOrEmpty(temporaryCarNo) ? "未识别" : temporaryCarNo) + ";重量:" + PbCache.resultWgt + ";提示信息:" + PbCache.resultMsgAll;
|
|
|
meterWorkScheduledHelp1.warmType = "4";
|
|
|
meterWorkScheduledHelp1.warmTypeName = "计量数据统计";
|
|
|
meterWorkScheduledHelpService.add(meterWorkScheduledHelp1);
|
|
|
@@ -2343,7 +2353,7 @@ namespace CarMeterSystem
|
|
|
|
|
|
#endregion 清理一次监控表的几个数值,防止上车速度过快导致提示称重完成
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/// <summary>
|
|
|
/// 修改监控表验证状态
|
|
|
/// </summary>
|
|
|
@@ -2475,9 +2485,10 @@ namespace CarMeterSystem
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
- vicPlayClass.GetVoicePlay(voiceContent, PbCache.lockCarNo);
|
|
|
-
|
|
|
+ if(PbCache.collect.weight > 500)
|
|
|
+ {
|
|
|
+ vicPlayClass.GetVoicePlay(voiceContent, PbCache.lockCarNo);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
#region 清理对象数据
|