diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py index d650d865..33795920 100644 --- a/sf_manufacturing/models/mrp_production.py +++ b/sf_manufacturing/models/mrp_production.py @@ -836,7 +836,8 @@ class MrpProduction(models.Model): if not pending_workorder.cnc_ids: production.get_new_program(rework_item.processing_panel) # production.write({'state': 'progress', 'programming_state': '已编程', 'is_rework': False}) - productions_not_delivered.write({'programming_state': '已编程', 'is_rework': False}) + productions_not_delivered.write( + {'state': 'progress', 'programming_state': '已编程', 'is_rework': False}) # 从cloud获取重新编程过的最新程序 def get_new_program(self, processing_panel): diff --git a/sf_tool_management/models/mrp_workorder.py b/sf_tool_management/models/mrp_workorder.py index 465d3ea6..0a1a6447 100644 --- a/sf_tool_management/models/mrp_workorder.py +++ b/sf_tool_management/models/mrp_workorder.py @@ -38,7 +38,7 @@ class CNCprocessing(models.Model): datas = {'缺刀': {}, '无效刀': {}} # 缺刀/无效刀集 for cnc_processing in cnc_processing_ids: # ======创建字典: {'缺刀': {'制造订单1': {'加工面1': [], ...}, ...}, '无效刀': {'制造订单1': {'加工面1': [], ...}, ...}}====== - production_name = cnc_processing.production_id.name # 制造订单 + production_name = cnc_processing.workorder_id.production_id.name # 制造订单 processing_panel = cnc_processing.workorder_id.processing_panel # 加工面 if production_name not in list(datas['缺刀'].keys()): datas['缺刀'].update({production_name: {processing_panel: []}})