From 22a1ae11a6b6c882e12f9fd1990dfdd02d212690 Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Fri, 26 Jul 2024 16:52:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=94=E5=B7=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/mrp_production.py | 4 ++++ sf_manufacturing/wizard/rework_wizard.py | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py index 0bbda373..6eff353d 100644 --- a/sf_manufacturing/models/mrp_production.py +++ b/sf_manufacturing/models/mrp_production.py @@ -902,6 +902,10 @@ class MrpProduction(models.Model): if pre_workorder: pre_workorder.write( {'processing_drawing': base64.b64encode(open(panel_file_path, 'rb').read())}) + # if production.state == 'rework' and production.programming_state == '已编程未下发': + # production.write( + # {'state': 'progress', 'programming_state': '已编程', 'is_rework': False}) + # logging.info('返工含有已编程未下发的程序更新完成:%s' % production.name) logging.info('更新程序完成:%s' % production.name) else: diff --git a/sf_manufacturing/wizard/rework_wizard.py b/sf_manufacturing/wizard/rework_wizard.py index bf1224fb..a52c5093 100644 --- a/sf_manufacturing/wizard/rework_wizard.py +++ b/sf_manufacturing/wizard/rework_wizard.py @@ -165,6 +165,13 @@ class ReworkWizard(models.TransientModel): {'programming_state': '编程中', 'work_state': '编程中'}) if self.production_id.state == 'progress': self.production_id.write({'programming_state': '已编程', 'work_state': '已编程'}) + if self.reprogramming_num >= 1 and self.programming_state == '已编程': + productions_not_delivered = self.env['mrp.production'].search( + [('programming_no', '=', self.production_id.programming_no), + ('programming_state', '=', '已编程未下发')]) + if productions_not_delivered: + productions_not_delivered.write( + {'programming_state': '已编程', 'work_state': '已编程', 'is_rework': False}) @api.onchange('production_id') def onchange_processing_panel_id(self):