feat(production): modify
- 添加终止按钮 - 点击操作前进行提示 - 取放料的时候,除了写slot,也写行和列
This commit is contained in:
@@ -551,7 +551,7 @@ void DeviceService::beginProductionAction(
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (trayNo <= 0 || slotNo < 1 || slotNo > 49) {
|
||||
if (trayNo <= 0 || trayNo > 65535 || slotNo < 1 || slotNo > 49) {
|
||||
if (callback) {
|
||||
callback(VisionWriteOutcome::NotSent, "PLC tray or slot position is invalid");
|
||||
}
|
||||
@@ -628,7 +628,27 @@ void DeviceService::beginProductionAction(
|
||||
m_modbus->writeHoldingRegister(
|
||||
addresses.slotNumber,
|
||||
static_cast<quint16>(slotNo),
|
||||
writeCommand);
|
||||
[this, addresses, slotNo, writeCommand](
|
||||
bool slotSuccess, const QString &slotError) {
|
||||
if (!slotSuccess) {
|
||||
writeCommand(false, slotError);
|
||||
return;
|
||||
}
|
||||
m_modbus->writeHoldingRegister(
|
||||
addresses.slotRowNumber,
|
||||
static_cast<quint16>((slotNo - 1) / 7 + 1),
|
||||
[this, addresses, slotNo, writeCommand](
|
||||
bool rowSuccess, const QString &rowError) {
|
||||
if (!rowSuccess) {
|
||||
writeCommand(false, rowError);
|
||||
return;
|
||||
}
|
||||
m_modbus->writeHoldingRegister(
|
||||
addresses.slotColumNumber,
|
||||
static_cast<quint16>((slotNo - 1) % 7 + 1),
|
||||
writeCommand);
|
||||
});
|
||||
});
|
||||
});
|
||||
return;
|
||||
}
|
||||
@@ -920,12 +940,28 @@ void DeviceService::moveToPhotoPosition(int trayNo, int slotNo,
|
||||
return;
|
||||
}
|
||||
m_modbus->writeVisionHoldingRegister(addresses.slotNumber, quint16(slotNo),
|
||||
[this, callback, beforeSend](VisionWriteOutcome outcome, const QString &error) {
|
||||
[this, addresses, slotNo, callback, beforeSend](VisionWriteOutcome outcome, const QString &error) {
|
||||
if (outcome != VisionWriteOutcome::Confirmed) {
|
||||
if (callback) callback(outcome, error);
|
||||
return;
|
||||
}
|
||||
writeVisionSignal(PhotoMove, true, callback, beforeSend);
|
||||
m_modbus->writeVisionHoldingRegister(addresses.slotRowNumber,
|
||||
quint16((slotNo - 1) / 7 + 1),
|
||||
[this, addresses, slotNo, callback, beforeSend](VisionWriteOutcome outcome, const QString &error) {
|
||||
if (outcome != VisionWriteOutcome::Confirmed) {
|
||||
if (callback) callback(outcome, error);
|
||||
return;
|
||||
}
|
||||
m_modbus->writeVisionHoldingRegister(addresses.slotColumNumber,
|
||||
quint16((slotNo - 1) % 7 + 1),
|
||||
[this, callback, beforeSend](VisionWriteOutcome outcome, const QString &error) {
|
||||
if (outcome != VisionWriteOutcome::Confirmed) {
|
||||
if (callback) callback(outcome, error);
|
||||
return;
|
||||
}
|
||||
writeVisionSignal(PhotoMove, true, callback, beforeSend);
|
||||
}, beforeSend);
|
||||
}, beforeSend);
|
||||
}, beforeSend);
|
||||
}, beforeSend);
|
||||
}
|
||||
|
||||
@@ -428,6 +428,12 @@ bool OrderService::cancelOrder(int id, QString *error)
|
||||
"CANCELED", "取消订单", error);
|
||||
}
|
||||
|
||||
bool OrderService::terminateOrder(int id, QString *error)
|
||||
{
|
||||
return transition(id, QStringList() << "NOT_START" << "RUNNING" << "PAUSED",
|
||||
"FINISHED", "终止订单(剩余工件不再执行)", error);
|
||||
}
|
||||
|
||||
bool OrderService::deleteOrder(int id, QString *error)
|
||||
{
|
||||
DatabaseManager &database = DatabaseManager::instance();
|
||||
@@ -501,7 +507,7 @@ bool OrderService::transition(int id, const QStringList &allowedStates,
|
||||
|
||||
const QDateTime beginTime = targetState == "RUNNING" && !order.beginTime.isValid()
|
||||
? QDateTime::currentDateTime() : order.beginTime;
|
||||
const QDateTime endTime = targetState == "CANCELED"
|
||||
const QDateTime endTime = (targetState == "CANCELED" || targetState == "FINISHED")
|
||||
? QDateTime::currentDateTime() : order.endTime;
|
||||
|
||||
if (!repository.updateOrderLifecycle(id, targetState, beginTime, endTime, &transactionError)
|
||||
|
||||
@@ -19,6 +19,7 @@ public:
|
||||
bool pauseOrder(int id, QString *error = nullptr);
|
||||
bool resumeOrder(int id, QString *error = nullptr);
|
||||
bool completeOrder(int id, QString *error = nullptr);
|
||||
bool terminateOrder(int id, QString *error = nullptr);
|
||||
bool cancelOrder(int id, QString *error = nullptr);
|
||||
bool deleteOrder(int id, QString *error = nullptr);
|
||||
|
||||
|
||||
@@ -786,7 +786,34 @@ bool ProductionService::resume(QString *error)
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ProductionService::stop(QString *error)
|
||||
bool ProductionService::stopOrder(int orderId, QString *error)
|
||||
{
|
||||
if (orderId <= 0) {
|
||||
if (error) *error = "没有可终止的订单";
|
||||
return false;
|
||||
}
|
||||
if (m_state != Idle && m_state != Completed) {
|
||||
if (orderId != m_orderId) {
|
||||
if (error) *error = "当前生产订单已改变,请重新确认终止";
|
||||
return false;
|
||||
}
|
||||
requestStopImmediate();
|
||||
return stop(error, true);
|
||||
}
|
||||
ProductionRunSnapshot run;
|
||||
Order order;
|
||||
if (!ProductionRepository().findActiveRun(&run, error)
|
||||
|| !OrderService::instance().findOrder(orderId, &order, error)) return false;
|
||||
if (run.id > 0 || order.status != "NOT_START") {
|
||||
if (error) *error = "订单存在待恢复的生产记录或状态已改变,请先核对再终止";
|
||||
return false;
|
||||
}
|
||||
if (!OrderService::instance().terminateOrder(orderId, error)) return false;
|
||||
emit stateChanged(m_state, stateName());
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ProductionService::stop(QString *error, bool finishOrder)
|
||||
{
|
||||
m_forceNormalPick = false;
|
||||
++m_actionGeneration;
|
||||
@@ -827,7 +854,7 @@ bool ProductionService::stop(QString *error)
|
||||
};
|
||||
|
||||
m_deviceService->terminate(
|
||||
[this, failTermination](bool cleaned, const QString &cleanupError) {
|
||||
[this, failTermination, finishOrder](bool cleaned, const QString &cleanupError) {
|
||||
if (!cleaned) {
|
||||
failTermination(cleanupError);
|
||||
return;
|
||||
@@ -840,14 +867,20 @@ bool ProductionService::stop(QString *error)
|
||||
failTermination(orderError);
|
||||
return;
|
||||
}
|
||||
if (order.status == "RUNNING"
|
||||
if (finishOrder && order.status != "FINISHED"
|
||||
&& !OrderService::instance().terminateOrder(m_orderId, &orderError)) {
|
||||
failTermination(orderError);
|
||||
return;
|
||||
}
|
||||
if (!finishOrder && order.status == "RUNNING"
|
||||
&& !OrderService::instance().pauseOrder(
|
||||
m_orderId, &orderError)) {
|
||||
failTermination(orderError);
|
||||
return;
|
||||
}
|
||||
|
||||
if ((order.status == "RUNNING" || order.status == "PAUSED")
|
||||
if (!finishOrder && (order.status == "NOT_START"
|
||||
|| order.status == "RUNNING" || order.status == "PAUSED")
|
||||
&& !OrderService::instance().cancelOrder(
|
||||
m_orderId, &orderError)) {
|
||||
failTermination(orderError);
|
||||
|
||||
@@ -62,7 +62,8 @@ public:
|
||||
bool start(int orderId, QString *error = nullptr);
|
||||
bool pause(QString *error = nullptr);
|
||||
bool resume(QString *error = nullptr);
|
||||
bool stop(QString *error = nullptr);
|
||||
bool stop(QString *error = nullptr, bool finishOrder = false);
|
||||
bool stopOrder(int orderId, QString *error = nullptr);
|
||||
bool clearAlarm(QString *error = nullptr);
|
||||
bool recover(QString *error = nullptr);
|
||||
bool submitRecoveryDecision(const QJsonObject &decision, QString *error = nullptr);
|
||||
|
||||
@@ -109,6 +109,13 @@ void ProductionWorker::requestStop()
|
||||
reportFailure(m_service->stop(&error), error);
|
||||
}
|
||||
|
||||
void ProductionWorker::requestStopOrder(int orderId)
|
||||
{
|
||||
ensureService();
|
||||
QString error;
|
||||
reportFailure(m_service->stopOrder(orderId, &error), error);
|
||||
}
|
||||
|
||||
void ProductionWorker::requestClearAlarm()
|
||||
{
|
||||
ensureService();
|
||||
|
||||
@@ -19,6 +19,7 @@ public slots:
|
||||
void requestPause();
|
||||
void requestResume();
|
||||
void requestStop();
|
||||
void requestStopOrder(int orderId);
|
||||
void requestClearAlarm();
|
||||
void requestRecover();
|
||||
void requestRecoveryDecision(const QJsonObject &decision);
|
||||
|
||||
Reference in New Issue
Block a user