|
|
@@ -1358,38 +1358,38 @@ namespace CarMeterSystem
|
|
|
}
|
|
|
|
|
|
// ??BourneCao 酒钢不可能预报车号和识别车号不一致
|
|
|
- preTrackScaleVCarNo.carNo = TrackCarNo;
|
|
|
- vCarNo.ValidMethod(preTrackScaleVCarNo);
|
|
|
+ //preTrackScaleVCarNo.carNo = TrackCarNo;
|
|
|
+ //vCarNo.ValidMethod(preTrackScaleVCarNo);
|
|
|
|
|
|
- if (TrackCarNo != PbCache.collect.carno && !PbCache.monitorResult.valid_carno)
|
|
|
- {
|
|
|
- // 2021年5月11日 未识别到车牌号，进行提示，避免出现重新扫码点保存的情况
|
|
|
- if (string.IsNullOrEmpty(PbCache.collect.carno))
|
|
|
- {
|
|
|
- //txtMsgInfo.Text = string.Format("摄像头未识别到车牌号，不允许进行【保存】操作，请点击语音求助！");
|
|
|
- setMsg(string.Format("摄像头未识别到车牌号，不允许进行【保存】操作，请点击语音求助！"));
|
|
|
- lg.WriteLog(14, "摄像头未识别到车牌号，不允许进行【保存】操作，请点击语音求助！");
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- //txtMsgInfo.Text = string.Format("预报车号【{0}】与摄像头识别车号【{1}】不一致，请点击语音求助", TrackCarNo, PbCache.collect.carno);
|
|
|
- setMsg(string.Format("预报车号【{0}】与摄像头识别车号【{1}】不一致，请点击语音求助", TrackCarNo, PbCache.collect.carno));
|
|
|
- lg.WriteLog(14, "车号：" + PbCache.collect.carno + "；预报车号" + TrackCarNo + "与摄像头识别车号" + PbCache.collect.carno + "不一致！");
|
|
|
- }
|
|
|
- //btnSave.Visible = false;
|
|
|
- setMsgInfo(btnSave, "false", "2");//rxh add
|
|
|
- return;
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- if (txtMsgInfo.Text.Contains("摄像头"))
|
|
|
- {
|
|
|
- txtMsgInfo.Text = ""; //将原来的不允许计量的提示给去掉
|
|
|
- setMsg("");
|
|
|
- }
|
|
|
- PbCache.collect.carno = TrackCarNo;
|
|
|
+ //if (TrackCarNo != PbCache.collect.carno && !PbCache.monitorResult.valid_carno)
|
|
|
+ //{
|
|
|
+ // // 2021年5月11日 未识别到车牌号，进行提示，避免出现重新扫码点保存的情况
|
|
|
+ // if (string.IsNullOrEmpty(PbCache.collect.carno))
|
|
|
+ // {
|
|
|
+ // //txtMsgInfo.Text = string.Format("摄像头未识别到车牌号，不允许进行【保存】操作，请点击语音求助！");
|
|
|
+ // setMsg(string.Format("摄像头未识别到车牌号，不允许进行【保存】操作，请点击语音求助！"));
|
|
|
+ // lg.WriteLog(14, "摄像头未识别到车牌号，不允许进行【保存】操作，请点击语音求助！");
|
|
|
+ // }
|
|
|
+ // else
|
|
|
+ // {
|
|
|
+ // //txtMsgInfo.Text = string.Format("预报车号【{0}】与摄像头识别车号【{1}】不一致，请点击语音求助", TrackCarNo, PbCache.collect.carno);
|
|
|
+ // setMsg(string.Format("预报车号【{0}】与摄像头识别车号【{1}】不一致，请点击语音求助", TrackCarNo, PbCache.collect.carno));
|
|
|
+ // lg.WriteLog(14, "车号：" + PbCache.collect.carno + "；预报车号" + TrackCarNo + "与摄像头识别车号" + PbCache.collect.carno + "不一致！");
|
|
|
+ // }
|
|
|
+ // //btnSave.Visible = false;
|
|
|
+ // setMsgInfo(btnSave, "false", "2");//rxh add
|
|
|
+ // return;
|
|
|
+ //}
|
|
|
+ //else
|
|
|
+ //{
|
|
|
+ // if (txtMsgInfo.Text.Contains("摄像头"))
|
|
|
+ // {
|
|
|
+ // txtMsgInfo.Text = ""; //将原来的不允许计量的提示给去掉
|
|
|
+ // setMsg("");
|
|
|
+ // }
|
|
|
+ // PbCache.collect.carno = TrackCarNo;
|
|
|
|
|
|
- }
|
|
|
+ //}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -1477,50 +1477,50 @@ namespace CarMeterSystem
|
|
|
|
|
|
#region 查一次是否校秤，若未校秤则不能计量
|
|
|
|
|
|
- //*
|
|
|
- if (bRelation)
|
|
|
- {
|
|
|
- meterWorkCalibrationMainTimer.baseSpotNo = PbCache.sportInfo.baseSpotNo;
|
|
|
- meterWorkCalibrationMainTimer.valueFlag = "2";
|
|
|
- string msgInfo = "";
|
|
|
- isCalibration = vCalib.ValidMethod(meterWorkCalibrationMainTimer, out msgInfo);
|
|
|
- bRelation = false;
|
|
|
- }
|
|
|
+ ////*
|
|
|
+ //if (bRelation)
|
|
|
+ //{
|
|
|
+ // meterWorkCalibrationMainTimer.baseSpotNo = PbCache.sportInfo.baseSpotNo;
|
|
|
+ // meterWorkCalibrationMainTimer.valueFlag = "2";
|
|
|
+ // string msgInfo = "";
|
|
|
+ // isCalibration = vCalib.ValidMethod(meterWorkCalibrationMainTimer, out msgInfo);
|
|
|
+ // bRelation = false;
|
|
|
+ //}
|
|
|
|
|
|
- if (!isCalibration)
|
|
|
- {
|
|
|
- calibraNumRelTimer = PbCache.ltBaseCalibraNumRel.Where(s => s.baseSpotNo == PbCache.sportInfo.baseSpotNo).FirstOrDefault();
|
|
|
- if (calibraNumRelTimer == null || calibraNumRelTimer.isMeter == "否" || PbCache.collect.weight > (calibraNumRelTimer.upWeight == null ? 0 : calibraNumRelTimer.upWeight.Value))
|
|
|
- {
|
|
|
- if (!bXCStart)
|
|
|
- {
|
|
|
- vicPlayClass.GetVoicePlay("未校秤", "");
|
|
|
- bXCStart = true;
|
|
|
- }
|
|
|
- //txtMsgInfo.Text = "未校秤无法计量";
|
|
|
- setMsg("未校秤无法计量");
|
|
|
- return;
|
|
|
- }
|
|
|
- }
|
|
|
+ //if (!isCalibration)
|
|
|
+ //{
|
|
|
+ // calibraNumRelTimer = PbCache.ltBaseCalibraNumRel.Where(s => s.baseSpotNo == PbCache.sportInfo.baseSpotNo).FirstOrDefault();
|
|
|
+ // if (calibraNumRelTimer == null || calibraNumRelTimer.isMeter == "否" || PbCache.collect.weight > (calibraNumRelTimer.upWeight == null ? 0 : calibraNumRelTimer.upWeight.Value))
|
|
|
+ // {
|
|
|
+ // if (!bXCStart)
|
|
|
+ // {
|
|
|
+ // vicPlayClass.GetVoicePlay("未校秤", "");
|
|
|
+ // bXCStart = true;
|
|
|
+ // }
|
|
|
+ // //txtMsgInfo.Text = "未校秤无法计量";
|
|
|
+ // setMsg("未校秤无法计量");
|
|
|
+ // return;
|
|
|
+ // }
|
|
|
+ //}
|
|
|
//*/
|
|
|
|
|
|
#endregion 查一次是否校秤，若未校秤则不能计量
|
|
|
|
|
|
#region 判断是否需要复磅
|
|
|
|
|
|
- if (isShowRecover && !string.IsNullOrEmpty(txtCarNo.Text))
|
|
|
- {
|
|
|
- recoverInfo.ValidMethod(txtCarNo.Text);
|
|
|
- if (PbCache.isAllowRecover)
|
|
|
- {
|
|
|
- btnRecover.Visible = true;
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- btnRecover.Visible = false;
|
|
|
- }
|
|
|
- isShowRecover = false;
|
|
|
- }
|
|
|
+ //if (isShowRecover && !string.IsNullOrEmpty(txtCarNo.Text))
|
|
|
+ //{
|
|
|
+ // recoverInfo.ValidMethod(txtCarNo.Text);
|
|
|
+ // if (PbCache.isAllowRecover)
|
|
|
+ // {
|
|
|
+ // btnRecover.Visible = true;
|
|
|
+ // }
|
|
|
+ // else
|
|
|
+ // {
|
|
|
+ // btnRecover.Visible = false;
|
|
|
+ // }
|
|
|
+ // isShowRecover = false;
|
|
|
+ //}
|
|
|
|
|
|
#endregion 判断是否需要复磅
|
|
|
|
BourneCao