调整下发更新进行中状态的制造订单
This commit is contained in:
@@ -29,7 +29,7 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
|
||||
if ret['manufacturing_type'] in ('scrap', 'invalid_tool_rework', 'rework'):
|
||||
domain += [('state', 'not in', ['done', 'scrap', 'cancel'])]
|
||||
else:
|
||||
domain += [('state', 'in', ['confirmed', 'pending_cam'])]
|
||||
domain += [('state', 'in', ['confirmed', 'pending_cam', 'progress'])]
|
||||
productions = request.env['mrp.production'].with_user(
|
||||
request.env.ref("base.user_admin")).search(domain)
|
||||
productions_technology_to_confirmed = request.env['mrp.production'].with_user(
|
||||
@@ -118,10 +118,10 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
|
||||
# 更新编程记录
|
||||
correct_record_ids_obj = None
|
||||
correct_production_id = None
|
||||
rework_record_ids_obj = None
|
||||
rework_production_id = None
|
||||
scrap_record_ids_obj = None
|
||||
scrap_production_id = None
|
||||
# rework_record_ids_obj = None
|
||||
# rework_production_id = None
|
||||
# scrap_record_ids_obj = None
|
||||
# scrap_production_id = None
|
||||
for production in productions:
|
||||
logging.info('production====:%s' % production.name)
|
||||
record_ids_obj = production.programming_record_ids.filtered(
|
||||
@@ -174,8 +174,8 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
|
||||
})
|
||||
logging.info('已创建返工的编程记录:%s' % production.name)
|
||||
logging.info('rework_record_ids_obj====:%s' % rework_record_ids_obj)
|
||||
rework_production_id = production.id
|
||||
logging.info('rework_production_id====:%s' % rework_production_id)
|
||||
# rework_production_id = production.id
|
||||
# logging.info('rework_production_id====:%s' % rework_production_id)
|
||||
elif ret['manufacturing_type'] == 'scrap':
|
||||
production.programming_record_ids.create({
|
||||
'number': len(production.programming_record_ids) + 1,
|
||||
@@ -224,23 +224,23 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
|
||||
})
|
||||
logging.info('已创建正确的制造订单的编程记录:%s' % production.name)
|
||||
|
||||
if rework_record_ids_obj:
|
||||
logging.info('rework_record_ids_obj====:%s' % rework_record_ids_obj)
|
||||
if production.id == rework_production_id:
|
||||
continue
|
||||
else:
|
||||
logging.info('创建返工的制造订单的编程记录')
|
||||
production.programming_record_ids.create({
|
||||
'number': len(production.programming_record_ids) + 1,
|
||||
'production_id': production.id,
|
||||
'reason': rework_record_ids_obj.reason,
|
||||
'programming_method': rework_record_ids_obj.programming_method,
|
||||
'current_programming_count': rework_record_ids_obj.current_programming_count,
|
||||
'target_production_id': rework_record_ids_obj.target_production_id,
|
||||
'apply_time': rework_record_ids_obj.apply_time,
|
||||
'send_time': rework_record_ids_obj.send_time,
|
||||
})
|
||||
logging.info('已创建返工的制造订单的编程记录:%s' % production.name)
|
||||
# if rework_record_ids_obj:
|
||||
# logging.info('rework_record_ids_obj====:%s' % rework_record_ids_obj)
|
||||
# if production.id == rework_production_id:
|
||||
# continue
|
||||
# else:
|
||||
# logging.info('创建返工的制造订单的编程记录')
|
||||
# production.programming_record_ids.create({
|
||||
# 'number': len(production.programming_record_ids) + 1,
|
||||
# 'production_id': production.id,
|
||||
# 'reason': rework_record_ids_obj.reason,
|
||||
# 'programming_method': rework_record_ids_obj.programming_method,
|
||||
# 'current_programming_count': rework_record_ids_obj.current_programming_count,
|
||||
# 'target_production_id': rework_record_ids_obj.target_production_id,
|
||||
# 'apply_time': rework_record_ids_obj.apply_time,
|
||||
# 'send_time': rework_record_ids_obj.send_time,
|
||||
# })
|
||||
# logging.info('已创建返工的制造订单的编程记录:%s' % production.name)
|
||||
|
||||
res.update({
|
||||
'production_ids': productions.ids
|
||||
|
||||
Reference in New Issue
Block a user