Merge branch 'feature/工单-质检优化' into feature/工单-质检优化_1

This commit is contained in:
yuxianghui
2025-01-13 15:08:04 +08:00
5 changed files with 22 additions and 13 deletions

View File

@@ -1726,7 +1726,12 @@ class sf_detection_result(models.Model):
processing_panel = fields.Char('加工面')
routing_type = fields.Selection([
('装夹预调', '装夹预调'),
('CNC加工', 'CNC加工')], string="工序类型")
('CNC加工', 'CNC加工'),
('解除装夹', '解除装夹'),
('切割', '切割'),
('表面工艺', '表面工艺'),
('线切割', '线切割'),
('人工线下加工', '人工线下加工')], string="工序类型")
rework_reason = fields.Selection(
[("programming", "编程"), ("cutter", "刀具"), ("clamping", "装夹"),