|
|
@@ -182,6 +182,7 @@ namespace CarMeterSystem
|
|
|
|
|
|
imageCurlControl.Start(); //图片上传线程
|
|
|
sweepCodeClass.StartThreadSweep(); //扫码线程
|
|
|
+ sweepCodeCpoyClass.StartThreadSweep(); //扫码线程
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -413,6 +414,7 @@ namespace CarMeterSystem
|
|
|
sweepCodeCpoyClass.StrState = e.weightStatus + ""; //重量状态信息;当StrState= 0时,获取扫码信息,StrState= 2时将扫码信息置位“”空;其他状态不处理
|
|
|
l.WriteLog(12, sweepCodeClass.ToString());
|
|
|
l.WriteLog(12, sweepCodeCpoyClass.ToString());
|
|
|
+ l.WriteLog(12, sweepCodeCpoyClass.StrCode.ToString());
|
|
|
|
|
|
|
|
|
//if (string.IsNullOrEmpty(sweepCodeClass.StrCode))
|
|
|
@@ -454,57 +456,48 @@ namespace CarMeterSystem
|
|
|
// }
|
|
|
// l.WriteLog(12, "测试扫码值" + rmsSweepCodeClass.Data);
|
|
|
//}
|
|
|
-
|
|
|
+ l.WriteLog(99, "sweepCodeCpoyClass:"+sweepCodeCpoyClass.StrCode);
|
|
|
+ l.WriteLog(99, "sweepCodeClass:" + sweepCodeClass.StrCode);
|
|
|
if (string.IsNullOrEmpty(sweepCodeCpoyClass.StrCode))
|
|
|
{
|
|
|
- if (string.IsNullOrEmpty(PbCache.strCode))
|
|
|
+ if (string.IsNullOrEmpty(sweepCodeClass.StrCode))
|
|
|
{
|
|
|
- codeFlag = false;
|
|
|
- firstCode = "";
|
|
|
- PbCache.strCode = "";
|
|
|
- l.WriteLog(12, "主线程扫码值为空时清空;sweepCodeCpoyClass.StrCode值为" + sweepCodeCpoyClass.StrCode + " ;PbCache.strCode值为:" + PbCache.strCode);
|
|
|
+ if (string.IsNullOrEmpty(PbCache.strCode))
|
|
|
+ {
|
|
|
+ codeFlag = false;
|
|
|
+ firstCode = "";
|
|
|
+ PbCache.strCode = "";
|
|
|
+ l.WriteLog(12, "主线程扫码值为空时清空;sweepCodeClass.StrCode值为" + sweepCodeClass.StrCode + " ;PbCache.strCode值为:" + PbCache.strCode);
|
|
|
+ }
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- if (string.IsNullOrEmpty(sweepCodeClass.StrCode))
|
|
|
+ codeFlag = true;
|
|
|
+ frmOneYardToEnd frmOneYardToEnd = new frmOneYardToEnd();
|
|
|
+ Hashtable hashTable = new Hashtable();
|
|
|
+ hashTable.Add("message", sweepCodeClass.StrCode);
|
|
|
+ rmsSweepCodeClass = mwcfs.DecryptionForWfTest(hashTable);
|
|
|
+ if (rmsSweepCodeClass.Code == "0")
|
|
|
{
|
|
|
- if (string.IsNullOrEmpty(PbCache.strCode))
|
|
|
- {
|
|
|
- codeFlag = false;
|
|
|
- firstCode = "";
|
|
|
- PbCache.strCode = "";
|
|
|
- l.WriteLog(12, "主线程扫码值为空时清空;sweepCodeClass.StrCode值为" + sweepCodeClass.StrCode + " ;PbCache.strCode值为:" + PbCache.strCode);
|
|
|
- }
|
|
|
+ PbCache.collect.carno = rmsSweepCodeClass.Data;
|
|
|
+ PbCache.strCode = rmsSweepCodeClass.Data;
|
|
|
}
|
|
|
- else
|
|
|
+ if (rmsSweepCodeClass.Code == "1")
|
|
|
{
|
|
|
- codeFlag = true;
|
|
|
- frmOneYardToEnd frmOneYardToEnd = new frmOneYardToEnd();
|
|
|
- Hashtable hashTable = new Hashtable();
|
|
|
- hashTable.Add("message", sweepCodeClass.StrCode);
|
|
|
- rmsSweepCodeClass = mwcfs.DecryptionForWfTest(hashTable);
|
|
|
- if (rmsSweepCodeClass.Code == "0")
|
|
|
- {
|
|
|
- PbCache.collect.carno = rmsSweepCodeClass.Data;
|
|
|
- PbCache.strCode = rmsSweepCodeClass.Data;
|
|
|
- }
|
|
|
- if (rmsSweepCodeClass.Code == "1")
|
|
|
- {
|
|
|
- vicPlayClass.GetVoicePlay("车号二维码已过期", PbCache.collect.carno);
|
|
|
- frmOneYardToEnd.setMsgInfo("车号二维码已过期");
|
|
|
- }
|
|
|
- if (rmsSweepCodeClass.Code == "2")
|
|
|
- {
|
|
|
- vicPlayClass.GetVoicePlay("不是有效车号二维码", PbCache.collect.carno);
|
|
|
- frmOneYardToEnd.setMsgInfo("不是有效车号二维码");
|
|
|
- }
|
|
|
- if (rmsSweepCodeClass.Code == "9")
|
|
|
- {
|
|
|
- vicPlayClass.GetVoicePlay("不是有效车号二维码", PbCache.collect.carno);
|
|
|
- frmOneYardToEnd.setMsgInfo("不是有效车号二维码");
|
|
|
- }
|
|
|
- l.WriteLog(12, "测试扫码值" + rmsSweepCodeClass.Data);
|
|
|
+ vicPlayClass.GetVoicePlay("车号二维码已过期", PbCache.collect.carno);
|
|
|
+ frmOneYardToEnd.setMsgInfo("车号二维码已过期");
|
|
|
+ }
|
|
|
+ if (rmsSweepCodeClass.Code == "2")
|
|
|
+ {
|
|
|
+ vicPlayClass.GetVoicePlay("不是有效车号二维码", PbCache.collect.carno);
|
|
|
+ frmOneYardToEnd.setMsgInfo("不是有效车号二维码");
|
|
|
+ }
|
|
|
+ if (rmsSweepCodeClass.Code == "9")
|
|
|
+ {
|
|
|
+ vicPlayClass.GetVoicePlay("不是有效车号二维码", PbCache.collect.carno);
|
|
|
+ frmOneYardToEnd.setMsgInfo("不是有效车号二维码");
|
|
|
}
|
|
|
+ l.WriteLog(12, "测试扫码值" + rmsSweepCodeClass.Data);
|
|
|
}
|
|
|
}
|
|
|
else
|
|
|
@@ -1188,6 +1181,7 @@ namespace CarMeterSystem
|
|
|
collection.Stop();
|
|
|
imageCurlControl.Stop();
|
|
|
sweepCodeClass.CloseThread();
|
|
|
+ sweepCodeCpoyClass.CloseThread();
|
|
|
timer1.Stop();
|
|
|
timer1.Dispose();
|
|
|
}
|