订单流程添加修改

This commit is contained in:
lidg
2026-08-20 11:22:55 +08:00
parent 0c4fd6844c
commit 4e99071ce1
31 changed files with 1359 additions and 241 deletions
+50 -6
View File
@@ -278,8 +278,9 @@ bool WorkpieceService::updateState(int id, const QString &state,
}
bool WorkpieceService::updateProcessStepWithRecord(
int id, const QString &processStep, int plcStep, const QString &source,
int durationMs, QString *error, bool forceRestart)
int id, const QString &processStep, const QString &inspectionMode,
int plcStep, const QString &source, int durationMs, QString *error,
bool forceRestart)
{
if (id <= 0 || processStep.trimmed().isEmpty()) {
if (error) {
@@ -336,7 +337,8 @@ bool WorkpieceService::updateProcessStepWithRecord(
workpiece.orderId, &transactionError))
|| (!sameProcess
&& !ProductionRepository().startWorkpieceProcess(
workpiece.orderId, id, processStep, plcStep, source,
workpiece.orderId, id, processStep, inspectionMode,
plcStep, source,
&transactionError))
|| !recordLog("更新工件工序",
QString("工件 %1 工序更新为 %2")
@@ -355,8 +357,8 @@ bool WorkpieceService::updateProcessStepWithRecord(
bool WorkpieceService::completeWithInspection(
int id, const QString &state, const QString &processStep,
const QString &previousProcessStep, int durationMs, int rawResult,
const QString &resultState, int plcStep, const QString &source,
QString *error)
const QString &resultState, int plcStep, const QString &inspectionMode,
const QString &source, QString *error)
{
if (id <= 0) {
if (error) {
@@ -400,7 +402,8 @@ bool WorkpieceService::completeWithInspection(
&transactionError))
|| !ProductionRepository().insertInspection(
workpiece.orderId, id, "FINAL", rawResult, resultState,
plcStep, source, "Final production result", &transactionError)
inspectionMode, plcStep, source, "Final production result",
&transactionError)
|| !recordLog("完成工件检测",
QString("工件 %1 检测结果为 %2")
.arg(workpiece.barcode, resultState),
@@ -415,6 +418,47 @@ bool WorkpieceService::completeWithInspection(
return true;
}
bool WorkpieceService::recordInspection(
int id, const QString &side, int rawResult, const QString &resultState,
int plcStep, const QString &inspectionMode, const QString &source,
const QString &message, QString *error)
{
if (id <= 0 || side.trimmed().isEmpty()) {
if (error) {
*error = id <= 0 ? "Workpiece id must be greater than 0"
: "Inspection side cannot be empty";
}
return false;
}
DatabaseManager &database = DatabaseManager::instance();
QString transactionError;
if (!database.transaction(&transactionError)) {
if (error) {
*error = transactionError;
}
return false;
}
Workpiece workpiece;
if (!WorkpieceRepository().findWorkpiece(id, &workpiece, &transactionError)
|| !ProductionRepository().insertInspection(
workpiece.orderId, id, side, rawResult, resultState,
inspectionMode, plcStep, source, message, &transactionError)
|| !recordLog("RECORD_INSPECTION",
QString("Workpiece %1 %2 result %3")
.arg(workpiece.barcode, side, resultState),
&transactionError)
|| !database.commit(&transactionError)) {
database.rollback();
if (error) {
*error = transactionError;
}
return false;
}
return true;
}
bool WorkpieceService::isValidState(const QString &state) const
{
return state == "PENDING" || state == "PROCESSING"