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

Merge branch 'feature/工单-质检优化_2' into feature/工单-质检优化_3

Browse Source
This commit is contained in:
yuxianghui
2025-01-14 15:08:42 +08:00
parent deff14b4d3 eae310ddad
commit b433c6423b
3 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sf_manufacturing/models/mrp_workorder.py
View File

@@ -1270,13 +1270,14 @@ class ResMrpWorkOrder(models.Model):
# 生成工件配送单
record.workpiece_delivery_ids = record._json_workpiece_delivery_list()
if record.routing_type == 'CNC加工' or record.individuation_page_PTD is True:
record.process_state = '待解除装夹'
# record.write({'process_state': '待加工'})
record.production_id.process_state = '待解除装夹'
self.env['sf.production.plan'].sudo().search([('name', '=', record.production_id.name)]).write({
'state': 'finished',
'actual_end_time': datetime.now()
})
if record.routing_type == 'CNC加工':
record.process_state = '待解除装夹'
# record.write({'process_state': '待加工'})
record.production_id.process_state = '待解除装夹'
self.env['sf.production.plan'].sudo().search([('name', '=', record.production_id.name)]).write({
'state': 'finished',
'actual_end_time': datetime.now()
})
record.production_id.write({'detection_result_ids': [(0, 0, {
'rework_reason': record.reason,
'detailed_reason': record.detailed_reason,
@@ -1365,7 +1366,7 @@ class ResMrpWorkOrder(models.Model):
if record.check_ids.filtered(lambda qc: qc.quality_state in ('waiting', 'none')):
check_ids = record.check_ids.filtered(lambda qc: qc.quality_state in ('waiting', 'none'))
if record.test_results == '合格':
check_ids.write({'test_results': None})
check_ids.write({'test_results': record.test_results})
for check_id in check_ids:
check_id.do_pass()
elif record.test_results in ('返工', '报废'):