diff --git a/backend/app/crud/qc_task.py b/backend/app/crud/qc_task.py index 1369e23d..7bc279cc 100644 --- a/backend/app/crud/qc_task.py +++ b/backend/app/crud/qc_task.py @@ -1095,6 +1095,7 @@ def delete_qc_task(db: Session, task_id: str, tenant_no: str, user_id: Optional[ # 软删除任务结果 from app.models.qc_param import BizQcTaskResult + from app.models.models import BizQcTaskResultChangeLog results = db.query(BizQcTaskResult).filter( and_(BizQcTaskResult.task_id == task_id, BizQcTaskResult.del_flag == 0) @@ -1104,6 +1105,18 @@ def delete_qc_task(db: Session, task_id: str, tenant_no: str, user_id: Optional[ r.update_by = user_id r.update_time = now + change_logs = db.query(BizQcTaskResultChangeLog).filter( + and_( + BizQcTaskResultChangeLog.task_id == task_id, + BizQcTaskResultChangeLog.tenant_no == tenant_no, + BizQcTaskResultChangeLog.del_flag == 0, + ) + ).all() + for log in change_logs: + log.del_flag = 1 + log.update_by = user_id + log.update_time = now + # 同步软删批次明细行(配置弹窗勾选来源) _soft_delete_source_line_for_task( db, task, tenant_no=tenant_no, user_id=user_id, now=now diff --git a/backend/app/crud/qc_work_order.py b/backend/app/crud/qc_work_order.py index d5a69711..b9b72fa7 100644 --- a/backend/app/crud/qc_work_order.py +++ b/backend/app/crud/qc_work_order.py @@ -2753,6 +2753,16 @@ def _soft_delete_tasks_by_source_line_ids( {"del_flag": 1, "update_time": now}, synchronize_session="fetch", ) + from app.models.models import BizQcTaskResultChangeLog + + db.query(BizQcTaskResultChangeLog).filter( + BizQcTaskResultChangeLog.task_id.in_(task_ids), + BizQcTaskResultChangeLog.tenant_no == tenant_no, + BizQcTaskResultChangeLog.del_flag == 0, + ).update( + {"del_flag": 1, "update_time": now}, + synchronize_session="fetch", + ) for t in tasks: t.del_flag = 1 t.update_time = now @@ -3884,6 +3894,8 @@ def delete_qc_work_order(db: Session, work_order_id: str, tenant_no: str, user_i ).all() from app.models.qc_param import BizQcTaskResult + from app.models.models import BizQcTaskResultChangeLog + for task in tasks: results = db.query(BizQcTaskResult).filter( and_(BizQcTaskResult.task_id == task.id, BizQcTaskResult.del_flag == 0) @@ -3892,6 +3904,17 @@ def delete_qc_work_order(db: Session, work_order_id: str, tenant_no: str, user_i r.del_flag = 1 r.update_by = user_id r.update_time = now + change_logs = db.query(BizQcTaskResultChangeLog).filter( + and_( + BizQcTaskResultChangeLog.task_id == task.id, + BizQcTaskResultChangeLog.tenant_no == tenant_no, + BizQcTaskResultChangeLog.del_flag == 0, + ) + ).all() + for log in change_logs: + log.del_flag = 1 + log.update_by = user_id + log.update_time = now task.del_flag = 1 task.update_by = user_id task.update_time = now diff --git a/web-admin/src/views/quality-inspection/qc-work-order/QcWorkOrderTaskSubList.vue b/web-admin/src/views/quality-inspection/qc-work-order/QcWorkOrderTaskSubList.vue index b59b1da0..0b584f32 100644 --- a/web-admin/src/views/quality-inspection/qc-work-order/QcWorkOrderTaskSubList.vue +++ b/web-admin/src/views/quality-inspection/qc-work-order/QcWorkOrderTaskSubList.vue @@ -1447,7 +1447,7 @@ resultTaskStatus.value = detail.taskStatus || row.taskStatus const fillDefaults = resolveQcResultFillDefaults({ taskStatus: detail.taskStatus || row.taskStatus, - conclusion: detail.conclusion + conclusion: detail.conclusion ?? row.conclusion }) resultSaveStatus.value = fillDefaults.saveStatus resultRemark.value = detail.remark || row.remark || ''