From cc40d479a9d3225db40b67d4e4552ac997208a24 Mon Sep 17 00:00:00 2001 From: guanhuan Date: Thu, 17 Oct 2024 17:20:51 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E7=B2=BE=E5=BA=A6?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/models/common.py | 8 +++++ sf_base/views/base_view.xml | 2 ++ sf_mrs_connect/models/res_config_setting.py | 2 ++ sf_mrs_connect/models/sync_common.py | 35 +++++++++++++++++++++ 4 files changed, 47 insertions(+) diff --git a/sf_base/models/common.py b/sf_base/models/common.py index 95572631..6c0cfc28 100644 --- a/sf_base/models/common.py +++ b/sf_base/models/common.py @@ -187,3 +187,11 @@ class MrsMaterialApply(models.Model): name = fields.Char('名称', default=True) active = fields.Boolean('有效', default=True) + + +class MachiningAccuracy(models.Model): + _name = 'sf.machining.accuracy' + _description = '加工精度' + name = fields.Char('精度名称', index=True) + discount = fields.Float('折扣') + sync_id = fields.Char('同步ID') diff --git a/sf_base/views/base_view.xml b/sf_base/views/base_view.xml index 8127efb7..841e3467 100644 --- a/sf_base/views/base_view.xml +++ b/sf_base/views/base_view.xml @@ -614,4 +614,6 @@ sf.machine.control_system tree + + #------------------加工精度------------------ \ No newline at end of file diff --git a/sf_mrs_connect/models/res_config_setting.py b/sf_mrs_connect/models/res_config_setting.py index 6ec49f74..5243ccb2 100644 --- a/sf_mrs_connect/models/res_config_setting.py +++ b/sf_mrs_connect/models/res_config_setting.py @@ -84,6 +84,8 @@ class ResConfigSettings(models.TransientModel): _logger.info("同步刀具物料切削速度完成") self.env['sf.feed.per.tooth'].sync_all_feed_per_tooth() _logger.info("同步刀具物料每齿走刀量完成") + self.env['sf.machining.accuracy'].sync_machining_accuracy_all() + _logger.info("同步加工精度完成") except Exception as e: _logger.info("sf_all_sync error: %s" % e) diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py index 615c69a0..75938068 100644 --- a/sf_mrs_connect/models/sync_common.py +++ b/sf_mrs_connect/models/sync_common.py @@ -74,6 +74,8 @@ class MrStaticResourceDataSync(models.Model): _logger.info("同步刀具物料切削速度完成") self.env['sf.feed.per.tooth'].sync_feed_per_tooth_yesterday() _logger.info("同步刀具物料每齿走刀量完成") + self.env['sf.machining.accuracy'].sync_machining_accuracy_all() + _logger.info("同步加工精度完成") except Exception as e: traceback_error = traceback.format_exc() logging.error("同步静态资源库失败:%s" % traceback_error) @@ -3133,3 +3135,36 @@ class CuttingToolBasicParameters(models.Model): }) else: raise ValidationError("刀具物料基本参数认证未通过") + + +class MachiningAccuracySync(models.Model): + _inherit = 'sf.machining.accuracy' + _description = '加工精度' + url = '/api/machining_accuracy/list' + + def sync_machining_accuracy_all(self): + config = self.env['res.config.settings'].get_values() + headers = Common.get_headers(self, config['token'], config['sf_secret_key']) + strUrl = config['sf_url'] + self.url + r = requests.post(strUrl, json={}, data=None, headers=headers) + r = r.json() + result = json.loads(r['result']) + _logger.info('加工精度:%s' % result) + if result['status'] == 1: + machining_accuracy_all_list = result['machining_accuracy_all_list'] + # 获取同步的id集合 + ids = [obj['id'] for obj in machining_accuracy_all_list] + self.env['sf.machining.accuracy'].sudo().search( + [('sync_id', 'not in', ids)]).unlink() + for time in machining_accuracy_all_list: + machining_accuracy = self.env['sf.machining.accuracy'].sudo().search( + [('sync_id', '=', time['id'])]) + if machining_accuracy: + machining_accuracy.name = time['name'] + machining_accuracy.discount = time['discount'] + else: + self.env['sf.machining.accuracy'].sudo().create({ + "sync_id": time['id'], + "name": time['name'], + "discount": time['discount'], + }) From 00a04af94f0a8ed2a4868d725e122daa84b25cd7 Mon Sep 17 00:00:00 2001 From: guanhuan Date: Fri, 18 Oct 2024 09:30:20 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E7=B2=BE=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/models/base.py | 8 ++++++++ sf_base/models/common.py | 8 -------- sf_base/security/ir.model.access.csv | 4 ++++ sf_base/views/base_view.xml | 17 +++++++++++++++++ sf_base/views/menu_view.xml | 8 +++++++- 5 files changed, 36 insertions(+), 9 deletions(-) diff --git a/sf_base/models/base.py b/sf_base/models/base.py index c3152098..b257feb8 100644 --- a/sf_base/models/base.py +++ b/sf_base/models/base.py @@ -394,3 +394,11 @@ class MachineToolCategory(models.Model): active = fields.Boolean('有效', default=True) category = fields.Selection([('shukong', u'数控'), ('putong', u'普通')], string=u'机床类别', default='shukong') + + +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 diff --git a/sf_base/models/common.py b/sf_base/models/common.py index 6c0cfc28..95572631 100644 --- a/sf_base/models/common.py +++ b/sf_base/models/common.py @@ -187,11 +187,3 @@ class MrsMaterialApply(models.Model): name = fields.Char('名称', default=True) active = fields.Boolean('有效', default=True) - - -class MachiningAccuracy(models.Model): - _name = 'sf.machining.accuracy' - _description = '加工精度' - name = fields.Char('精度名称', index=True) - discount = fields.Float('折扣') - sync_id = fields.Char('同步ID') diff --git a/sf_base/security/ir.model.access.csv b/sf_base/security/ir.model.access.csv index 3d4ba3a0..34605cca 100644 --- a/sf_base/security/ir.model.access.csv +++ b/sf_base/security/ir.model.access.csv @@ -247,3 +247,7 @@ access_sf_cutting_tool_type_group_sf_stock_manager,sf_cutting_tool_type_group_sf access_sf_cutting_tool_material_group_plan_dispatch,sf_cutting_tool_material_group_plan_dispatch,model_sf_cutting_tool_material,sf_base.group_plan_dispatch,1,0,0,0 access_sf_functional_cutting_tool_model_group_plan_dispatch,sf_functional_cutting_tool_model_group_plan_dispatch,model_sf_functional_cutting_tool_model,sf_base.group_plan_dispatch,1,0,0,0 access_sf_cutting_tool_type_group_plan_dispatch,sf_cutting_tool_type_group_plan_dispatch,model_sf_cutting_tool_type,sf_base.group_plan_dispatch,1,0,0,0 + + +access_sf_machining_accuracy,sf_machining_accuracy,model_sf_machining_accuracy,base.group_user,1,0,0,0 +access_sf_machining_accuracy_admin,sf_machining_accuracy_admin,model_sf_machining_accuracy,base.group_system,1,0,0,0 diff --git a/sf_base/views/base_view.xml b/sf_base/views/base_view.xml index 841e3467..bea75a4f 100644 --- a/sf_base/views/base_view.xml +++ b/sf_base/views/base_view.xml @@ -616,4 +616,21 @@ #------------------加工精度------------------ + + tree.sf.machining.accuracy + sf.machining.accuracy + + + + + + + + + + 加工精度 + ir.actions.act_window + sf.machining.accuracy + tree + \ No newline at end of file diff --git a/sf_base/views/menu_view.xml b/sf_base/views/menu_view.xml index 21bb519d..4c662976 100644 --- a/sf_base/views/menu_view.xml +++ b/sf_base/views/menu_view.xml @@ -141,12 +141,18 @@ sequence="1" action="action_sf_machine_brand"/> + From 7157ea15870d5dc50f6b0ce95bf1557948826d4d Mon Sep 17 00:00:00 2001 From: guanhuan Date: Tue, 22 Oct 2024 15:35:34 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E7=B2=BE=E5=BA=A6?= =?UTF-8?q?=E5=90=8C=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'], From 8661dd16c1b2084c8a85fff0b6f74ab6c31a02bc Mon Sep 17 00:00:00 2001 From: guanhuan Date: Tue, 22 Oct 2024 15:37:41 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E7=B2=BE=E5=BA=A6?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/models/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sf_base/models/base.py b/sf_base/models/base.py index 6c01fc48..3d83cc96 100644 --- a/sf_base/models/base.py +++ b/sf_base/models/base.py @@ -399,6 +399,6 @@ class MachineToolCategory(models.Model): class MachiningAccuracy(models.Model): _name = 'sf.machining.accuracy' _description = '加工精度' - name = fields.Char('精度名称', index=True) + name = fields.Char('一般公差', index=True) standard_tolerance = fields.Char(string="标准公差") sync_id = fields.Char('同步ID') From 3fe8c957be816d4a8f269efef03eb88bb3049c4a Mon Sep 17 00:00:00 2001 From: liaodanlong Date: Wed, 23 Oct 2024 10:41:32 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E7=B2=BE=E5=BA=A6?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- quality/i18n/zh_CN.po | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/quality/i18n/zh_CN.po b/quality/i18n/zh_CN.po index 267c0196..84e781d7 100644 --- a/quality/i18n/zh_CN.po +++ b/quality/i18n/zh_CN.po @@ -1050,3 +1050,7 @@ msgstr "工作中心故障" #: model:ir.model.fields,field_description:quality.field_quality_point_test_type__active msgid "active" msgstr "有效" + +#: quality.point.test_type(name) +msgid "Instructions" +msgstr "指令" \ No newline at end of file From 3b1caca62b3d1b5f48b0b77934c1391b2b9cee10 Mon Sep 17 00:00:00 2001 From: liaodanlong Date: Wed, 23 Oct 2024 11:00:19 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- quality/i18n/zh_CN.po | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/quality/i18n/zh_CN.po b/quality/i18n/zh_CN.po index 84e781d7..544bcba2 100644 --- a/quality/i18n/zh_CN.po +++ b/quality/i18n/zh_CN.po @@ -1049,8 +1049,4 @@ msgstr "工作中心故障" #. module: quality #: model:ir.model.fields,field_description:quality.field_quality_point_test_type__active msgid "active" -msgstr "有效" - -#: quality.point.test_type(name) -msgid "Instructions" -msgstr "指令" \ No newline at end of file +msgstr "有效" \ No newline at end of file