feat(production): modify
- 添加终止按钮 - 点击操作前进行提示 - 取放料的时候,除了写slot,也写行和列
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user