1、取消质量检查页面根据指令检查自动筛选;2、修改送检按钮隐藏条件;3、优化工单后置三元检测page页显示时,检测结果选择返工时制造订单没有生成检测结果记录问题
This commit is contained in:
@@ -1254,7 +1254,7 @@ class ResMrpWorkOrder(models.Model):
|
||||
record.production_id.process_state = '待加工'
|
||||
# 生成工件配送单
|
||||
record.workpiece_delivery_ids = record._json_workpiece_delivery_list()
|
||||
if record.routing_type == 'CNC加工':
|
||||
if record.routing_type == 'CNC加工' or record.individuation_page_PTD is True:
|
||||
record.process_state = '待解除装夹'
|
||||
# record.write({'process_state': '待加工'})
|
||||
record.production_id.process_state = '待解除装夹'
|
||||
@@ -1345,17 +1345,18 @@ class ResMrpWorkOrder(models.Model):
|
||||
# record.production_id.state = 'done'
|
||||
|
||||
# ============工单完成,修改对应[质检单]的值=====================
|
||||
if record.check_ids:
|
||||
if record.check_ids.filtered(lambda qc: qc.quality_state in ('waiting', 'none')):
|
||||
check_ids = record.check_ids.filtered(lambda qc: qc.quality_state in ('waiting', 'none'))
|
||||
if record.test_results == '合格':
|
||||
record.check_ids.write({'test_results': None})
|
||||
for check_id in record.check_ids:
|
||||
check_ids.write({'test_results': None})
|
||||
for check_id in check_ids:
|
||||
check_id.do_pass()
|
||||
elif record.test_results in ('返工', '报废'):
|
||||
record.check_ids.write({
|
||||
check_ids.write({
|
||||
'test_results': record.test_results,
|
||||
'reason': record.reason,
|
||||
'detailed_reason': record.detailed_reason})
|
||||
for check_id in record.check_ids:
|
||||
for check_id in check_ids:
|
||||
check_id.do_fail()
|
||||
# ======================================================
|
||||
|
||||
|
||||
Reference in New Issue
Block a user