1、工序排序方法优化；2、返工优化

2024-11-27 11:01:10 +08:00
parent d3b61f320f
commit a434227807
3 changed files with 20 additions and 2 deletions
--- a/sf_manufacturing/wizard/rework_wizard.py
+++ b/sf_manufacturing/wizard/rework_wizard.py
@@ -54,6 +54,11 @@ class ReworkWizard(models.TransientModel):
            if self.hidden_workorder_ids:
                hidden_workorder_list = self.hidden_workorder_ids.split(',')
                rework_workorder_ids = self.workorder_ids.filtered(lambda w: str(w.id) in hidden_workorder_list)
+                # 限制判断
+                # 1、当制造订单内ZM面的工单都已完成时，返工勾选工序时只能勾选上ZM面的所有工序进行返工
+                # 2、当FM工单在CNC工单进行选择返工，并将已全部完成的ZM面工序全部勾选上时，FM工单上所有的已完成的工单（装夹预调工单）也必须进行勾选
+                done_panel_workorder_ids = self.workorder_ids.filtered(
+                    lambda w: w.state == 'done' and w.processing_panel is not False)
            else:
                raise ValidationError('请选择返工工单！！！')
            if rework_workorder_ids: