质检报告优化
This commit is contained in:
@@ -206,7 +206,15 @@ class QualityCheck(models.Model):
|
|||||||
('NG', 'NG')
|
('NG', 'NG')
|
||||||
], string='出厂检验报告结果', default='OK')
|
], string='出厂检验报告结果', default='OK')
|
||||||
measure_operator = fields.Many2one('res.users', string='操机员')
|
measure_operator = fields.Many2one('res.users', string='操机员')
|
||||||
quality_manager = fields.Many2one('res.users', string='质检员')
|
quality_manager = fields.Many2one('res.users', string='质检员', compute='_compute_quality_manager', store=True)
|
||||||
|
|
||||||
|
@api.depends('measure_line_ids')
|
||||||
|
def _compute_quality_manager(self):
|
||||||
|
for record in self:
|
||||||
|
if record.measure_line_ids:
|
||||||
|
record.quality_manager = record.env.user.id
|
||||||
|
else:
|
||||||
|
record.quality_manager = False
|
||||||
|
|
||||||
# 流水号(从1开始,最大99)
|
# 流水号(从1开始,最大99)
|
||||||
serial_number = fields.Integer('流水号', default=1, readonly=True)
|
serial_number = fields.Integer('流水号', default=1, readonly=True)
|
||||||
@@ -336,7 +344,6 @@ class QualityCheck(models.Model):
|
|||||||
|
|
||||||
# 7. 更新其他信息
|
# 7. 更新其他信息
|
||||||
self.serial_number += 1
|
self.serial_number += 1
|
||||||
self.quality_manager = self.env.user.id
|
|
||||||
|
|
||||||
if self.publish_status == 'canceled' and self.picking_id.state == 'done':
|
if self.publish_status == 'canceled' and self.picking_id.state == 'done':
|
||||||
self.upload_factory_report()
|
self.upload_factory_report()
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
<field name="model">quality.check.measure.line</field>
|
<field name="model">quality.check.measure.line</field>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<tree editable="bottom" class="measureTable">
|
<tree editable="bottom" class="measureTable">
|
||||||
<field name="sequence" class="measureTableSequence"/>
|
<!-- <field name="sequence" class="measureTableSequence"/> -->
|
||||||
<!-- <field name="column_nums"/> -->
|
<!-- <field name="column_nums"/> -->
|
||||||
<field name="measure_item"/>
|
<field name="measure_item"/>
|
||||||
<field name="measure_value1" attrs="{ 'column_invisible': [('parent.column_nums', '<', 1)] }"/>
|
<field name="measure_value1" attrs="{ 'column_invisible': [('parent.column_nums', '<', 1)] }"/>
|
||||||
|
|||||||
@@ -68,7 +68,7 @@
|
|||||||
<t t-call="sf_quality.report_quality_header"/>
|
<t t-call="sf_quality.report_quality_header"/>
|
||||||
|
|
||||||
|
|
||||||
<div class="page" style="min-height: 800px; position: relative; padding-bottom: 150px;">
|
<div class="page" style="min-height: 800px; position: relative; padding-bottom: 250px;">
|
||||||
|
|
||||||
<table class="table table-sm o_main_table mt-4" style="border: 1px solid black;">
|
<table class="table table-sm o_main_table mt-4" style="border: 1px solid black;">
|
||||||
<tr>
|
<tr>
|
||||||
|
|||||||
Reference in New Issue
Block a user