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

优化工单状态

Browse Source
This commit is contained in:
yuxianghui
2024-07-31 14:59:57 +08:00
parent ffb775abb7
commit 5f7f905540
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sf_manufacturing/models/mrp_production.py
View File

@@ -687,9 +687,6 @@ class MrpProduction(models.Model):
for work_id in work_ids: for work_id in work_ids:
if panel_sequence_list.get(work_id.name): if panel_sequence_list.get(work_id.name):
work_id.sequence = panel_sequence_list[work_id.name] work_id.sequence = panel_sequence_list[work_id.name]
if rec.tool_state in ['1', '2']:
rec.workorder_ids.filtered(
lambda a: a.routing_type == '装夹预调' and a.state in 'ready').compute_state()
# 创建工单并进行排序 # 创建工单并进行排序
def _create_workorder(self, item): def _create_workorder(self, item):

6
sf_manufacturing/models/mrp_workorder.py
View File

@@ -953,6 +953,9 @@ class ResMrpWorkOrder(models.Model):
elif workorder.production_id.reservation_state != 'assigned': elif workorder.production_id.reservation_state != 'assigned':
workorder.state = 'waiting' workorder.state = 'waiting'
continue continue
if workorder.production_id.tool_state in ['1', '2'] and workorder.state == 'ready':
workorder.state = 'waiting'
continue
logging.info('工序:%s' % workorder.sequence) logging.info('工序:%s' % workorder.sequence)
logging.info('工单最终状态:%s' % workorder.state) logging.info('工单最终状态:%s' % workorder.state)
@@ -988,9 +991,6 @@ class ResMrpWorkOrder(models.Model):
# elif workorder.production_id.reservation_state != 'assigned' and workorder.state == 'ready': # elif workorder.production_id.reservation_state != 'assigned' and workorder.state == 'ready':
# workorder.state = 'waiting' # workorder.state = 'waiting'
def compute_state(self):
self._compute_state()
# 重写工单开始按钮方法 # 重写工单开始按钮方法
def button_start(self): def button_start(self):
if self.routing_type == '装夹预调': if self.routing_type == '装夹预调':