From 9d3c4f8163cabb2e325a79073c03b7aff7662b76 Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Fri, 19 Jul 2024 09:17:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=94=E5=B7=A5=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/mrp_production.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py index a39b58eb..0f4cec78 100644 --- a/sf_manufacturing/models/mrp_production.py +++ b/sf_manufacturing/models/mrp_production.py @@ -745,14 +745,18 @@ class MrpProduction(models.Model): # 返工 def button_rework(self): - cloud_programming = None + is_reprogramming = False if self.programming_state == '已编程' and self.reprogramming_num >= 0: cloud_programming = self._cron_get_programming_state() if self.reprogramming_num == 0: self.reprogramming_num = cloud_programming['reprogramming_num'] logging.info('cloud_programming_state:%s' % cloud_programming['programming_state']) logging.info('programming_state:%s' % self.programming_state) + if cloud_programming is None: + if self.reprogramming_num > 1: + is_reprogramming = False + return { 'name': _('返工'), 'type': 'ir.actions.act_window', @@ -762,8 +766,7 @@ class MrpProduction(models.Model): 'context': { 'default_production_id': self.id, 'default_reprogramming_num': self.reprogramming_num, - 'default_programming_state': self.programming_state if cloud_programming[ - 'programming_state'] is None else + 'default_programming_state': self.programming_state if cloud_programming is None else cloud_programming['programming_state'], 'default_is_reprogramming': False if (cloud_programming['programming_state'] in ['编程中', '待编程'] and self.programming_state in [