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

优化制造订单报废流程，返工流程暂停（需求需重新设计）

Browse Source
This commit is contained in:
jinling.yang
2024-05-23 11:46:09 +08:00
parent 57b264b84d
commit 5f42b5d056
5 changed files with 106 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sf_manufacturing/models/mrp_production.py
View File

@@ -315,7 +315,7 @@ class MrpProduction(models.Model):
production.fetchCNC(', '.join(product_id_to_production_names[production.product_id.id]))
else:
production.write({'programming_no': production_programming.programming_no,
'programming_state': '编程中'})
'programming_state': '已编程' if production_programming.programming_state == '已编程' else '编程中'})
# # 根据加工面板的面数及对应的工序模板生成工单
i = 0
processing_panel_len = len(production.product_id.model_processing_panel.split(','))
@@ -411,15 +411,10 @@ class MrpProduction(models.Model):
cnc_back_workorder = rec.workorder_ids.filtered(lambda wo: wo.name == "CNC加工(返工)")
for work in rec.workorder_ids:
if work.name == cnc_workorder.name and work.processing_panel == k:
cnc_back_workorder.write({'sequence': work.sequence + 1, 'state': 'ready', 'cnc_ids': work.cnc_ids,
'cmm_ids': work.cmm_ids})
cnc_back_workorder.write({'sequence': work.sequence + 1})
print(cnc_back_workorder.sequence)
elif work.routing_type not in ['装夹预调'] and work != cnc_back_workorder:
work.sequence += 1
print(work.sequence)
if work.routing_type == '解除装夹':
work.write({'state': 'pending'})
print(work.state)
# 在制造订单上新增工单
def _create_workorder1(self, k):