diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index dee1258a..0c3dac0e 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -154,10 +154,10 @@ class ResMrpWorkOrder(models.Model): process_state = fields.Selection([ ('待装夹', '待装夹'), ('待检测', '待检测'), - ('待加工', '待加工'), + ('待加工', '装夹预调完工'), ('待解除装夹', '待解除装夹'), ('已完工', '已完工'), - ], string='工序状态', default='待装夹') + ], string='工序状态', default='待装夹', readonly='True') # 加工图纸 processing_drawing = fields.Binary(string='加工图纸', related='production_id.part_drawing') @@ -841,7 +841,7 @@ class ResMrpWorkOrder(models.Model): raise UserError("请对前置三元检测定位参数进行计算定位") if not record.rfid_code: raise UserError("请扫RFID码进行绑定") - record.process_state = '待加工' + record.process_state = '装夹预调完成' # record.write({'process_state': '待加工'}) record.production_id.process_state = '待加工' if record.routing_type == 'CNC加工': diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml index f447fd77..94f469ea 100644 --- a/sf_manufacturing/views/mrp_workorder_view.xml +++ b/sf_manufacturing/views/mrp_workorder_view.xml @@ -171,7 +171,7 @@ - + 计划加工时间