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

sf_manufacturing/models/mrp_production.py

@@ -372,14 +372,10 @@ class MrpProduction(models.Model):
             if any(dr.test_results == '报废' and dr.handle_result == '已处理' for dr in
                    production.detection_result_ids):
                 production.state = 'cancel'
-            # 如果制造订单的功能刀具为【无效刀】则制造订单状态改为返工
-            if production.tool_state == '2':
-                production.state = 'rework'
             if production.workorder_ids and all(wo_state in ('done', 'rework', 'cancel') for wo_state in production.workorder_ids.mapped('state')):
                 if production.state not in ['scrap', 'rework', 'cancel']:
                     production.state = 'done'
 
-
     # 退回调整
     def technology_back_adjust(self):
         process_parameters = []

sf_tool_management/models/mrp_workorder.py

@@ -198,8 +198,8 @@ class MrpProduction(models.Model):
             logging.info('cnc用刀校验到无效刀自动调用重新编程方法：update_programming_state()')
             self[0].update_programming_state()
             self[0].write({'is_rework': False})
-            # 修改制造订单 编程状态变为“编程中” 制造订单状态为‘返工’
-            self.write({'programming_state': '编程中', 'work_state': '编程中', 'state': 'rework'})
+            # 修改制造订单 编程状态变为“编程中”
+            self.write({'programming_state': '编程中', 'work_state': '编程中'})
             self[0].workorder_ids.filtered(
                 lambda a: a.name == '装夹预调' and a.state not in ['rework', 'done', 'cancel'])._compute_state()
         if missing_tool_1: