Merge branch 'feature/制造、工单优化' into feature/工单rfid优化

2024-12-20 11:07:48 +08:00
parent 8cfccfb2e0 bdac1e7460
commit 18073cb726
3 changed files with 25 additions and 16 deletions
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1423,8 +1423,7 @@ class ResMrpWorkOrder(models.Model):
                    len(done_workorder) == len(record.production_id.workorder_ids)):
                is_production_id = True
            if record.routing_type in ['解除装夹'] or (
-                    record.is_rework is True and record.routing_type in ['装夹预调']) or (
-                    record.test_results in ['返工', '报废'] and record.routing_type in ['CNC加工']):
+                    record.is_rework is True and record.routing_type in ['装夹预调']):
                for workorder in record.production_id.workorder_ids:
                    if workorder.processing_panel == record.processing_panel:
                        rfid_code = workorder.rfid_code