jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整下发更新进行中状态的制造订单

Browse Source
This commit is contained in:
mgw
2025-01-15 09:34:09 +08:00
parent 61e08f20c7
commit 4b6fd72237
1 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
sf_mrs_connect/controllers/controllers.py
View File

@@ -29,7 +29,7 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
if ret['manufacturing_type'] in ('scrap', 'invalid_tool_rework', 'rework'): if ret['manufacturing_type'] in ('scrap', 'invalid_tool_rework', 'rework'):
domain += [('state', 'not in', ['done', 'scrap', 'cancel'])] domain += [('state', 'not in', ['done', 'scrap', 'cancel'])]
else: else:
domain += [('state', 'in', ['confirmed', 'pending_cam'])] domain += [('state', 'in', ['confirmed', 'pending_cam', 'progress'])]
productions = request.env['mrp.production'].with_user( productions = request.env['mrp.production'].with_user(
request.env.ref("base.user_admin")).search(domain) request.env.ref("base.user_admin")).search(domain)
productions_technology_to_confirmed = request.env['mrp.production'].with_user( 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_record_ids_obj = None
correct_production_id = None correct_production_id = None
rework_record_ids_obj = None # rework_record_ids_obj = None
rework_production_id = None # rework_production_id = None
scrap_record_ids_obj = None # scrap_record_ids_obj = None
scrap_production_id = None # scrap_production_id = None
for production in productions: for production in productions:
logging.info('production====:%s' % production.name) logging.info('production====:%s' % production.name)
record_ids_obj = production.programming_record_ids.filtered( 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('已创建返工的编程记录:%s' % production.name)
logging.info('rework_record_ids_obj====:%s' % rework_record_ids_obj) logging.info('rework_record_ids_obj====:%s' % rework_record_ids_obj)
rework_production_id = production.id # rework_production_id = production.id
logging.info('rework_production_id====:%s' % rework_production_id) # logging.info('rework_production_id====:%s' % rework_production_id)
elif ret['manufacturing_type'] == 'scrap': elif ret['manufacturing_type'] == 'scrap':
production.programming_record_ids.create({ production.programming_record_ids.create({
'number': len(production.programming_record_ids) + 1, 'number': len(production.programming_record_ids) + 1,
@@ -224,23 +224,23 @@ class Sf_Mrs_Connect(http.Controller, MultiInheritController):
}) })
logging.info('已创建正确的制造订单的编程记录:%s' % production.name) logging.info('已创建正确的制造订单的编程记录:%s' % production.name)
if rework_record_ids_obj: # if rework_record_ids_obj:
logging.info('rework_record_ids_obj====:%s' % rework_record_ids_obj) # logging.info('rework_record_ids_obj====:%s' % rework_record_ids_obj)
if production.id == rework_production_id: # if production.id == rework_production_id:
continue # continue
else: # else:
logging.info('创建返工的制造订单的编程记录') # logging.info('创建返工的制造订单的编程记录')
production.programming_record_ids.create({ # production.programming_record_ids.create({
'number': len(production.programming_record_ids) + 1, # 'number': len(production.programming_record_ids) + 1,
'production_id': production.id, # 'production_id': production.id,
'reason': rework_record_ids_obj.reason, # 'reason': rework_record_ids_obj.reason,
'programming_method': rework_record_ids_obj.programming_method, # 'programming_method': rework_record_ids_obj.programming_method,
'current_programming_count': rework_record_ids_obj.current_programming_count, # 'current_programming_count': rework_record_ids_obj.current_programming_count,
'target_production_id': rework_record_ids_obj.target_production_id, # 'target_production_id': rework_record_ids_obj.target_production_id,
'apply_time': rework_record_ids_obj.apply_time, # 'apply_time': rework_record_ids_obj.apply_time,
'send_time': rework_record_ids_obj.send_time, # 'send_time': rework_record_ids_obj.send_time,
}) # })
logging.info('已创建返工的制造订单的编程记录:%s' % production.name) # logging.info('已创建返工的制造订单的编程记录:%s' % production.name)
res.update({ res.update({
'production_ids': productions.ids 'production_ids': productions.ids