feat(production): 修改订单流程卡死流程问题
This commit is contained in:
@@ -118,6 +118,8 @@ bool ConfigManager::load(const QString &filePath)
|
||||
settings.value("modbus/frontUnloadCommand", addresses.frontUnloadCommand).toInt();
|
||||
addresses.flipCommand =
|
||||
settings.value("modbus/flipCommand", addresses.flipCommand).toInt();
|
||||
addresses.flipCommand2 =
|
||||
settings.value("modbus/flipCommand2", addresses.flipCommand2).toInt();
|
||||
addresses.backLoadCommand =
|
||||
settings.value("modbus/backLoadCommand", addresses.backLoadCommand).toInt();
|
||||
addresses.backUnloadCommand =
|
||||
@@ -134,6 +136,8 @@ bool ConfigManager::load(const QString &filePath)
|
||||
settings.value("modbus/frontUnloadFeedback", addresses.frontUnloadFeedback).toInt();
|
||||
addresses.flipFeedback =
|
||||
settings.value("modbus/flipFeedback", addresses.flipFeedback).toInt();
|
||||
addresses.flipFeedback2 =
|
||||
settings.value("modbus/flipFeedback2", addresses.flipFeedback2).toInt();
|
||||
addresses.backLoadFeedback =
|
||||
settings.value("modbus/backLoadFeedback", addresses.backLoadFeedback).toInt();
|
||||
addresses.backUnloadFeedback =
|
||||
@@ -177,6 +181,16 @@ bool ConfigManager::load(const QString &filePath)
|
||||
m_productionConfig.stateTimeoutMs =
|
||||
settings.value("production/stateTimeoutMs",
|
||||
m_productionConfig.stateTimeoutMs).toInt();
|
||||
m_productionConfig.readyTimeoutMs = settings.value(
|
||||
"production/readyTimeoutMs", m_productionConfig.stateTimeoutMs).toInt();
|
||||
m_productionConfig.photoMoveTimeoutMs = settings.value(
|
||||
"production/photoMoveTimeoutMs", m_productionConfig.stateTimeoutMs).toInt();
|
||||
m_productionConfig.handlingTimeoutMs = settings.value(
|
||||
"production/handlingTimeoutMs", m_productionConfig.stateTimeoutMs).toInt();
|
||||
m_productionConfig.flipTimeoutMs = settings.value(
|
||||
"production/flipTimeoutMs", m_productionConfig.stateTimeoutMs).toInt();
|
||||
m_productionConfig.inspectionTimeoutMs = settings.value(
|
||||
"production/inspectionTimeoutMs", m_productionConfig.stateTimeoutMs).toInt();
|
||||
m_productionConfig.maxRecoveryRetries =
|
||||
settings.value("production/maxRecoveryRetries",
|
||||
m_productionConfig.maxRecoveryRetries).toInt();
|
||||
@@ -298,6 +312,11 @@ bool ConfigManager::validate(QString *error) const
|
||||
}
|
||||
if (m_productionConfig.timeoutWarningMs <= 0
|
||||
|| m_productionConfig.stateTimeoutMs <= 0
|
||||
|| m_productionConfig.readyTimeoutMs <= 0
|
||||
|| m_productionConfig.photoMoveTimeoutMs <= 0
|
||||
|| m_productionConfig.handlingTimeoutMs <= 0
|
||||
|| m_productionConfig.flipTimeoutMs <= 0
|
||||
|| m_productionConfig.inspectionTimeoutMs <= 0
|
||||
|| m_productionConfig.timeoutWarningMs >= m_productionConfig.stateTimeoutMs
|
||||
|| m_productionConfig.maxRecoveryRetries < 0
|
||||
|| m_productionConfig.simulationStepMs <= 0) {
|
||||
|
||||
Reference in New Issue
Block a user