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

修复返工按钮

Browse Source
This commit is contained in:
jinling.yang
2024-07-19 09:17:35 +08:00
parent 08831812ae
commit 9d3c4f8163
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sf_manufacturing/models/mrp_production.py
View File

@@ -745,14 +745,18 @@ class MrpProduction(models.Model):
# 返工 # 返工
def button_rework(self): def button_rework(self):
cloud_programming = None cloud_programming = None
is_reprogramming = False
if self.programming_state == '已编程' and self.reprogramming_num >= 0: if self.programming_state == '已编程' and self.reprogramming_num >= 0:
cloud_programming = self._cron_get_programming_state() cloud_programming = self._cron_get_programming_state()
if self.reprogramming_num == 0: if self.reprogramming_num == 0:
self.reprogramming_num = cloud_programming['reprogramming_num'] self.reprogramming_num = cloud_programming['reprogramming_num']
logging.info('cloud_programming_state:%s' % cloud_programming['programming_state']) logging.info('cloud_programming_state:%s' % cloud_programming['programming_state'])
logging.info('programming_state:%s' % self.programming_state) logging.info('programming_state:%s' % self.programming_state)
if cloud_programming is None:
if self.reprogramming_num > 1:
is_reprogramming = False
return { return {
'name': _('返工'), 'name': _('返工'),
'type': 'ir.actions.act_window', 'type': 'ir.actions.act_window',
@@ -762,8 +766,7 @@ class MrpProduction(models.Model):
'context': { 'context': {
'default_production_id': self.id, 'default_production_id': self.id,
'default_reprogramming_num': self.reprogramming_num, 'default_reprogramming_num': self.reprogramming_num,
'default_programming_state': self.programming_state if cloud_programming[ 'default_programming_state': self.programming_state if cloud_programming is None else
'programming_state'] is None else
cloud_programming['programming_state'], cloud_programming['programming_state'],
'default_is_reprogramming': False if (cloud_programming['programming_state'] in ['编程中', 'default_is_reprogramming': False if (cloud_programming['programming_state'] in ['编程中',
'待编程'] and self.programming_state in [ '待编程'] and self.programming_state in [