From e70a91d1ec394bb13a94abf2f4dfb9f45126969d Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Mon, 26 Feb 2024 17:07:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9A=E6=97=B6=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=9C=BA=E5=BA=8A=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/views/base_view.xml | 2 + sf_maintenance/models/sf_maintenance.py | 3 +- sf_maintenance/views/maintenance_views.xml | 72 +- sf_mrs_connect/models/sync_common.py | 1234 ++++++++++---------- 4 files changed, 670 insertions(+), 641 deletions(-) diff --git a/sf_base/views/base_view.xml b/sf_base/views/base_view.xml index 3c4b0618..ca3aba53 100644 --- a/sf_base/views/base_view.xml +++ b/sf_base/views/base_view.xml @@ -98,6 +98,7 @@ + @@ -122,6 +123,7 @@ domain="[('tag_ids', '=', '机床')]" options="{'no_create': True}"/> + diff --git a/sf_maintenance/models/sf_maintenance.py b/sf_maintenance/models/sf_maintenance.py index a99dd363..3e802c9f 100644 --- a/sf_maintenance/models/sf_maintenance.py +++ b/sf_maintenance/models/sf_maintenance.py @@ -566,7 +566,8 @@ class SfMaintenanceEquipment(models.Model): 'tool_perimeter_diameter_max': item.tool_perimeter_diameter_max, 'T_tool_time': item.T_tool_time, 'C_tool_time': item.C_tool_time, - 'jiancheng': item.category_id.equipment_type_code + 'jiancheng': item.category_id.equipment_type_code, + 'function_type': item.function_type, } machine_tool_list.append(val) # kw = machine_tool_list diff --git a/sf_maintenance/views/maintenance_views.xml b/sf_maintenance/views/maintenance_views.xml index 125a86c0..f9d909b3 100644 --- a/sf_maintenance/views/maintenance_views.xml +++ b/sf_maintenance/views/maintenance_views.xml @@ -56,7 +56,9 @@ + + @@ -167,7 +169,31 @@ options="{'format': false}"/> - + + + + + + + + + + + + + + + + + + + + + + +