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

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

Browse Source
This commit is contained in:
yuxianghui
2025-01-13 15:08:04 +08:00
parent 29a6102620 186dca4618
commit 3de86cf538
5 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sf_manufacturing/models/mrp_production.py
View File

@@ -1726,7 +1726,12 @@ class sf_detection_result(models.Model):
processing_panel = fields.Char('加工面')
routing_type = fields.Selection([
('装夹预调', '装夹预调'),
('CNC加工', 'CNC加工')], string="工序类型")
('CNC加工', 'CNC加工'),
('解除装夹', '解除装夹'),
('切割', '切割'),
('表面工艺', '表面工艺'),
('线切割', '线切割'),
('人工线下加工', '人工线下加工')], string="工序类型")
rework_reason = fields.Selection(
[("programming", "编程"), ("cutter", "刀具"), ("clamping", "装夹"),

13
sf_manufacturing/models/mrp_workorder.py
View File

@@ -1267,7 +1267,7 @@ class ResMrpWorkOrder(models.Model):
record.production_id.process_state = '待加工'
# 生成工件配送单
record.workpiece_delivery_ids = record._json_workpiece_delivery_list()
if record.routing_type == 'CNC加工':
if record.routing_type == 'CNC加工' or record.individuation_page_PTD is True:
record.process_state = '待解除装夹'
# record.write({'process_state': '待加工'})
record.production_id.process_state = '待解除装夹'
@@ -1358,17 +1358,18 @@ class ResMrpWorkOrder(models.Model):
# record.production_id.state = 'done'
# ============工单完成,修改对应[质检单]的值=====================
if record.check_ids:
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 == '合格':
record.check_ids.write({'test_results': None})
for check_id in record.check_ids:
check_ids.write({'test_results': None})
for check_id in check_ids:
check_id.do_pass()
elif record.test_results in ('返工', '报废'):
record.check_ids.write({
check_ids.write({
'test_results': record.test_results,
'reason': record.reason,
'detailed_reason': record.detailed_reason})
for check_id in record.check_ids:
for check_id in check_ids:
check_id.do_fail()
# ======================================================