Merge branch 'feature/内部调拨作业详情添加Rfid字段' into feature/库存模块优化

# Conflicts:
#	sf_manufacturing/models/mrp_production.py
#	sf_manufacturing/models/mrp_workorder.py

sf_manufacturing/models/mrp_production.py

@@ -57,7 +57,7 @@ class MrpProduction(models.Model):
     production_line_state = fields.Selection([('待上产线', '待上产线'), ('已上产线', '已上产线'), ('已下产线', '已下产线')],
                                              string='上/下产线', default='待上产线')
 
-    manual_quotation = fields.Boolean('人工编程', default=False)
+    manual_quotation = fields.Boolean('人工编程', default=False, readonly=True)
 
     @api.depends(
         'move_raw_ids.state', 'move_raw_ids.quantity_done', 'move_finished_ids.state',

sf_manufacturing/models/mrp_workorder.py

@@ -46,7 +46,7 @@ class ResMrpWorkOrder(models.Model):
     ], string="工序类型")
     results = fields.Char('结果')
 
-    manual_quotation = fields.Boolean('人工编程', default=False)
+    manual_quotation = fields.Boolean('人工编程', default=False, readonly=True)
 
     @api.onchange('users_ids')
     def get_user_permissions(self):

sf_manufacturing/models/product_template.py

@@ -10,7 +10,6 @@ from OCC.Extend.DataExchange import read_step_file
 from OCC.Extend.DataExchange import write_stl_file
 
 
-
 class ResProductMo(models.Model):
     _inherit = 'product.template'
 
@@ -522,6 +521,9 @@ class ResProductMo(models.Model):
                                       string='注册状态', default='未注册')
     industry_code = fields.Char('行业编码', readonly=True)
 
+    # bfm下单
+    manual_quotation = fields.Boolean('人工编程', default=False, readonly=True)
+
     @api.constrains('tool_length')
     def _check_tool_length_size(self):
         if self.tool_length > 1000000:
@@ -616,6 +618,7 @@ class ResProductMo(models.Model):
                 'process_parameters_code') else self.get_process_parameters_id(item['process_parameters_code']),
             'model_remark': item['remark'],
             'default_code': '%s-%s' % (order_number, i),
+            'manual_quotation': item['manual_quotation'] or False,
             'active': True,
         }
         copy_product_id.sudo().write(vals)