|
@@ -545,19 +545,7 @@ namespace Terminal
|
|
|
}
|
|
|
}
|
|
|
catch (Exception e) { Log.WriteLog(LogType.process, LogFile.ERROR, "号牌" + license + "记录号牌异常\n" + e.StackTrace); }
|
|
|
- try
|
|
|
- {
|
|
|
- if (idReceiptMap.ContainsKey(term.terminalID))
|
|
|
- {
|
|
|
- if (!idReceiptMap[term.terminalID].Equals(term.receiptNum))
|
|
|
- idReceiptMap[term.terminalID] = term.receiptNum;
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- idReceiptMap.Add(term.terminalID, term.receiptNum);
|
|
|
- }
|
|
|
- }
|
|
|
- catch (Exception e) { Log.WriteLog(LogType.process, LogFile.ERROR, "凭证号" + term.receiptNum + "记录凭证号异常\n" + e.StackTrace); }
|
|
|
+
|
|
|
}
|
|
|
Log.WriteLog(LogType.process, LogFile.INFO, "号牌" + license + "已记录");
|
|
|
////未获得号牌,告知PLC终止,告诉终端提示用户重新操作
|
|
@@ -639,6 +627,29 @@ namespace Terminal
|
|
|
licenseReceived = (short)numReceivedStatus
|
|
|
};
|
|
|
Monitor.Monitor.PLC.WriteToPLC(mbst, PLCDataType.central);
|
|
|
+
|
|
|
+ int receiptCount = 6;
|
|
|
+ while (receiptCount-- > 0)
|
|
|
+ {
|
|
|
+ term = terminalInfo[i];
|
|
|
+ try
|
|
|
+ {
|
|
|
+ if (idReceiptMap.ContainsKey(term.terminalID))
|
|
|
+ {
|
|
|
+ if (!idReceiptMap[term.terminalID].Equals(term.receiptNum))
|
|
|
+ idReceiptMap[term.terminalID] = term.receiptNum;
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ idReceiptMap.Add(term.terminalID, term.receiptNum);
|
|
|
+ }
|
|
|
+ Log.WriteLog(LogType.process, LogFile.INFO, "记录凭证号:" + term.receiptNum + "\n");
|
|
|
+ if (term.receiptNum != 0)
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ catch (Exception e) { Log.WriteLog(LogType.process, LogFile.ERROR, "凭证号" + term.receiptNum + "记录凭证号异常\n" + e.StackTrace); }
|
|
|
+ Thread.Sleep(1000);
|
|
|
+ }
|
|
|
//号牌获取结果被清零才跳出
|
|
|
Monitor.Monitor.SetNotification("已写入号牌获取结果" + numReceivedStatus + ",等待号牌机启动指令清零", parkMonitor.model.TextColor.Info);
|
|
|
//}
|