From de1bdbe18b11e3816d882deadea4201457b66b38 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Wed, 12 Mar 2025 09:08:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=86=E5=A4=87=E5=89=8D=E7=AB=AF=E5=BC=80?=
=?UTF-8?q?=E5=8F=91=E7=94=A8=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
quality_control/models/quality.py | 32 +++++++++++--------
.../views/quality.check.measures.line.xml | 2 +-
quality_control/views/quality_views.xml | 1 +
3 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/quality_control/models/quality.py b/quality_control/models/quality.py
index b1efad6c..1af23aff 100644
--- a/quality_control/models/quality.py
+++ b/quality_control/models/quality.py
@@ -147,14 +147,22 @@ class QualityCheck(models.Model):
measure_line_ids = fields.One2many('quality.check.measure.line', 'check_id', string='测量明细')
def add_measure_line(self):
- '''
+ """
新增测量值,如果测量值有5列了,则提示“最多只能有5列测量值”
- '''
- self.ensure_one()
- self.env['quality.check.measure.line'].create({
- 'check_id': self.id,
- 'sequence': len(self.measure_line_ids) + 1,
- })
+ """
+ pass
+ # self.ensure_one()
+ # self.env['quality.check.measure.line'].create({
+ # 'check_id': self.id,
+ # 'sequence': len(self.measure_line_ids) + 1,
+ # })
+
+ def remove_measure_line(self):
+ """
+ 删除测量值
+ """
+ pass
+ # self.ensure_one()
@depends('product_id')
def _compute_part_name_number(self):
@@ -579,12 +587,12 @@ class QualityCheckMeasureLine(models.Model):
sequence = fields.Integer('序号')
check_id = fields.Many2one('quality.check', string='质检单', required=True, ondelete='cascade')
-
+
# 基本信息
product_name = fields.Char('产品名称', related='check_id.product_id.name', readonly=True)
drawing_no = fields.Char('图号')
measure_item = fields.Char('检测项目')
-
+
# 测量值
measure_value1 = fields.Char('测量值1')
measure_value2 = fields.Char('测量值2')
@@ -594,17 +602,15 @@ class QualityCheckMeasureLine(models.Model):
# 展示列数
show_colomn_number = fields.Integer('展示列数', default=1)
-
+
# 判定结果
measure_result = fields.Selection([
('OK', 'OK'),
('NG', 'NG')
], string='判定', default='OK')
-
+
remark = fields.Char('备注')
def del_measure_value(self):
self.ensure_one()
self.sudo().unlink()
-
-
\ No newline at end of file
diff --git a/quality_control/views/quality.check.measures.line.xml b/quality_control/views/quality.check.measures.line.xml
index b0c603df..c0e3be04 100644
--- a/quality_control/views/quality.check.measures.line.xml
+++ b/quality_control/views/quality.check.measures.line.xml
@@ -14,7 +14,7 @@
-
+
diff --git a/quality_control/views/quality_views.xml b/quality_control/views/quality_views.xml
index e1ea819b..fe198f4a 100644
--- a/quality_control/views/quality_views.xml
+++ b/quality_control/views/quality_views.xml
@@ -328,6 +328,7 @@
+