feat(jobs): Sub 14 — configurable workflow state bar (Path B)
Replaces the generic Draft/Confirmed/In Progress/Done statusbar with
a shop-configurable list of plating-specific milestones. Bar advances
automatically as recipe steps complete; no manual button clicks.
What ships
==========
* New model: fp.job.workflow.state
Catalog of milestones (name, code, sequence, color, triggers).
Triggers can be:
- trigger_default_kinds: "receiving,inspect" matches by step.default_kind
- trigger_first_step_started: any wet/bake/mask/rack step started
- trigger_all_steps_done: every non-cancelled step in done/skipped
- block_when_quality_hold: held back while NCR/hold open
Plus per-recipe-node override (see below).
* Default 7-state seed (data/fp_workflow_state_data.xml):
Draft → Confirmed → Received → In Progress → Inspected → Shipped → Done
noupdate=1 so per-shop edits survive module upgrade.
* Recipe-side trigger field on fusion.plating.process.node:
triggers_workflow_state_id (Many2one, optional)
Wins over default_kind matching. Lets the recipe author pin a
specific step as a milestone trigger even when default_kind isn't
set or doesn't match. Exposed in the Recipe Tree Editor properties
panel (dropdown sourced from the catalog).
* fp.job.workflow_state_id (computed, stored)
Iterates the catalog in sequence order; lands at the highest passed
milestone. Recomputes on step state / kind / recipe_node / quality
hold changes. Replaces fp.job.state on the form's statusbar.
* Settings UI: Configuration > Workflow States
Standard list+form pages so admins can add / edit / deactivate
states. Manager-group write permission, supervisor read.
What this does NOT do
=====================
* Doesn't drop fp.job.state — that field still drives the internal
state machine (button_confirm, action_cancel, etc.). Only the
UI statusbar is reassigned.
* No migration for existing jobs — they auto-recompute on next read
because workflow_state_id is a stored compute with the right
api.depends. Existing WH/JOB/00342 will display its current
workflow state on next page load.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -80,6 +80,46 @@ class FpJob(models.Model):
|
||||
'idempotency. Cleared post-cutover.',
|
||||
)
|
||||
|
||||
# ------------------------------------------------------------------
|
||||
# Sub 14 — Configurable workflow state (status bar milestone)
|
||||
# ------------------------------------------------------------------
|
||||
# workflow_state_id auto-advances along the highest passed milestone
|
||||
# in fp.job.workflow.state's sequence order. Replaces the hardcoded
|
||||
# state Selection on the form's statusbar.
|
||||
workflow_state_id = fields.Many2one(
|
||||
'fp.job.workflow.state',
|
||||
string='Workflow Stage',
|
||||
compute='_compute_workflow_state_id',
|
||||
store=True,
|
||||
readonly=True,
|
||||
help='Highest workflow milestone this job has passed, computed '
|
||||
'from step states + per-state trigger conditions. Updates '
|
||||
'automatically — the operator never sets it.',
|
||||
)
|
||||
|
||||
@api.depends(
|
||||
'state',
|
||||
'step_ids',
|
||||
'step_ids.state',
|
||||
'step_ids.kind',
|
||||
'step_ids.recipe_node_id',
|
||||
'step_ids.recipe_node_id.default_kind',
|
||||
'step_ids.recipe_node_id.triggers_workflow_state_id',
|
||||
'quality_hold_count',
|
||||
)
|
||||
def _compute_workflow_state_id(self):
|
||||
WS = self.env['fp.job.workflow.state']
|
||||
all_states = WS.search([], order='sequence, id')
|
||||
for job in self:
|
||||
passed = WS.browse()
|
||||
for ws in all_states:
|
||||
if ws._fp_is_passed_for_job(job):
|
||||
passed = ws
|
||||
else:
|
||||
# First non-passed state stops the bar's progress
|
||||
break
|
||||
job.workflow_state_id = passed
|
||||
|
||||
# ------------------------------------------------------------------
|
||||
# Smart-button counts (Feature A — operator workflow)
|
||||
#
|
||||
@@ -1350,3 +1390,26 @@ class FpJobStep(models.Model):
|
||||
'migrated from. Used by the migration script for '
|
||||
'idempotency. Cleared post-cutover.',
|
||||
)
|
||||
|
||||
|
||||
# ==========================================================================
|
||||
# Sub 14 — Recipe-side trigger field
|
||||
# ==========================================================================
|
||||
# Adds an optional Many2one on every recipe operation node so the recipe
|
||||
# author can explicitly map "completion of this step triggers workflow
|
||||
# state X". Wins over the default-kind matching defined on the workflow
|
||||
# state itself. Lives here (not core) because the target model
|
||||
# (fp.job.workflow.state) is defined in this module.
|
||||
|
||||
class FusionPlatingProcessNodeWorkflow(models.Model):
|
||||
_inherit = 'fusion.plating.process.node'
|
||||
|
||||
triggers_workflow_state_id = fields.Many2one(
|
||||
'fp.job.workflow.state',
|
||||
string='Triggers Workflow State',
|
||||
ondelete='set null',
|
||||
help='When a job step generated from this recipe node finishes '
|
||||
'(or is skipped/cancelled), the job advances to this '
|
||||
'workflow state. Leave blank to fall back to default-kind '
|
||||
'matching defined on the workflow state catalog.',
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user