订单流程添加修改
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
|
||||
#include <QList>
|
||||
#include <QPair>
|
||||
#include <QSet>
|
||||
|
||||
namespace {
|
||||
|
||||
@@ -29,8 +30,28 @@ bool ModbusAddressMap::isValid(QString *error) const
|
||||
<< qMakePair(QString("emergencyStop"), emergencyStop)
|
||||
<< qMakePair(QString("currentStep"), currentStep)
|
||||
<< qMakePair(QString("checkResult"), checkResult)
|
||||
<< qMakePair(QString("errorCode"), errorCode);
|
||||
<< qMakePair(QString("errorCode"), errorCode)
|
||||
<< qMakePair(QString("rackPickCommand"), rackPickCommand)
|
||||
<< qMakePair(QString("frontLoadCommand"), frontLoadCommand)
|
||||
<< qMakePair(QString("inspectionCommand"), inspectionCommand)
|
||||
<< qMakePair(QString("frontUnloadCommand"), frontUnloadCommand)
|
||||
<< qMakePair(QString("flipCommand"), flipCommand)
|
||||
<< qMakePair(QString("backLoadCommand"), backLoadCommand)
|
||||
<< qMakePair(QString("backUnloadCommand"), backUnloadCommand)
|
||||
<< qMakePair(QString("rackPlaceCommand"), rackPlaceCommand)
|
||||
<< qMakePair(QString("rackPickFeedback"), rackPickFeedback)
|
||||
<< qMakePair(QString("frontLoadFeedback"), frontLoadFeedback)
|
||||
<< qMakePair(QString("inspectionFeedback"), inspectionFeedback)
|
||||
<< qMakePair(QString("frontUnloadFeedback"), frontUnloadFeedback)
|
||||
<< qMakePair(QString("flipFeedback"), flipFeedback)
|
||||
<< qMakePair(QString("backLoadFeedback"), backLoadFeedback)
|
||||
<< qMakePair(QString("backUnloadFeedback"), backUnloadFeedback)
|
||||
<< qMakePair(QString("rackPlaceFeedback"), rackPlaceFeedback)
|
||||
<< qMakePair(QString("inspectionMode"), inspectionMode)
|
||||
<< qMakePair(QString("trayNumber"), trayNumber)
|
||||
<< qMakePair(QString("slotNumber"), slotNumber);
|
||||
|
||||
QSet<int> usedAddresses;
|
||||
for (const QPair<QString, int> &item : addresses) {
|
||||
if (!isValidAddress(item.second)) {
|
||||
if (error) {
|
||||
@@ -38,6 +59,14 @@ bool ModbusAddressMap::isValid(QString *error) const
|
||||
}
|
||||
return false;
|
||||
}
|
||||
if (usedAddresses.contains(item.second)) {
|
||||
if (error) {
|
||||
*error = QString("Modbus address is duplicated: %1")
|
||||
.arg(item.first);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
usedAddresses.insert(item.second);
|
||||
}
|
||||
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user