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

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺外协

Browse Source
This commit is contained in:
jinling.yang
2024-05-12 21:33:57 +08:00
parent 9dccee84c4 97ce5d81c8
commit e916e4e155
8 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sf_manufacturing/models/mrp_workorder.py
View File

@@ -827,8 +827,8 @@ class ResMrpWorkOrder(models.Model):
else:
if self.date_planned_start > start_date:
vals['date_planned_start'] = start_date
if self.date_planned_finished and self.date_planned_finished < start_date:
vals['date_planned_finished'] = start_date
# if self.date_planned_finished and self.date_planned_finished < start_date:
# vals['date_planned_finished'] = start_date
return self.write(vals)
else:
raise UserError(_('请先完成上一步工单'))
@@ -875,7 +875,11 @@ class ResMrpWorkOrder(models.Model):
'state': 'draft',
'order_line': order_line_ids,
})
tem_date_planned_finished = record.date_planned_finished
super().button_finish()
record.write({
'date_planned_finished': tem_date_planned_finished # 保持原值
})
is_production_id = True
for workorder in record.production_id.workorder_ids:
if workorder.state != 'done':