|
|
@@ -89,7 +89,7 @@ namespace CarMeterSystem
|
|
|
private List<ucBusinessType> lu = new List<ucBusinessType>();
|
|
|
|
|
|
private bool isVoiceDownCar = false;//车上人员请下车播放一次
|
|
|
- private bool isShowFrmWelcome = false; //是否显示欢迎界面
|
|
|
+ private bool isShowFrmWelcome = true; //是否显示欢迎界面
|
|
|
|
|
|
private bool isOpened = false;//是否已经打开了扫码计量界面
|
|
|
|
|
|
@@ -202,7 +202,7 @@ namespace CarMeterSystem
|
|
|
sweepCodeClass2.StartThreadSweep(AppConfigCache._comPara2); //扫码线程
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -424,7 +424,7 @@ namespace CarMeterSystem
|
|
|
if (!timer1.Enabled)
|
|
|
{
|
|
|
timer1.Enabled = true;
|
|
|
- l.WriteLog(32, "定时器重启(timer1_Tick:frmMain),车号:" + PbCache.resultCarNo + "||" + (PbCache.collect == null ? "" : PbCache.collect.carno));
|
|
|
+ //l.WriteLog(32, "定时器重启(timer1_Tick:frmMain),车号:" + PbCache.resultCarNo + "||" + (PbCache.collect == null ? "" : PbCache.collect.carno));
|
|
|
}
|
|
|
#region
|
|
|
//num++;
|
|
|
@@ -598,7 +598,7 @@ namespace CarMeterSystem
|
|
|
if (!string.IsNullOrEmpty(e.carno) && PbCache.resultCarNo != e.carno)
|
|
|
{
|
|
|
PbCache.resultCarNo = e.carno + "";
|
|
|
- l.WriteLog(28, "车号賦值跟蹤:PbCache.resultCarNo" + PbCache.resultCarNo + "||e.carno" + e.carno);
|
|
|
+ //l.WriteLog(28, "车号賦值跟蹤:PbCache.resultCarNo" + PbCache.resultCarNo + "||e.carno" + e.carno);
|
|
|
}
|
|
|
}
|
|
|
//*/
|
|
|
@@ -856,6 +856,7 @@ namespace CarMeterSystem
|
|
|
uc.setControlEnable(true);
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
if ((sweepCodeClass.StrCode == "" || sweepCodeClass2.StrCode == "") && !codeFlag)
|
|
|
{
|
|
|
PbCache.collect.carno = sCarNo;
|
|
|
@@ -910,7 +911,7 @@ namespace CarMeterSystem
|
|
|
meterWorkScheduledHelp1.warmType = "5";
|
|
|
meterWorkScheduledHelp1.warmTypeName = "计量提示跟踪";
|
|
|
meterWorkScheduledHelpService.add(meterWorkScheduledHelp1);
|
|
|
- l.WriteLog(28, "车号:" + (string.IsNullOrEmpty(PbCache.collect.carno) ? (string.IsNullOrEmpty(PbCache.resultCarNo) ? "未识别" : PbCache.resultCarNo) : PbCache.collect.carno) + ";重量:" + (PbCache.lockWgt == 0 ? PbCache.resultWgt : PbCache.lockWgt + "") + ";提示信息:" + PbCache.resultMsgAll);
|
|
|
+ //l.WriteLog(28, "车号:" + (string.IsNullOrEmpty(PbCache.collect.carno) ? (string.IsNullOrEmpty(PbCache.resultCarNo) ? "未识别" : PbCache.resultCarNo) : PbCache.collect.carno) + ";重量:" + (PbCache.lockWgt == 0 ? PbCache.resultWgt : PbCache.lockWgt + "") + ";提示信息:" + PbCache.resultMsgAll);
|
|
|
}
|
|
|
//不等于空的时候说明写过一次日志了
|
|
|
if (!string.IsNullOrEmpty(RFIDCarNo) && isWriteRFID == "1")
|