diff --git a/pages/dashboardpage.cpp b/pages/dashboardpage.cpp index 2b7e3bc..4884e8a 100644 --- a/pages/dashboardpage.cpp +++ b/pages/dashboardpage.cpp @@ -52,6 +52,8 @@ QString displayState(const QString &state) if (state == "BACK_LOADING") return "反面上料"; if (state == "BACK_CHECKING") return "反面检测"; if (state == "BACK_UNLOADING") return "反面下料"; + if (state == "PLACE_PHOTO_MOVING") return "放料前移动到拍照位置"; + if (state == "PLACE_SLOT_INSPECTING") return "识别放料凹槽"; if (state == "RACK_PLACING") return "料架放料"; if (state == "JUDGING") return "结果判定"; if (state == "UNLOADING") return "下料"; @@ -903,6 +905,7 @@ void DashboardPage::onRecoveryDecisionRequired(const QJsonObject &context) else if (code == "RETRY_VISION") label = "重新视觉识别"; else if (code == "NORMAL_PICK") label = "改为普通取料"; else if (code == "UNLOCK_VISION") label = "仅解除视觉遗留锁(不恢复订单)"; + else if (code == "RETRY_SLOT_INSPECTION") label = "确认凹槽已清理,重新识别"; if (!label.isEmpty()) choice->addItem(label, code); } QLineEdit *operatorName = new QLineEdit(dialog); @@ -948,6 +951,8 @@ void DashboardPage::onRecoveryDecisionRequired(const QJsonObject &context) confirmed->setText("已确认机器人停止且在原起点,尚未取放或加工"); else if (code == "UNLOCK_VISION") confirmed->setText("已核对机器人停止、取料状态明确,原订单不再继续"); + else if (code == "RETRY_SLOT_INSPECTION") + confirmed->setText("已确认机器人停止,目标凹槽已清理,可以重新识别"); else if (!code.isEmpty()) confirmed->setText("已确认机器人停止在拍照位,RackPick 尚未开始"); else diff --git a/services/productionservice.cpp b/services/productionservice.cpp index acc660e..2ffb7d4 100644 --- a/services/productionservice.cpp +++ b/services/productionservice.cpp @@ -162,6 +162,8 @@ QString ProductionService::stateNameForState(State state) const case ManualConfirm: return "MANUAL_CONFIRM"; case Retrying: return "RETRYING"; case Terminating: return "TERMINATING"; + case PlacePhotoMoving: return "PLACE_PHOTO_MOVING"; + case PlaceSlotInspecting: return "PLACE_SLOT_INSPECTING"; } return "UNKNOWN"; } @@ -1597,6 +1599,12 @@ bool ProductionService::recover(QString *error) checkVisionRecovery(); return; } + if (state == PlaceSlotInspecting) { + requestManualDecision(state, ProductionActionStatus(), + m_lastError + ";请确认目标凹槽已清理,再重新识别", + QStringList{"RETRY_SLOT_INSPECTION"}); + return; + } DeviceService::ProductionAction action; if (!productionActionForState(state, &action)) { finishRecoveryCheck("无法确定当前独立动作"); @@ -1758,6 +1766,27 @@ bool ProductionService::submitRecoveryDecision(const QJsonObject &decision, QStr checkVisionRecovery(decision); return; } const State state = stateForProcessStep(m_currentWorkpiece.processStep); + if (state == PlaceSlotInspecting && choice == "RETRY_SLOT_INSPECTION") { + const QString details = QString::fromUtf8( + QJsonDocument(decision).toJson(QJsonDocument::Compact)); + DatabaseManager &database = DatabaseManager::instance(); + ProductionRepository repository; + if (!database.transaction(&error) + || !repository.insertStateHistory( + m_runId, m_orderId, m_currentWorkpiece.id, + stateName(), stateName(), m_currentWorkpiece.processStep, + "OPERATOR", choice, details, &error, + decision.value("operator_name").toString().trimmed()) + || !database.commit(&error)) { + database.rollback(); + m_persistenceUncertain = true; + finishRecoveryCheck(error); + return; + } + m_restoredRun = false; + resumeRecoveredState(state); + return; + } DeviceService::ProductionAction action; if (!productionActionForState(state, &action)) { finishRecoveryCheck("当前不是机器人独立动作"); return; @@ -2016,6 +2045,7 @@ QString ProductionService::actionTypeForState(State state) const { switch (state) { case PhotoMoving: return "PHOTO_MOVE"; + case PlacePhotoMoving: return "PHOTO_MOVE"; case VisionProcessing: return "VISION"; case RackPicking: return "RACK_PICK"; case FrontLoading: return "FRONT_LOAD"; @@ -2034,17 +2064,19 @@ QString ProductionService::nextStepForState(State state) const { switch (state) { case PhotoMoving: return "VISION_PROCESSING"; + case PlacePhotoMoving: return "PLACE_SLOT_INSPECTING"; + case PlaceSlotInspecting: return "RACK_PLACING"; case VisionProcessing: return "RACK_PICKING"; case RackPicking: return "FRONT_LOADING"; case FrontLoading: return "FRONT_CHECKING"; case FrontChecking: return "FRONT_UNLOADING"; - case FrontUnloading: return m_inspectionMode == "AFTER_PLATING" ? "RACK_PLACING" : "FLIPPING"; + case FrontUnloading: return m_inspectionMode == "AFTER_PLATING" ? "PLACE_PHOTO_MOVING" : "FLIPPING"; case Flipping: return "BACK_LOADING"; case BackLoading: return "BACK_CHECKING"; case BackChecking: return "BACK_UNLOADING"; case BackUnloading: return m_inspectionMode == "BEFORE_PLATING" - ? "REVERSE_FLIPPING" : "RACK_PLACING"; - case ReverseFlipping: return "RACK_PLACING"; + ? "REVERSE_FLIPPING" : "PLACE_PHOTO_MOVING"; + case ReverseFlipping: return "PLACE_PHOTO_MOVING"; case RackPlacing: return "COMPLETE"; default: return QString(); } @@ -2664,6 +2696,7 @@ bool ProductionService::productionActionForState( if (!action) return false; switch (state) { case PhotoMoving: *action = DeviceService::PhotoMoveAction; return true; + case PlacePhotoMoving: *action = DeviceService::PhotoMoveAction; return true; case RackPicking: *action = DeviceService::RackPick; return true; case FrontLoading: *action = DeviceService::FrontLoad; return true; case FrontChecking: @@ -3204,8 +3237,8 @@ bool ProductionService::processProductionStep(State state, QString *error) case FrontUnloading: return executeCurrentAction( DeviceService::FrontUnload, - m_inspectionMode == "AFTER_PLATING" ? "RACK_PLACING" : "FLIPPING", - m_inspectionMode == "AFTER_PLATING" ? RackPlacing : Flipping, + m_inspectionMode == "AFTER_PLATING" ? "PLACE_PHOTO_MOVING" : "FLIPPING", + m_inspectionMode == "AFTER_PLATING" ? PlacePhotoMoving : Flipping, error); case Flipping: return executeCurrentAction(DeviceService::Flip, @@ -3239,12 +3272,31 @@ bool ProductionService::processProductionStep(State state, QString *error) case BackUnloading: return executeCurrentAction( DeviceService::BackUnload, - m_inspectionMode == "BEFORE_PLATING" ? "REVERSE_FLIPPING" : "RACK_PLACING", - m_inspectionMode == "BEFORE_PLATING" ? ReverseFlipping : RackPlacing, + m_inspectionMode == "BEFORE_PLATING" ? "REVERSE_FLIPPING" : "PLACE_PHOTO_MOVING", + m_inspectionMode == "BEFORE_PLATING" ? ReverseFlipping : PlacePhotoMoving, error); case ReverseFlipping: return executeCurrentAction(DeviceService::ReverseFlip, - "RACK_PLACING", RackPlacing, error); + "PLACE_PHOTO_MOVING", PlacePhotoMoving, error); + case PlacePhotoMoving: + return executeCurrentAction(DeviceService::PhotoMoveAction, + "PLACE_SLOT_INSPECTING", PlaceSlotInspecting, + error); + case PlaceSlotInspecting: { + const SlotOccupancyResult result = inspectPlaceSlot(); + if (result == SlotOccupancyResult::Occupied) { + if (error) *error = "目标凹槽检测到有料,禁止放料"; + return false; + } + if (result == SlotOccupancyResult::Unknown) { + if (error) *error = "目标凹槽识别失败或结果不确定,禁止放料"; + return false; + } + if (!updateCurrentProcessStep("RACK_PLACING", error)) return false; + if (!setState(RackPlacing)) { if (error) *error = m_lastError; return false; } + if (m_pauseAfterCurrentAction) return pauseAtActionBoundary(error); + return true; + } case RackPlacing: { bool completed = false; if (!processProductionAction( @@ -3282,6 +3334,14 @@ bool ProductionService::processProductionStep(State state, QString *error) return true; } +ProductionService::SlotOccupancyResult ProductionService::inspectPlaceSlot() const +{ + // TODO: Replace this placeholder with the camera occupancy result. + const bool mockSlotOccupied = false; + return mockSlotOccupied ? SlotOccupancyResult::Occupied + : SlotOccupancyResult::Empty; +} + bool ProductionService::recoverFromPlcStep(QString *error) { m_timer->stop(); @@ -3298,6 +3358,7 @@ bool ProductionService::isTimedState(State state) const || state == FrontUnloading || state == Flipping || state == BackLoading || state == BackChecking || state == BackUnloading || state == ReverseFlipping + || state == PlacePhotoMoving || state == PlaceSlotInspecting || state == RackPlacing || state == Judging; } @@ -3319,6 +3380,8 @@ QString ProductionService::processStepForState(State state) const case BackChecking: return "BACK_CHECKING"; case BackUnloading: return "BACK_UNLOADING"; case ReverseFlipping: return "REVERSE_FLIPPING"; + case PlacePhotoMoving: return "PLACE_PHOTO_MOVING"; + case PlaceSlotInspecting: return "PLACE_SLOT_INSPECTING"; case RackPlacing: return "RACK_PLACING"; case Judging: return "JUDGING"; default: return QString(); @@ -3342,6 +3405,8 @@ ProductionService::State ProductionService::stateForProcessStep( if (processStep == "BACK_CHECKING") return BackChecking; if (processStep == "BACK_UNLOADING") return BackUnloading; if (processStep == "REVERSE_FLIPPING") return ReverseFlipping; + if (processStep == "PLACE_PHOTO_MOVING") return PlacePhotoMoving; + if (processStep == "PLACE_SLOT_INSPECTING") return PlaceSlotInspecting; if (processStep == "RACK_PLACING") return RackPlacing; if (processStep == "JUDGING") return Judging; return Idle; @@ -3387,6 +3452,8 @@ ProductionService::State ProductionService::stateFromName(const QString &name) c if (name == "BACK_CHECKING") return BackChecking; if (name == "BACK_UNLOADING") return BackUnloading; if (name == "REVERSE_FLIPPING") return ReverseFlipping; + if (name == "PLACE_PHOTO_MOVING") return PlacePhotoMoving; + if (name == "PLACE_SLOT_INSPECTING") return PlaceSlotInspecting; if (name == "RACK_PLACING") return RackPlacing; if (name == "JUDGING") return Judging; if (name == "UNLOADING") return Unloading; diff --git a/services/productionservice.h b/services/productionservice.h index dc55266..e60ad35 100644 --- a/services/productionservice.h +++ b/services/productionservice.h @@ -46,7 +46,9 @@ public: RecoveryChecking, ManualConfirm, Retrying, - Terminating + Terminating, + PlacePhotoMoving, + PlaceSlotInspecting }; Q_ENUM(State) @@ -134,6 +136,9 @@ private: enum class VisionStage { Idle, ReadingPose, Measuring, WritingPose, Publishing, Complete, Fault }; + enum class SlotOccupancyResult { + Empty, Occupied, Unknown + }; void prepareVision(); void advanceVision(); void beginVisionMeasurement(); @@ -181,6 +186,7 @@ private: void tickSimulation(); void tickProduction(); bool processProductionStep(State state, QString *error); + SlotOccupancyResult inspectPlaceSlot() const; bool recoverFromPlcStep(QString *error); bool processProductionAction(DeviceService::ProductionAction action, bool *completed, QString *error);