From 7157ea15870d5dc50f6b0ce95bf1557948826d4d Mon Sep 17 00:00:00 2001 From: guanhuan Date: Tue, 22 Oct 2024 15:35:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E7=B2=BE=E5=BA=A6=E5=90=8C?= =?UTF-8?q?=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/models/base.py | 4 ++-- sf_base/views/base_view.xml | 4 ++-- sf_mrs_connect/models/sync_common.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sf_base/models/base.py b/sf_base/models/base.py index b257feb8..6c01fc48 100644 --- a/sf_base/models/base.py +++ b/sf_base/models/base.py @@ -400,5 +400,5 @@ class MachiningAccuracy(models.Model): _name = 'sf.machining.accuracy' _description = '加工精度' name = fields.Char('精度名称', index=True) - discount = fields.Float('折扣') - sync_id = fields.Char('同步ID') \ No newline at end of file + standard_tolerance = fields.Char(string="标准公差") + sync_id = fields.Char('同步ID') diff --git a/sf_base/views/base_view.xml b/sf_base/views/base_view.xml index bea75a4f..eb2c1571 100644 --- a/sf_base/views/base_view.xml +++ b/sf_base/views/base_view.xml @@ -620,9 +620,9 @@ tree.sf.machining.accuracy sf.machining.accuracy - + - + diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py index 75938068..ae1930c6 100644 --- a/sf_mrs_connect/models/sync_common.py +++ b/sf_mrs_connect/models/sync_common.py @@ -3161,7 +3161,7 @@ class MachiningAccuracySync(models.Model): [('sync_id', '=', time['id'])]) if machining_accuracy: machining_accuracy.name = time['name'] - machining_accuracy.discount = time['discount'] + machining_accuracy.standard_tolerance = time['standard_tolerance'] else: self.env['sf.machining.accuracy'].sudo().create({ "sync_id": time['id'],