feat(production): 修改订单流程卡死流程问题

This commit is contained in:
lidg
2026-11-06 15:49:33 +08:00
parent 753f9c3ed2
commit 81313e61b0
24 changed files with 949 additions and 261 deletions
+22 -10
View File
@@ -42,6 +42,10 @@ bool actionAddresses(DeviceService::ProductionAction action,
*commandAddress = addresses.flipCommand;
*feedbackAddress = addresses.flipFeedback;
return true;
case DeviceService::ReverseFlip:
*commandAddress = addresses.flipCommand2;
*feedbackAddress = addresses.flipFeedback2;
return true;
case DeviceService::BackLoad:
*commandAddress = addresses.backLoadCommand;
*feedbackAddress = addresses.backLoadFeedback;
@@ -148,7 +152,7 @@ void DeviceService::requestStatus(const StatusCallback &callback)
}
DeviceStatus status;
status.plcConnected = true;
readStatusStep(0, status);
readStatusStep(1, status);
}
void DeviceService::finishStatusRequest(bool success,
@@ -157,6 +161,8 @@ void DeviceService::finishStatusRequest(bool success,
{
DeviceStatus finalStatus = status;
finalStatus.statusValid = success;
// PLC communication establishes readiness; M100 is not a production interlock.
finalStatus.plcReady = success && finalStatus.plcConnected;
if (success) {
finalStatus.safetyDoorClosed = finalStatus.safetyDoorClosed
&& finalStatus.safetyDoor1Closed
@@ -204,7 +210,6 @@ void DeviceService::readStatusStep(int index, const DeviceStatus &status)
DeviceStatus nextStatus = status;
switch (index) {
case 0: nextStatus.plcReady = value != 0; break;
case 1: nextStatus.robotReady = value != 0; break;
case 2: nextStatus.safetyDoorClosed = value != 0; break;
case 3: nextStatus.emergencyStop = value != 0; break;
@@ -226,12 +231,6 @@ void DeviceService::readStatusStep(int index, const DeviceStatus &status)
const ModbusAddressMap &addresses = m_modbus->config().addressMap;
switch (index) {
case 0:
m_modbus->readCoil(addresses.plcReady,
[next](bool ok, bool value, const QString &error) {
next(ok, value ? 1 : 0, error);
});
break;
case 1:
m_modbus->readCoil(addresses.robotReady,
[next](bool ok, bool value, const QString &error) {
@@ -452,9 +451,13 @@ void DeviceService::terminate(const OperationCallback &callback)
m_terminationSignalIndex = 0;
m_pollTimer->stop();
const VisionConfig vision = ConfigManager::instance().visionConfig();
const ModbusAddressMap &addresses = m_modbus->config().addressMap;
const QList<QPair<int, int>> currentSignals = QList<QPair<int, int>>()
<< qMakePair(m_productionCommandAddress,
m_productionFeedbackAddress);
m_productionFeedbackAddress)
<< qMakePair(vision.photoMoveCoil, vision.photoMoveCoilFeedback)
<< qMakePair(addresses.rackPickCommand, addresses.rackPickFeedback);
for (const QPair<int, int> &signalPair : currentSignals) {
if (signalPair.first >= 0 && signalPair.second >= 0
&& !m_terminationSignals.contains(signalPair)) {
@@ -481,7 +484,16 @@ void DeviceService::clearNextTerminationSignal()
return;
}
if (m_terminationSignalIndex >= m_terminationSignals.size()) {
finishTermination(true, QString());
const int address = ConfigManager::instance().visionConfig().comparisonPickCoil;
m_modbus->writeCoil(address, false,
[this, address](bool written, const QString &error) {
if (!written) { finishTermination(false, error); return; }
m_modbus->readCoil(address,
[this](bool read, bool value, const QString &readError) {
finishTermination(read && !value,
!read ? readError : value ? "M852 未复位,不能完成终止" : QString());
});
});
return;
}