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

Accept Merge Request #1273: (feature/工单优化_2 -> develop)

Browse Source 
Merge Request: 电解电镀-电解电镀

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1273
This commit is contained in:
禹翔辉
2024-08-29 19:25:22 +08:00
committed by Coding
parent 0d253c54c8 9ce1963d44
commit 52befb6233
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sf_manufacturing/models/mrp_production.py
View File

@@ -664,7 +664,7 @@ class MrpProduction(models.Model):
# 表面工艺工序 # 表面工艺工序
# 模型类型的表面工艺工序模版 # 模型类型的表面工艺工序模版
surface_tmpl_ids = model_type_id.surface_technics_routing_tmpl_ids surface_tmpl_ids = model_type_id.surface_technics_routing_tmpl_ids
# 产品选择的表面工艺 # 产品选择的表面工艺参数
model_process_parameters_ids = rec.product_id.model_process_parameters_ids model_process_parameters_ids = rec.product_id.model_process_parameters_ids
process_dict = {} process_dict = {}
if model_process_parameters_ids: if model_process_parameters_ids:
@@ -673,7 +673,7 @@ class MrpProduction(models.Model):
for surface_tmpl_id in surface_tmpl_ids: for surface_tmpl_id in surface_tmpl_ids:
if process_id == surface_tmpl_id.route_workcenter_id.surface_technics_id: if process_id == surface_tmpl_id.route_workcenter_id.surface_technics_id:
surface_tmpl_name = surface_tmpl_id.route_workcenter_id.name surface_tmpl_name = surface_tmpl_id.route_workcenter_id.name
process_dict.update({int(process_id.category_id.code): '%s-%s' % ( process_dict.update({int(process_id.code): '%s-%s' % (
surface_tmpl_name, process_parameters_id.name)}) surface_tmpl_name, process_parameters_id.name)})
process_list = sorted(process_dict.keys()) process_list = sorted(process_dict.keys())
for process_num in process_list: for process_num in process_list:
@@ -693,8 +693,6 @@ class MrpProduction(models.Model):
logging.info('sequence_list: %s' % sequence_list) logging.info('sequence_list: %s' % sequence_list)
for work in rec.workorder_ids: for work in rec.workorder_ids:
work_name = work.name work_name = work.name
if '-' in work_name:
work_name = work_name.split('-')[0]
logging.info(work_name) logging.info(work_name)
if sequence_list.get(work_name): if sequence_list.get(work_name):
work.sequence = sequence_list[work_name] work.sequence = sequence_list[work_name]
@@ -728,8 +726,6 @@ class MrpProduction(models.Model):
panel_sequence_list.update({tmpl_id.route_workcenter_id.name: sequence_max}) panel_sequence_list.update({tmpl_id.route_workcenter_id.name: sequence_max})
for work_id in work_ids: for work_id in work_ids:
work_name = work_id.name work_name = work_id.name
if '-' in work_name:
work_name = work_name.split('-')[0]
if panel_sequence_list.get(work_name): if panel_sequence_list.get(work_name):
work_id.sequence = panel_sequence_list[work_name] work_id.sequence = panel_sequence_list[work_name]