Accept Merge Request #1531: (feature/制造功能优化 -> develop)
Merge Request: 线切割、人工线下加工生成工单异常处理 Created By: @马广威 Accepted By: @马广威 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1531
This commit is contained in:
@@ -41,7 +41,7 @@ class ResMrpWorkOrder(models.Model):
|
|||||||
('装夹预调', '装夹预调'),
|
('装夹预调', '装夹预调'),
|
||||||
('CNC加工', 'CNC加工'),
|
('CNC加工', 'CNC加工'),
|
||||||
('解除装夹', '解除装夹'),
|
('解除装夹', '解除装夹'),
|
||||||
('切割', '切割'), ('表面工艺', '表面工艺'), ('线切割', '线切割')
|
('切割', '切割'), ('表面工艺', '表面工艺'), ('线切割', '线切割'), ('人工线下加工', '人工线下加工')
|
||||||
], string="工序类型")
|
], string="工序类型")
|
||||||
results = fields.Char('结果')
|
results = fields.Char('结果')
|
||||||
state = fields.Selection([
|
state = fields.Selection([
|
||||||
@@ -382,8 +382,11 @@ class ResMrpWorkOrder(models.Model):
|
|||||||
保存名称
|
保存名称
|
||||||
"""
|
"""
|
||||||
for record in self:
|
for record in self:
|
||||||
tem_name = record.production_id.name.replace('/', '_')
|
if record.processing_panel:
|
||||||
record.save_name = tem_name + '_' + record.processing_panel
|
tem_name = record.production_id.name.replace('/', '_')
|
||||||
|
record.save_name = tem_name + '_' + record.processing_panel
|
||||||
|
else:
|
||||||
|
record.save_name = ''
|
||||||
|
|
||||||
schedule_state = fields.Selection(related='production_id.schedule_state', store=True)
|
schedule_state = fields.Selection(related='production_id.schedule_state', store=True)
|
||||||
# 工件装夹信息
|
# 工件装夹信息
|
||||||
|
|||||||
Reference in New Issue
Block a user