优化表面工艺

2024-08-05 17:28:48 +08:00
parent ed0d57c364
commit 5393ef686a
4 changed files with 118 additions and 82 deletions
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -940,7 +940,7 @@ class ResMrpWorkOrder(models.Model):
                    if workorder.production_id.tool_state in ['1', '2'] and workorder.state == 'ready':
                        workorder.state = 'waiting'
                        continue
->>>>>>> 3f27ae0f35c7054b2e6583cc60502d6faef3fc92
+

            # elif workorder.routing_type == 'CNC加工' and workorder.state not in ['done', 'cancel', 'progress',
            #                                                                      'rework']: