Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化

2025-01-14 11:12:41 +08:00
parent 40603fea6a 0a718b9836
commit bb5126d4f5
1 changed files with 3 additions and 1 deletions
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1284,7 +1284,9 @@ class ResMrpWorkOrder(models.Model):
                                                                         '报废'] or record.is_rework is True else '',
                    'test_results': record.test_results,
                    'test_report': record.detection_report})],
-                                            'is_scrap': True if record.test_results == '报废' else False})
+                                            'is_scrap': True if record.test_results == '报废' else False,
+                                            'state': 'rework' if (record.routing_type != 'CNC加工' and record.test_results == '返工') else record.state
+                                            })
            if record.routing_type == '解除装夹':
                '''
                记录结束时间