Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹

sf_manufacturing/models/mrp_production.py

@@ -11,6 +11,8 @@ class MrpProduction(models.Model):
     maintenance_count = fields.Integer(compute='_compute_maintenance_count', string="Number of maintenance requests")
     request_ids = fields.One2many('maintenance.request', 'production_id')
     model_file = fields.Binary('模型文件', related='product_id.model_file')
+    schedule_state = fields.Selection([('未排', '未排'), ('已排', '已排')],
+                                      string='排程状态', default='未排')
 
     @api.depends('request_ids')
     def _compute_maintenance_count(self):
@@ -336,7 +338,7 @@ class MrpProduction(models.Model):
                 current_sequence += 1
                 if work.name == '获取CNC加工程序':
                     work.button_start()
-                    work.fetchCNC()
+                    #work.fetchCNC()
 
     # 创建工单并进行排序
     def _create_workorder(self):