From 561b5152420aa0f04795cacd3f10dae680885f67 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 17 Mar 2025 09:12:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=95=B0=E6=8D=AE=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 quality_control/models/quality.py       | 10 +++++-----
 sf_quality/views/quality_check_view.xml |  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/quality_control/models/quality.py b/quality_control/models/quality.py
index de67a092..81f4da8d 100644
--- a/quality_control/models/quality.py
+++ b/quality_control/models/quality.py
@@ -157,7 +157,7 @@ class QualityCheck(models.Model):
                 record.total_qty = ''
 
     # 检验数
-    check_qty = fields.Char('检验数', default=lambda self: self._get_default_check_qty())
+    check_qty = fields.Integer('检验数', default=lambda self: self._get_default_check_qty())
 
     def _get_default_check_qty(self):
         """根据条件设置检验数的默认值"""
@@ -173,9 +173,9 @@ class QualityCheck(models.Model):
     def _onchange_check_qty(self):
         """当测试类型或测量对象变化时，更新检验数"""
         if self.measure_on == 'product' and self.test_type_id.name == '出厂检验报告':
-            self.check_qty = ''
+            self.check_qty = 0
         elif self.measure_on == 'product':
-            self.check_qty = '1'
+            self.check_qty = 1
 
     # 出厂检验报告编号
     report_number_id = fields.Many2one('documents.document', string='出厂检验报告编号', readonly=True)
@@ -364,9 +364,9 @@ class QualityCheck(models.Model):
                 raise UserError(_('请先输入检验数'))
             if not record.total_qty:
                 raise UserError(_('总数量不能为空'))
-            if int(record.check_qty) <= int(record.total_qty):
+            if record.check_qty <= int(record.total_qty):
                 raise UserError(_('检验数不可超过总数量'))
-            if int(record.column_nums) >= int(record.check_qty):
+            if record.column_nums >= record.check_qty:
                 raise UserError(_('测量件数不可超过检验数'))
 
     def do_cancel_publish(self):
diff --git a/sf_quality/views/quality_check_view.xml b/sf_quality/views/quality_check_view.xml
index 886056d4..56b67457 100644
--- a/sf_quality/views/quality_check_view.xml
+++ b/sf_quality/views/quality_check_view.xml
@@ -81,6 +81,8 @@
 <!--                         type="action"/> -->
 <!--                 <button name="do_preview" string="预览" type="object" class="btn-primary" attrs="{'invisible': [('is_out_check', '=', False)]}"/> -->
                 <button name="do_publish" string="发布" type="object" class="btn-primary" attrs="{'invisible': ['|', ('is_out_check', '=', False), ('publish_status', '!=', 'draft')]}"/>
+<!--                 <button name="get_report_url" string="ceshi" type="object" class="btn-primary"/> -->
+<!--                 <button name="upload_factory_report" string="upload_factory_report" type="object" class="btn-primary"/> -->
                 <button name="do_cancel_publish" string="取消发布" type="object" class="btn-primary" attrs="{'invisible': ['|',('is_out_check', '=', False), ('publish_status', '!=', 'published')]}"/>
                 <button name="do_re_publish" string="重新发布" type="object" class="btn-primary" attrs="{'invisible': ['|', ('is_out_check', '=', False), ('publish_status', '!=', 'canceled')]}"/>
             </xpath>