Commit
This commit is contained in:
@@ -52,6 +52,11 @@ bool OrderService::findOrder(int id, Order *order, QString *error)
|
||||
return OrderRepository().findOrder(id, order, error);
|
||||
}
|
||||
|
||||
bool OrderService::findUnfinishedOrder(Order *order, QString *error)
|
||||
{
|
||||
return OrderRepository().findUnfinishedOrder(order, error);
|
||||
}
|
||||
|
||||
bool OrderService::createOrder(Order *order, QString *error)
|
||||
{
|
||||
if (!order) {
|
||||
|
||||
@@ -12,6 +12,7 @@ public:
|
||||
|
||||
QList<Order> listOrders(QString *error = nullptr, int limit = 100);
|
||||
bool findOrder(int id, Order *order, QString *error = nullptr);
|
||||
bool findUnfinishedOrder(Order *order, QString *error = nullptr);
|
||||
bool createOrder(Order *order, QString *error = nullptr);
|
||||
bool generateWorkpiecesAndAssign(int orderId, QString *error = nullptr);
|
||||
bool startOrder(int id, QString *error = nullptr);
|
||||
|
||||
@@ -403,6 +403,13 @@ bool ProductionService::stop(QString *error)
|
||||
return;
|
||||
}
|
||||
|
||||
if ((order.status == "RUNNING" || order.status == "PAUSED")
|
||||
&& !OrderService::instance().cancelOrder(
|
||||
m_orderId, &orderError)) {
|
||||
failTermination(orderError);
|
||||
return;
|
||||
}
|
||||
|
||||
QString persistenceError;
|
||||
if (m_runId > 0
|
||||
&& !ProductionRepository().finishRun(
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
#include "qualityservice.h"
|
||||
|
||||
#include "../repositories/qualityrepository.h"
|
||||
|
||||
QualityService &QualityService::instance()
|
||||
{
|
||||
static QualityService service;
|
||||
return service;
|
||||
}
|
||||
|
||||
QList<InspectionRecord> QualityService::listInspectionRecords(
|
||||
const QString &orderNo, const QString &barcode, const QString &trayCode,
|
||||
int trayPos, const QString &inspectionMode, const QString &inspectionSide,
|
||||
const QString &resultState, QString *error)
|
||||
{
|
||||
return QualityRepository().listInspectionRecords(
|
||||
orderNo, barcode, trayCode, trayPos, inspectionMode, inspectionSide,
|
||||
resultState, error);
|
||||
}
|
||||
|
||||
bool QualityService::queryStatistics(const QString &orderNo,
|
||||
QualityStatistics *statistics,
|
||||
QString *error)
|
||||
{
|
||||
return QualityRepository().queryStatistics(orderNo, statistics, error);
|
||||
}
|
||||
|
||||
bool QualityService::findWorkpieceTrace(
|
||||
const QString &barcode, Workpiece *workpiece, Order *order,
|
||||
QList<InspectionRecord> *inspections,
|
||||
QList<QualityProcessRecord> *processRecords,
|
||||
QList<QualityStateHistory> *stateHistory, QString *error)
|
||||
{
|
||||
return QualityRepository().findWorkpieceTrace(
|
||||
barcode, workpiece, order, inspections, processRecords, stateHistory,
|
||||
error);
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
#ifndef QUALITYSERVICE_H
|
||||
#define QUALITYSERVICE_H
|
||||
|
||||
#include "../models/qualityrecord.h"
|
||||
|
||||
#include <QList>
|
||||
#include <QString>
|
||||
|
||||
class QualityService
|
||||
{
|
||||
public:
|
||||
static QualityService &instance();
|
||||
|
||||
QList<InspectionRecord> listInspectionRecords(
|
||||
const QString &orderNo = QString(),
|
||||
const QString &barcode = QString(),
|
||||
const QString &trayCode = QString(),
|
||||
int trayPos = 0,
|
||||
const QString &inspectionMode = QString(),
|
||||
const QString &inspectionSide = QString(),
|
||||
const QString &resultState = QString(),
|
||||
QString *error = nullptr);
|
||||
|
||||
bool queryStatistics(const QString &orderNo, QualityStatistics *statistics,
|
||||
QString *error = nullptr);
|
||||
|
||||
bool findWorkpieceTrace(const QString &barcode, Workpiece *workpiece,
|
||||
Order *order, QList<InspectionRecord> *inspections,
|
||||
QList<QualityProcessRecord> *processRecords,
|
||||
QList<QualityStateHistory> *stateHistory,
|
||||
QString *error = nullptr);
|
||||
|
||||
private:
|
||||
QualityService() = default;
|
||||
QualityService(const QualityService &) = delete;
|
||||
QualityService &operator=(const QualityService &) = delete;
|
||||
};
|
||||
|
||||
#endif // QUALITYSERVICE_H
|
||||
Reference in New Issue
Block a user