From 642007d29b25d077b483584961ba2883f26845cd Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 21 Aug 2023 17:20:52 +0800
Subject: [PATCH 1/8] =?UTF-8?q?cnc=E5=B7=A5=E5=8D=95=E5=A4=84=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0NC=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=B7=B2=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_machine_connect/__manifest__.py        |  5 +-
 sf_machine_connect/models/ftp_client.py   | 78 +++++++++++++++++++----
 sf_machine_connect/views/compensation.xml |  3 +
 3 files changed, 70 insertions(+), 16 deletions(-)

diff --git a/sf_machine_connect/__manifest__.py b/sf_machine_connect/__manifest__.py
index 9642c087..92a4548e 100644
--- a/sf_machine_connect/__manifest__.py
+++ b/sf_machine_connect/__manifest__.py
@@ -22,11 +22,10 @@
         'views/ftp_button.xml',
 
         'views/compensation.xml',
-
-        'views/SfWorkOrderBarcodes.xml',
+        # 'views/SfWorkOrderBarcodes.xml',
         'views/WorkCenterBarcodes.xml',
         'views/Stock_picking_Barcodes.xml',
-        'views/machine_monitor.xml',
+        # 'views/machine_monitor.xml',
         'views/machine_info_present.xml',
         'views/delivery_record.xml',
         'views/res_config_settings_views.xml',
diff --git a/sf_machine_connect/models/ftp_client.py b/sf_machine_connect/models/ftp_client.py
index f782d6d4..cc4d60e2 100644
--- a/sf_machine_connect/models/ftp_client.py
+++ b/sf_machine_connect/models/ftp_client.py
@@ -13,6 +13,11 @@ from odoo.exceptions import ValidationError
 from odoo.exceptions import UserError
 from odoo.addons.sf_machine_connect.models import py2opcua, ftp_operate
 
+import shutil
+from io import BytesIO
+from zipfile import ZipFile
+from odoo.exceptions import MissingError
+
 _logger = logging.getLogger(__name__)
 
 
@@ -537,21 +542,69 @@ class WorkCenterBarcode(models.Model):
         else:
             return False
 
+    def cnc_file_download(self):
+        """
+        一个下载当前cnc所有nc文件为一个zip包的功能
+        """
+        self.ensure_one()
 
-class CuttingTimeToolType(models.Model):
-    _inherit = 'sf.cutting_tool.type'
-    total_cut_time = fields.Char(string='总切削时长')
-    predict_life_time = fields.Char(string='预估寿命')
-    # 只能看到未被占用的刀位，或者有提示说占没占用
-    tool_position = fields.Char(string='选择刀位')
-    # cnc_ids = fields.One2many(string='选择机床')
-    is_connect_tool_position = fields.Boolean(string='是否已绑定刀位', default=False)
+        # 如果没有附件，直接返回
+        if not self.cnc_ids:
+            return
 
-    def tool_connect_machine(self):
-        pass
+        # 处理第一个附件的文件名
+        first_attachment = self.cnc_ids[0].cnc_id
+        file_name = first_attachment.display_name.split('-')[0] + '.zip'
 
-    def tool_unconnect_machine(self):
-        pass
+        # 创建一个内存文件和一个zip文件
+        memory_file = BytesIO()
+        with ZipFile(memory_file, 'w') as zipf:
+            # 遍历需要下载的附件
+            for item in self.cnc_ids:
+                a = item.cnc_id
+                datas = base64.standard_b64decode(a.datas)
+
+                # 将nc文件写入zip文件
+                zipf.writestr(a.display_name, datas)
+
+        # 然后可以创建一个ir.attachment对象，将生成的zip文件保存为一个新的附件
+        memory_file.seek(0)
+        output = base64.b64encode(memory_file.read())
+        memory_file.close()
+
+        attachment_data = {
+            'name': file_name,
+            'type': 'binary',
+            'res_model': self._name,
+            'res_id': self.id,
+            'datas': output
+        }
+        attachment = self.env['ir.attachment'].create(attachment_data)
+
+        # 返回附件的下载链接
+        download_url = '/web/content/%s?download=true' % attachment.id
+        base_url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
+        return {
+            'type': 'ir.actions.act_url',
+            'url': str(base_url) + download_url,
+            'target': 'self',
+        }
+
+
+# class CuttingTimeToolType(models.Model):
+#     _inherit = 'sf.cutting_tool.type'
+#     total_cut_time = fields.Char(string='总切削时长')
+#     predict_life_time = fields.Char(string='预估寿命')
+#     # 只能看到未被占用的刀位，或者有提示说占没占用
+#     tool_position = fields.Char(string='选择刀位')
+#     # cnc_ids = fields.One2many(string='选择机床')
+#     is_connect_tool_position = fields.Boolean(string='是否已绑定刀位', default=False)
+#
+#     def tool_connect_machine(self):
+#         pass
+#
+#     def tool_unconnect_machine(self):
+#         pass
 
 
 class DeliveryRecord(models.Model):
@@ -579,4 +632,3 @@ class DeliveryRecord(models.Model):
     #         return super().create(values)
     #     except:
     #         raise Exception('b_purchase_order.py:create()')
-
diff --git a/sf_machine_connect/views/compensation.xml b/sf_machine_connect/views/compensation.xml
index a6f47b23..5ec6f382 100644
--- a/sf_machine_connect/views/compensation.xml
+++ b/sf_machine_connect/views/compensation.xml
@@ -5,6 +5,9 @@
         <field name="model">mrp.workorder</field>
         <field name="inherit_id" ref="sf_manufacturing.view_mrp_production_workorder_tray_form_inherit_sf"/>
         <field name="arch" type="xml">
+            <xpath expr="//header" position="inside">
+                <button string="程序下载" name="cnc_file_download" type="object" class="oe_highlight"/>
+            </xpath>
                 <xpath expr="//page//field[@name='cnc_ids']" position="before">
                     <group>
                         <group>

From 76293f5cca2c2d91ccc2bc9aebb835f76786ef32 Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Mon, 21 Aug 2023 17:22:53 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=B4=E4=BF=9Dtable?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_maintenance/views/maintenance_request_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sf_maintenance/views/maintenance_request_views.xml b/sf_maintenance/views/maintenance_request_views.xml
index c942deac..39c82384 100644
--- a/sf_maintenance/views/maintenance_request_views.xml
+++ b/sf_maintenance/views/maintenance_request_views.xml
@@ -21,7 +21,7 @@
                 <notebook>
                     <page string="维保标准" attrs="{'invisible': [('equipment_maintenance_id', '=', False)]}">
                             <field name="maintenance_standards" widget="ony2many">
-                                <tree create="False">
+                                <tree editable="bottom">
                                     <field name="name"/>
                                     <field name="maintenance_standards"/>
                                 </tree>

From e781bce27e1d4dc43195f9e6e5813eb8f4ac1ea6 Mon Sep 17 00:00:00 2001
From: yuxianghui <1608204036@qq.com>
Date: Tue, 22 Aug 2023 11:40:35 +0800
Subject: [PATCH 3/8] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E4=BA=86?=
 =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E8=AE=BE=E5=A4=87=E8=B5=84=E6=BA=90=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E5=92=8C=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=8E=86=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E7=95=8C=E9=9D=A2=E5=B8=83=E5=B1=80=EF=BC=9B=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=8E=86=E3=80=81=E7=8F=AD?=
 =?UTF-8?q?=E6=AC=A1=E3=80=81=E4=BC=91=E6=81=AF=E6=97=A5=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E7=9A=84form=E8=A7=86=E5=9B=BE=EF=BC=8C=E6=96=B0=E5=A2=9Etree?=
 =?UTF-8?q?=E8=A7=86=E5=9B=BE=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD=EF=BC=9B?=
 =?UTF-8?q?2=E3=80=81=E4=BF=AE=E5=A4=8D=E4=BA=A7=E7=BA=BF=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E8=B5=84=E6=BA=90=E8=AE=BE=E7=BD=AE=E7=9A=84=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=BA=86=E6=9C=BA=E5=8F=B0=E5=8F=B7?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0=EF=BC=9B3=E3=80=81?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=8E=86=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E7=8F=AD=E6=AC=A1=E5=AD=97=E6=AE=B5=E5=BF=85=E5=A1=AB?=
 =?UTF-8?q?=EF=BC=9B4=E3=80=81=E8=B0=83=E6=95=B4=E4=BA=A7=E7=BA=BF?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E8=B5=84=E6=BA=90=E8=AE=BE=E7=BD=AE=E5=92=8C?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=8E=86=E8=AE=BE=E7=BD=AE=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_plan_management/models/base.py           |   8 +-
 sf_plan_management/models/calendar_base.py  |   4 +-
 sf_plan_management/views/menu_view.xml      |  14 +-
 sf_plan_management/views/plan_base_view.xml | 216 ++++++++++----------
 4 files changed, 121 insertions(+), 121 deletions(-)

diff --git a/sf_plan_management/models/base.py b/sf_plan_management/models/base.py
index 801c5eb4..097401ad 100644
--- a/sf_plan_management/models/base.py
+++ b/sf_plan_management/models/base.py
@@ -8,7 +8,7 @@ class ProcedureEquipmentResourceSetting(models.Model):
 
     name = fields.Many2one('sf.production.line', string='生产线', required=True)
     work_center_name_id = fields.Many2one('mrp.workcenter', string='工作中心名称')
-    equipment_code = fields.Char(string='机台号(原设备编码)', readonly=True, compute='_onchange_equipment_name_id')
+    equipment_code = fields.Char(string='机台号', readonly=True, compute='_onchange_equipment_name_id')
     equipment_name_id = fields.Many2one('maintenance.equipment',
                                         string='设备名称',
                                         readonly=True,
@@ -41,9 +41,9 @@ class ProcedureEquipmentResourceSetting(models.Model):
     @api.onchange('equipment_name_id')
     def _onchange_equipment_name_id(self):
         for record in self:
-            record.equipment_code = record.equipment_name_id.code,
-            record.brand = record.equipment_name_id.brand_id.name,
-            record.model = record.equipment_name_id.type_id.name,
+            record.equipment_code = record.equipment_name_id.code
+            record.brand = record.equipment_name_id.brand_id.name
+            record.model = record.equipment_name_id.type_id.name
             record.status = record.equipment_name_id.state
 
     @api.depends('working_calendar_id')
diff --git a/sf_plan_management/models/calendar_base.py b/sf_plan_management/models/calendar_base.py
index 5b86e6dd..b783f8b7 100644
--- a/sf_plan_management/models/calendar_base.py
+++ b/sf_plan_management/models/calendar_base.py
@@ -26,14 +26,14 @@ class WorkLogSetting(models.Model):
     code = fields.Char(string='序号', default=_get_code)
     name = fields.Char(string='工作日历名称', required=True, size=15, length=30)
 
-    working_shift_ids = fields.Many2many('sf.working.shift', string='班次')
+    working_shift_ids = fields.Many2many('sf.working.shift', string='班次', required=True)
     start_time = fields.Datetime(string='日开始时间', readonly=True, compute='_compute_working_shift_ids')
     end_time = fields.Datetime(string='日结束时间', readonly=True, compute='_compute_working_shift_ids')
     duration = fields.Char(string='时长', readonly=True, compute='_compute_working_shift_ids')
 
     day_off_ids = fields.Many2many('sf.day.off', string='休息日', required=True)
 
-    status = fields.Boolean(string='状态', default=True)
+    status = fields.Selection([('正常', '正常'), ('禁用', '禁用')], string='状态', default='正常')
     update_person = fields.Char(string='更新人', default=lambda self: self.env.user.name)
     update_time = fields.Datetime(string='更新时间', default=lambda self: fields.Datetime.now())
 
diff --git a/sf_plan_management/views/menu_view.xml b/sf_plan_management/views/menu_view.xml
index d0c7dc87..6817e30c 100644
--- a/sf_plan_management/views/menu_view.xml
+++ b/sf_plan_management/views/menu_view.xml
@@ -7,20 +7,20 @@
               sequence="599"
     />
 
-    <menuitem id="menu_sf_work_log_setting"
-              name="工作日历设置"
-              parent="menu_sf_basic_setting"
-              action="sf_work_log_setting_act"
-              sequence="0"
-    />
-
     <menuitem id="menu_sf_procedure_equipment_resource_setting"
               name="产线设备资源设置"
               parent="menu_sf_basic_setting"
               action="sf_procedure_equipment_resource_setting_act"
+              sequence="0"
+    />
+    <menuitem id="menu_sf_work_log_setting"
+              name="工作日历设置"
+              parent="menu_sf_basic_setting"
+              action="sf_work_log_setting_act"
               sequence="10"
     />
 
+
     <menuitem id="menu_sf_working_shift"
               name="班次"
               parent="menu_sf_basic_setting"
diff --git a/sf_plan_management/views/plan_base_view.xml b/sf_plan_management/views/plan_base_view.xml
index e3e92d40..8cd6c450 100644
--- a/sf_plan_management/views/plan_base_view.xml
+++ b/sf_plan_management/views/plan_base_view.xml
@@ -5,14 +5,14 @@
         <field name="name">工作日历设置</field>
         <field name="model">sf.work.log.setting</field>
         <field name="arch" type="xml">
-            <tree>
+            <tree string="工作日历设置">
                 <field name="code"/>
                 <field name="name"/>
-                <field name="start_time"/>
-                <field name="end_time"/>
-                <field name="duration"/>
                 <field name="day_off_ids" widget="many2many_tags"/>
                 <field name="working_shift_ids" widget="many2many_tags"/>
+                <field name="start_time" optional="hide"/>
+                <field name="end_time" optional="hide"/>
+                <field name="duration" optional="hide"/>
                 <field name="status"/>
                 <field name="update_person"/>
                 <field name="update_time"/>
@@ -30,38 +30,39 @@
         <field name="model">sf.work.log.setting</field>
         <field name="arch" type="xml">
             <form>
+                <header>
+                    <button string="查看日历"
+                        type="object"
+                        name="open_work_schedule_calendar"
+                        class="oe_highlight"
+                />
+                     <field name="status" widget="statusbar" statusbar_visible="正常,禁用"/>
+                </header>
                 <sheet string-="工作日历设置">
-                    <group string="基础信息">
-                        <group>
+                    <div class="oe_title">
+                        <h1>
                             <field name="name"/>
-                        </group>
-                        <group>
-                            <field name="code"/>
-                        </group>
-                    </group>
-                    <group string="选择班次">
-                        <field name="working_shift_ids"/>
-                    </group>
-                    <group string="工作时间">
-                        <group>
-                            <field name="start_time"/>
-                        </group>
-                        <group>
-                            <field name="end_time"/>
-                        </group>
-                    </group>
+                        </h1>
+                    </div>
                     <group>
                         <group>
-                            <field name="duration"/>
-                            <field name="day_off_ids"
-                                   widget="many2many_tags"
+                            <field name="code"/>
+                            <field name="day_off_ids" widget="many2many_tags"
                                    options="{'no_create': True, 'no_quick_create': True}"/>
+                            <field name="status"/>
+                        </group>
+                        <group string="工作时间">
+                            <field name="start_time"/>
+                            <field name="end_time"/>
+                            <field name="duration"/>
                         </group>
                     </group>
-                    <group string="日历状态">
-                        <field name="status"/>
-                        <field name="setting_to_calendar_ids" invisible="True"/>
-                    </group>
+                    <notebook>
+                        <page string="选择班次">
+                            <field name="working_shift_ids"/>
+                        </page>
+                    </notebook>
+                    <field name="setting_to_calendar_ids" invisible="True"/>
                 </sheet>
             </form>
         </field>
@@ -79,7 +80,7 @@
         <field name="name">休息日</field>
         <field name="model">sf.day.off</field>
         <field name="arch" type="xml">
-            <tree>
+            <tree string="休息日" editable="bottom" delete="0">
                 <field name="name"/>
             </tree>
         </field>
@@ -88,7 +89,7 @@
     <record id="sf_day_off_act" model="ir.actions.act_window">
         <field name="name">休息日</field>
         <field name="res_model">sf.day.off</field>
-        <field name="view_mode">tree,form</field>
+        <field name="view_mode">tree</field>
     </record>
 
 
@@ -97,7 +98,7 @@
         <field name="name">班次</field>
         <field name="model">sf.working.shift</field>
         <field name="arch" type="xml">
-            <tree>
+            <tree string="班次" editable="bottom" >
                 <field name="code"/>
                 <field name="name"/>
                 <field name="start_time"/>
@@ -107,32 +108,32 @@
         </field>
     </record>
 
-    <record id="sf_working_shift_form" model="ir.ui.view">
-        <field name="name">班次</field>
-        <field name="model">sf.working.shift</field>
-        <field name="arch" type="xml">
-            <form>
-                <sheet>
-                    <group>
-                        <group>
-                            <field name="name"/>
-                            <field name="start_time"/>
-                            <field name="end_time"/>
-                            <field name="remark"/>
-                        </group>
-                        <group>
-                            <field name="code"/>
-                        </group>
-                    </group>
-                </sheet>
-            </form>
-        </field>
-    </record>
+<!--    <record id="sf_working_shift_form" model="ir.ui.view">-->
+<!--        <field name="name">班次</field>-->
+<!--        <field name="model">sf.working.shift</field>-->
+<!--        <field name="arch" type="xml">-->
+<!--            <form>-->
+<!--                <sheet>-->
+<!--                    <group>-->
+<!--                        <group>-->
+<!--                            <field name="name"/>-->
+<!--                            <field name="start_time"/>-->
+<!--                            <field name="end_time"/>-->
+<!--                            <field name="remark"/>-->
+<!--                        </group>-->
+<!--                        <group>-->
+<!--                            <field name="code"/>-->
+<!--                        </group>-->
+<!--                    </group>-->
+<!--                </sheet>-->
+<!--            </form>-->
+<!--        </field>-->
+<!--    </record>-->
 
     <record id="sf_working_shift_act" model="ir.actions.act_window">
         <field name="name">班次</field>
         <field name="res_model">sf.working.shift</field>
-        <field name="view_mode">tree,form</field>
+        <field name="view_mode">tree</field>
     </record>
 
 
@@ -141,34 +142,35 @@
         <field name="name">工作日历</field>
         <field name="model">sf.work.schedule.calendar</field>
         <field name="arch" type="xml">
-            <tree>
-                <field name="name_id" invisible="True"/>
+            <tree string="工作日历" editable="bottom">
+                <field name="calendar_code"/>
                 <field name="name"/>
+                <field name="name_id"/>
                 <field name="date_time"/>
             </tree>
         </field>
     </record>
 
-    <record id="sf_work_schedule_calendar_form" model="ir.ui.view">
-        <field name="name">工作日历</field>
-        <field name="model">sf.work.schedule.calendar</field>
-        <field name="arch" type="xml">
-            <form>
-                <sheet>
-                    <group string="日历基本信息">
-                        <group>
-                            <field name="name"/>
-                            <field name="date_time"/>
-                        </group>
-                        <group>
-                            <field name="name_id"/>
-                            <field name="calendar_code"/>
-                        </group>
-                    </group>
-                </sheet>
-            </form>
-        </field>
-    </record>
+<!--    <record id="sf_work_schedule_calendar_form" model="ir.ui.view">-->
+<!--        <field name="name">工作日历</field>-->
+<!--        <field name="model">sf.work.schedule.calendar</field>-->
+<!--        <field name="arch" type="xml">-->
+<!--            <form>-->
+<!--                <sheet>-->
+<!--                    <group string="日历基本信息">-->
+<!--                        <group>-->
+<!--                            <field name="name"/>-->
+<!--                            <field name="date_time"/>-->
+<!--                        </group>-->
+<!--                        <group>-->
+<!--                            <field name="name_id"/>-->
+<!--                            <field name="calendar_code"/>-->
+<!--                        </group>-->
+<!--                    </group>-->
+<!--                </sheet>-->
+<!--            </form>-->
+<!--        </field>-->
+<!--    </record>-->
 
     <record id="sf_work_schedule_calendar_search" model="ir.ui.view">
         <field name="name">工作日历</field>
@@ -196,7 +198,7 @@
     <record id="sf_work_schedule_calendar_act" model="ir.actions.act_window">
         <field name="name">工作日历</field>
         <field name="res_model">sf.work.schedule.calendar</field>
-        <field name="view_mode">calendar,search,tree,form</field>
+        <field name="view_mode">calendar,search,tree</field>
     </record>
 
 
@@ -207,15 +209,15 @@
         <field name="arch" type="xml">
             <tree string="产线设备资源设置">
                 <field name="work_center_name_id"/>
-                <field name="equipment_code"/>
                 <field name="equipment_name_id"/>
-                <field name="brand"/>
-                <field name="model"/>
+                <field name="equipment_code"/>
+                <field name="brand" optional="hide"/>
+                <field name="model" optional="hide"/>
                 <field name="working_procedure"/>
-                <field name="production_capacity"/>
-                <field name="working_calendar_id"/>
-                <field name="working_shift_id" widget="many2many_tags"/>
-                <field name="create_time"/>
+                <field name="production_capacity" optional="hide"/>
+                <field name="working_calendar_id" optional="hide"/>
+                <field name="working_shift_id" widget="many2many_tags" optional="hide"/>
+                <field name="create_time" optional="hide"/>
                 <field name="status"/>
                 <field name="participate_in_scheduling"/>
                 <field name="name" invisible="True"/>
@@ -229,41 +231,39 @@
         <field name="arch" type="xml">
             <form string="产线设备资源设置">
                 <sheet>
-                    <group string="生产线">
-                        <group>
+                    <div>
+                        <h1>
                             <field name="name"/>
-                        </group>
-                    </group>
-                    <group string="工作中心信息">
+                        </h1>
+                    </div>
+                    <group>
                         <group>
                             <field name="work_center_name_id"/>
                             <field name="production_capacity"/>
-                        </group>
-                        <group>
-                            <field name="working_procedure"/>
-                            <field name="participate_in_scheduling"/>
-                        </group>
-                    </group>
-                    <group string="设备信息">`
-                        <group>
-                            <field name="equipment_name_id"/>
-                            <field name="brand"/>
-                            <field name="status"/>
-                        </group>
-                        <group>
-                            <field name="equipment_code" string="机台号"/>
-                            <field name="model"/>
-                        </group>
-                    </group>
-                    <group string="工作日历信息">
-                        <group>
                             <field name="working_calendar_id"/>
                             <field name="create_time"/>
                         </group>
                         <group>
+                            <field name="working_procedure"/>
+                            <field name="participate_in_scheduling"/>
                             <field name="working_shift_id" widget="many2many_tags"/>
                         </group>
                     </group>
+                    <notebook>
+                        <page string="设备信息">
+                            <group>`
+                                <group>
+                                    <field name="equipment_name_id"/>
+                                    <field name="brand"/>
+                                    <field name="status"/>
+                                </group>
+                                <group>
+                                    <field name="equipment_code" string="机台号"/>
+                                    <field name="model"/>
+                                </group>
+                            </group>
+                        </page>
+                    </notebook>
                 </sheet>
             </form>
         </field>

From cd33fb9fb9862281108513e9fc8883c2304b3246 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Wed, 23 Aug 2023 10:09:47 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E5=A4=B9=E5=85=B7=E5=9E=8B=E5=8F=B7?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/models/base.py               |  7 +++++++
 sf_base/models/fixture.py            |  5 +++++
 sf_mrs_connect/models/sync_common.py | 19 +++++++++++--------
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/sf_base/models/base.py b/sf_base/models/base.py
index bb225b9b..02c569ba 100644
--- a/sf_base/models/base.py
+++ b/sf_base/models/base.py
@@ -308,6 +308,13 @@ class MachineToolType(models.Model):
     active = fields.Boolean('有效', default=True)
     code = fields.Char('编码')
 
+    def _get_ids(self, machine_tool_type_code):
+        machine_tool_type_ids = []
+        for item in machine_tool_type_code:
+            machine_tool_type = self.search([('code', '=', item)])
+            machine_tool_type_ids.append(machine_tool_type.id)
+        return [(6, 0, machine_tool_type_ids)]
+
 
 class MachineToolCategory(models.Model):
     _name = 'sf.machine_tool.category'
diff --git a/sf_base/models/fixture.py b/sf_base/models/fixture.py
index db22b8d6..727f58bc 100644
--- a/sf_base/models/fixture.py
+++ b/sf_base/models/fixture.py
@@ -53,5 +53,10 @@ class FixtureModel(models.Model):
     screw_size = fields.Integer(string="螺牙大小[mm]", size=6)
     active = fields.Boolean('有效', default=True)
 
+    # @api.model
+    # def create(self, vals):
+    #     obj = super(FixtureModel, self).create(vals)
+    #     return obj
+
 
 
diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py
index 6c2003ff..892a2eed 100644
--- a/sf_mrs_connect/models/sync_common.py
+++ b/sf_mrs_connect/models/sync_common.py
@@ -1519,10 +1519,11 @@ class SyncFixtureModel(models.Model):
                                 "materials_model_id": self.env['sf.materials.model'].search(
                                     [('materials_no', '=', item['materials_model_code'])]).id,
                                 "driving_way": item['driving_way'],
-                                "apply_machine_tool_type_id": self.env['sf.machine_tool.type'].search(
-                                    [('code', '=', item['apply_machine_tool_type_code'])]).id,
+                                "apply_machine_tool_type_ids": self.env['sf.machine_tool.type'].sudo()._get_ids(
+                                    item['apply_machine_tool_type_code']).id,
                                 "through_hole_size": item['through_hole_size'],
                                 "screw_size": item['screw_size'],
+                                "active": item['active'],
                             })
                         else:
                             fixture_model.write({
@@ -1548,10 +1549,11 @@ class SyncFixtureModel(models.Model):
                                 "materials_model_id": self.env['sf.materials.model'].search(
                                     [('materials_no', '=', item['materials_model_code'])]).id,
                                 "driving_way": item['driving_way'],
-                                "apply_machine_tool_type_id": self.env['sf.machine_tool.type'].search(
-                                    [('code', '=', item['apply_machine_tool_type_code'])]).id,
+                                "apply_machine_tool_type_ids": self.env['sf.machine_tool.type'].sudo()._get_ids(
+                                    item['apply_machine_tool_type_code']).id,
                                 "through_hole_size": item['through_hole_size'],
                                 "screw_size": item['screw_size'],
+                                "active": item['active'],
                             })
         else:
             raise ValidationError("认证未通过")
@@ -1599,10 +1601,11 @@ class SyncFixtureModel(models.Model):
                                 "materials_model_id": self.env['sf.materials.model'].search(
                                     [('materials_no', '=', item['materials_model_code'])]).id,
                                 "driving_way": item['driving_way'],
-                                "apply_machine_tool_type_id": self.env['sf.machine_tool.type'].search(
-                                    [('code', '=', item['apply_machine_tool_type_code'])]).id,
+                                "apply_machine_tool_type_ids": self.env['sf.machine_tool.type'].sudo()._get_ids(
+                                    item['apply_machine_tool_type_code']).id,
                                 "through_hole_size": item['through_hole_size'],
                                 "screw_size": item['screw_size'],
+                                "active": item['active'],
                             })
                         else:
                             fixture_model.write({
@@ -1628,8 +1631,8 @@ class SyncFixtureModel(models.Model):
                                 "materials_model_id": self.env['sf.materials.model'].search(
                                     [('materials_no', '=', item['materials_model_code'])]).id,
                                 "driving_way": item['driving_way'],
-                                "apply_machine_tool_type_id": self.env['sf.machine_tool.type'].search(
-                                    [('code', '=', item['apply_machine_tool_type_code'])]).id,
+                                "apply_machine_tool_type_ids": self.env['sf.machine_tool.type'].sudo()._get_ids(
+                                    item['apply_machine_tool_type_code']).id,
                                 "through_hole_size": item['through_hole_size'],
                                 "screw_size": item['screw_size'],
                                 "active": item['active'],

From 2ae7b2c8ecd7c7bbad84c4e9aaae092ec431df29 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Wed, 23 Aug 2023 10:28:54 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E5=8A=A0=E5=A4=A7=E9=86=92=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/views/base_view.xml               | 22 +++++++++++-----------
 sf_base/views/common_view.xml             | 16 ++++++++--------
 sf_base/views/fixture_view.xml            |  8 ++++----
 sf_base/views/functional_fixture_view.xml |  4 ++--
 sf_base/views/tool_views.xml              |  4 ++--
 5 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/sf_base/views/base_view.xml b/sf_base/views/base_view.xml
index 88a2dd86..4e7e5290 100644
--- a/sf_base/views/base_view.xml
+++ b/sf_base/views/base_view.xml
@@ -41,16 +41,16 @@
             <form string="品牌" create="0" edit="0" delete="1">
                 <sheet>
                     <!--                <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>-->
-                    <field name="image_brand" widget='image' class="oe_avatar"
-                           options="{'preview_image': 'image_128'}" string="log"/>
                     <div class="oe_title">
                         <h1>
-                            <field name="code" readonly="1"/>
+                            <field name="name" readonly="1"/>
                         </h1>
+                        <field name="image_brand" widget='image' class="oe_avatar"
+                               options="{'preview_image': 'image_128'}" string="log"/>
                     </div>
                     <group>
                         <group>
-                            <field name="name" string="名称"/>
+                            <field name="code"/>
                             <field name="tag_ids"
                                    widget="many2many_tags"
                                    options="{'color_field': 'color', 'no_create_edit': True}"
@@ -108,15 +108,15 @@
                 <sheet>
                     <div class="oe_title">
                         <h1>
-                            <field name="code"/>
+                            <field name="name" placeholder="e.g. LED Monitor"/>
                         </h1>
                     </div>
                     <group>
                         <group>
-                            <label for="name"/>
-                            <h1>
-                                <field name="name" string="设备名称" placeholder="e.g. LED Monitor"/>
-                            </h1>
+                            <!--                            <label for="name"/>-->
+                            <!--                            <h1>-->
+                            <!--                                <field name="name" string="设备名称" placeholder="e.g. LED Monitor"/>-->
+                            <!--                            </h1>-->
                             <field name="code" force_save="1" readonly="1"/>
                             <field name="brand_id" required="1"
                                    domain="[('tag_ids', '=', '机床')]"
@@ -363,7 +363,7 @@
                 <sheet>
                     <div class="oe_title">
                         <h1>
-                            <field name="MTcode"/>
+                            <field name="name" placeholder="e.g. LED Monitor"/>
                         </h1>
                     </div>
                     <group string="基本信息">
@@ -374,7 +374,7 @@
                         <!--                                   options="{'no_create': True}"/>-->
                         <!--                        </group>-->
                         <group>
-                            <field name="name" required="1" string="设备名称" placeholder="e.g. LED Monitor"/>
+                            <field name="MTcode" required="1"/>
                             <field name="type_id" required="1" options="{'no_create': True}"
                                    domain="[('brand_id', '=', brand_id)]"
                                    attrs="{'invisible': [('brand_id','=',False)]}"/>
diff --git a/sf_base/views/common_view.xml b/sf_base/views/common_view.xml
index afa7d88b..58d2419b 100644
--- a/sf_base/views/common_view.xml
+++ b/sf_base/views/common_view.xml
@@ -49,7 +49,7 @@
                     <sheet>
                         <div class="oe_title">
                             <h1>
-                                <field name="code"/>
+                                <field name="name" required="1"/>
                             </h1>
                         </div>
                         <group>
@@ -57,7 +57,7 @@
                                 <field name="sequence"/>
                             </group>
                             <group>
-                                <field name="name" required="1"/>
+                                <field name="code" force_save="1" readonly="1"/>
                             </group>
                         </group>
                         <notebook>
@@ -119,12 +119,12 @@
                     <sheet>
                         <div class="oe_title">
                             <h1>
-                                <field name="process_encode"/>
+                                <field name="name" required="1"/>
                             </h1>
                         </div>
                         <group>
                             <group>
-                                <field name="name" required="1" string="名称"/>
+                                <field name="process_encode"/>
                             </group>
                             <notebook>
                                 <page string="可选参数">
@@ -199,12 +199,12 @@
                     <sheet>
                         <div class="oe_title">
                             <h1>
-                                <field name="materials_no" readonly="1" force_save="1"/>
+                                <field name="name" readonly="1"/>
                             </h1>
                         </div>
                         <group>
                             <group>
-                                <field name="name" readonly="1"/>
+                                <field name="materials_no" readonly="1" force_save="1"/>
                                 <field name="gain_way" required="1"/>
                                 <field name="tensile_strength" required="1"/>
                                 <field name="hardness" required="1"/>
@@ -278,12 +278,12 @@
                     <sheet>
                         <div class="oe_title">
                             <h1>
-                                <field name="materials_no"/>
+                                <field name="name" required="1"/>
                             </h1>
                         </div>
                         <group>
                             <group>
-                                <field name="name" required="1" string="名称"/>
+                                <field name="materials_no"/>
                             </group>
                             <notebook>
                                 <page string="型号">
diff --git a/sf_base/views/fixture_view.xml b/sf_base/views/fixture_view.xml
index 6a402681..e363b039 100644
--- a/sf_base/views/fixture_view.xml
+++ b/sf_base/views/fixture_view.xml
@@ -163,7 +163,7 @@
         <field name="name">夹具型号</field>
         <field name="model">sf.fixture.model</field>
         <field name="arch" type="xml">
-            <tree string="夹具型号">
+            <tree string="夹具型号" create="0" edit="0"  delete="1">
                 <field name="code"/>
                 <field name="name" string="名称"/>
                 <field name="brand_id"/>
@@ -177,16 +177,16 @@
         <field name="name">夹具型号</field>
         <field name="model">sf.fixture.model</field>
         <field name="arch" type="xml">
-            <form string="夹具型号">
+            <form string="夹具型号" create="0" edit="0"  delete="1" >
                 <sheet>
                     <div class="oe_title">
                         <h1>
-                            <field name="code" force_save="1" readonly="1"/>
+                            <field name="name" />
                         </h1>
                     </div>
                     <group>
                         <group>
-                            <field name="name" string="名称"/>
+                            <field name="code" force_save="1" readonly="1"/>
                             <field name="fixture_material_id" options="{'no_create': True}"/>
                             <field name="fixture_material_type" invisible="1"/>
                             <field name="multi_mounting_type_id" options="{'no_create': True}"/>
diff --git a/sf_base/views/functional_fixture_view.xml b/sf_base/views/functional_fixture_view.xml
index e366f701..ff57215d 100644
--- a/sf_base/views/functional_fixture_view.xml
+++ b/sf_base/views/functional_fixture_view.xml
@@ -103,12 +103,12 @@
                 <sheet>
                     <div class="oe_title">
                         <h1>
-                            <field name="code"/>
+                            <field name="name"/>
                         </h1>
                     </div>
                     <group string="基本信息">
                         <group>
-                            <field name="name" string="名称"/>
+                            <field name="code" />
                             <field name="type_id"/>
                             <field name="type" invisible="1"/>
                             <field name="zero_chuck_model_ids" widget="many2many_tags" options="{'no_create': True}"/>
diff --git a/sf_base/views/tool_views.xml b/sf_base/views/tool_views.xml
index 5b78270d..bfc405f9 100644
--- a/sf_base/views/tool_views.xml
+++ b/sf_base/views/tool_views.xml
@@ -214,12 +214,12 @@
                     <sheet>
                         <div class="oe_title">
                             <h1>
-                                <field name="code"/>
+                                <field name="name" placeholder="e.g. LED Monitor"/>
                             </h1>
                         </div>
                         <group>
                             <group>
-                                <field name="name" string="名称"/>
+                                <field name="code" />
                                 <field name="cutting_tool_material_id"
                                        options="{'no_create': True, 'no_quick_create': True}"/>
                                 <field name="cutting_tool_type" invisible="1"/>

From b01a5a4216611b8f572f483f51ab2c24b8f90470 Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Wed, 23 Aug 2023 14:37:02 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E5=88=80=E6=8A=8A=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9Ebt50=20=E4=BF=AE=E6=94=B9=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E5=93=81=E7=89=8C=E5=9B=BE=E7=89=87=E6=8A=A5=E9=94=99=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/models/base.py               | 2 +-
 sf_base/views/base_view.xml          | 1 +
 sf_mrs_connect/models/sync_common.py | 7 ++++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/sf_base/models/base.py b/sf_base/models/base.py
index bb225b9b..a340aaca 100644
--- a/sf_base/models/base.py
+++ b/sf_base/models/base.py
@@ -256,7 +256,7 @@ class MachineToolType(models.Model):
     name = fields.Char('名称')
     brand_id = fields.Many2one('sf.machine.brand', string='品牌')
     knife_type = fields.Selection(
-        [("BT40", "BT40"), ("BT30", "BT30")],
+        [("BT40", "BT40"), ("BT30", "BT30"), ("BT50", "BT50")],
         default="", string="刀把类型")
     number_of_knife_library = fields.Integer('刀库数量')
     rotate_speed = fields.Integer('转速')
diff --git a/sf_base/views/base_view.xml b/sf_base/views/base_view.xml
index 88a2dd86..eff588a4 100644
--- a/sf_base/views/base_view.xml
+++ b/sf_base/views/base_view.xml
@@ -30,6 +30,7 @@
                 <field name="name"/>
                 <field name="tag_ids" widget="many2many_tags" optional="hide"/>
                 <field name="remark"/>
+                <field name="image_brand" widget="image"/>
             </tree>
         </field>
     </record>
diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py
index 6c2003ff..a9ea2c24 100644
--- a/sf_mrs_connect/models/sync_common.py
+++ b/sf_mrs_connect/models/sync_common.py
@@ -569,15 +569,20 @@ class MachineBrand(models.Model):
         result = json.loads(r['result'])
         if result['status'] == 1:
             for item in result['machine_brand_all_list']:
+
                 brand = self.env['sf.machine.brand'].search(
                     [("code", '=', item['code'])])
                 if not brand:
+                    if item.get('image_brand'):
+                        image = base64.b64decode(item['image_brand'])
+                    else:
+                        image = ''
                     self.env['sf.machine.brand'].create({
                         "id": item['id'],
                         "name": item['name'],
                         "code": item['code'],
                         "remark": item['remark'],
-                        "image_brand": '' if not item['image_brand'] else base64.b64encode(item.image_brand),
+                        "image_brand": image,
                         "tag_ids": self.env['sf.machine.brand.tags'].search(
                             [("name", 'in', item['tag_ids'])]).ids
                     })

From 0b30408aaeaf1f60e9356d6f0282eebf53fb012d Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Wed, 23 Aug 2023 15:47:17 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E6=9B=B4=E6=96=B03D=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/src/images/not_model.png           | Bin 0 -> 3601 bytes
 .../static/src/js/3d_viewer.js                |  27 ++++++++++--------
 2 files changed, 15 insertions(+), 12 deletions(-)
 create mode 100644 web_widget_model_viewer/static/src/images/not_model.png

diff --git a/web_widget_model_viewer/static/src/images/not_model.png b/web_widget_model_viewer/static/src/images/not_model.png
new file mode 100644
index 0000000000000000000000000000000000000000..16e69cea9bd5e71fa915970ada4e7083127f58d7
GIT binary patch
literal 3601
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
X(6rX59wR)Y00000NkvXXu0mjfct!U|

literal 0
HcmV?d00001

diff --git a/web_widget_model_viewer/static/src/js/3d_viewer.js b/web_widget_model_viewer/static/src/js/3d_viewer.js
index 582c887f..f93cf207 100644
--- a/web_widget_model_viewer/static/src/js/3d_viewer.js
+++ b/web_widget_model_viewer/static/src/js/3d_viewer.js
@@ -19,31 +19,34 @@ var QWeb = core.qweb;
 import { Component, onWillUpdateProps, useState, useRef, useEffect } from "@odoo/owl";
 
 export class StepViewer extends Component {
-   setup() {
-       console.log('setup')
+    setup() {
         this.props.url = this.formatUrl();
     }
-
     formatUrl(){
         var url = '';
         if (this.props.value) {
-            if (utils.is_bin_size(this.props.value)) {
+            if (this.props.value.slice(-1) == 'b' && !isNaN(this.props.value.split(' ')[0])) {
                 var url_props = {
                     base_url: session['web.base.url'],
                     model: this.props.record.resModel,
                     id: JSON.stringify(this.props.record.data['id']),
                     field: this.props.name}
-                url = url_props['base_url']+'/web/content/'+url_props['model']+'/'+url_props['id']+'/'+url_props['field']+'?download=true'
-                console.log('url', url)
-
+                url = url_props['base_url'].replace('http://', 'https://') +'/web/content/'+url_props['model']+'/'+url_props['id']+'/'+url_props['field']+'?download=true'
+                // url = 'http://localhost:8069'+'/web/content/'+url_props['model']+'/'+url_props['id']+'/'+url_props['field']+'?download=true'
+                console.log('url111111',url)
+                return url
             } else {
-                url = "data:model/gltf-binary;base64," + this.props.value;
-                console.log('url222', url)
+                    url = "data:model/gltf-binary;base64," + this.props.value;
+                    console.log('url2',url)
+                    return url
+                    // localStorage.setItem('url',url)
+                    // let new_url = localStorage.getItem(('url'))
+                    // var oViewer = document.getElementsByTagName('model-viewer')[0];
+                    // return new_url
+                    // url = "web_widget_model_viewer/static/src/images/not_model.png";
             }
         }
-        return url
-    }
-
+        }
 }
 
 StepViewer.template = "web_widget_model_viewer.BinaryField3d";

From 11a06df0a46783a4c5c3c3099727aea732432495 Mon Sep 17 00:00:00 2001
From: yuxianghui <1608204036@qq.com>
Date: Wed, 23 Aug 2023 17:32:22 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E5=88=80=E5=85=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=B8=AD=E7=9A=84=E6=89=80=E6=9C=89=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E7=95=8C=E9=9D=A2=E7=9A=84=E5=8A=A0=E7=B2=97=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E9=83=BD=E6=94=B9=E4=B8=BAname=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=9B=E4=BC=98=E5=8C=96=E4=BA=86=E5=88=80=E5=85=B7=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E6=9F=A5=E8=AF=A2=E7=95=8C=E9=9D=A2=E5=B8=83=E5=B1=80?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_tool_management/views/tool_base_views.xml  |  26 +-
 .../views/tool_material_search.xml            | 293 +++++++++---------
 2 files changed, 167 insertions(+), 152 deletions(-)

diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 361ea14a..d7254f4a 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -29,12 +29,12 @@
                     <sheet>
                         <div class="oe_title">
                             <h1>
-                                <field name="code" readonly="1"/>
+                                <field name="name" invisible="False"/>
                             </h1>
                         </div>
                         <group>
                             <group>
-                                <field name="name" invisible="True"/>
+                                <field name="code" readonly="1"/>
                                 <field name="mrs_cutting_tool_type_id"/>
 
                                 <field name="mrs_cutting_tool_integral_model_ids"
@@ -188,12 +188,12 @@
                     <sheet>
                         <div class="oe_title">
                             <h1>
-                                <field name="code" readonly="1"/>
+                                <field name="name" invisible="False"/>
                             </h1>
                         </div>
                         <group>
                             <group>
-                                <field name="name" invisible="True"/>
+                                <field name="code" readonly="1"/>
                                 <field name="mrs_cutting_tool_type_id"/>
 
                                 <field name="mrs_cutting_tool_integral_model_ids"
@@ -385,12 +385,12 @@
                     <sheet>
                         <div class="oe_title">
                             <h1>
-                                <field name="code" readonly="1"/>
+                                <field name="name" invisible="False"/>
                             </h1>
                         </div>
                         <group>
                             <group>
-                                <field name="name" invisible="True"/>
+                                <field name="code" readonly="1"/>
                                 <field name="mrs_cutting_tool_type_id"/>
 
                                 <field name="mrs_cutting_tool_integral_model_ids"
@@ -570,12 +570,12 @@
                     <sheet>
                         <div class="oe_title">
                             <h1>
-                                <field name="code" readonly="1"/>
+                                <field name="name" invisible="False"/>
                             </h1>
                         </div>
                         <group>
                             <group>
-                                <field name="name" invisible="True"/>
+                                <field name="code" readonly="1"/>
                                 <field name="mrs_cutting_tool_type_id"/>
 
                                 <field name="mrs_cutting_tool_integral_model_ids"
@@ -1170,14 +1170,14 @@
                     </header>
                     <div class="oe_title">
                         <h1>
-                            <field name="functional_tool_code" readonly="1"/>
+                            <field name="name"/>
                         </h1>
                     </div>
                     <sheet>
-                       <group>
-                           <group>
-                               <field name="name"/>
-                               <field name="functional_tool_type_id"/>
+                        <group>
+                            <group>
+                                <field name="functional_tool_code" readonly="1"/>
+                                <field name="functional_tool_type_id"/>
                                <field name="functional_tool_diameter"/>
                                <field name="functional_tool_length"/>
                                <field name="functional_tool_cutting_type"/>
diff --git a/sf_tool_management/views/tool_material_search.xml b/sf_tool_management/views/tool_material_search.xml
index e75344dd..9e844bfd 100644
--- a/sf_tool_management/views/tool_material_search.xml
+++ b/sf_tool_management/views/tool_material_search.xml
@@ -126,12 +126,16 @@
             <field name="arch" type="xml">
                 <form string="刀具物料查询">
                     <sheet>
-                        <group string='基本信息'>
+                        <div class="oe_title">
+                            <h1>
+                                <field name="name"/>
+                            </h1>
+                        </div>
+                        <group>
                             <group>
                                 <field name="mrs_cutting_tool_material_name" invisible="1"/>
                                 <field name="sequence"/>
                                 <field name="code"/>
-                                <field name="name"/>
                                 <field name="mrs_cutting_tool_type_id"/>
                                 <field name="mrs_machine_brand_id"/>
                                 <!--                                 <field name="mrs_cutting_tool_model_id"/> -->
@@ -143,147 +147,158 @@
                                 <field name="three_d_model" widget="many2one"/>
                             </group>
                         </group>
-                        <group string='刀具库存信息'>
-                            <group>
-                                <field name="number"/>
-                                <field name="mrs_materials_model_id"/>
-                                <field name="purchase_date"/>
-                                <field name="purchase_batch"/>
-                            </group>
-                            <group>
-                                <field name="supplier"/>
-                                <field name="warehouse_name"/>
-                                <field name="warehouse_area"/>
-                                <field name="warehouse_location"/>
-                            </group>
-                        </group>
+                        <notebook>
+                            <page string='刀具库存信息'>
+                                <group >
+                                    <group>
+                                        <field name="number"/>
+                                        <field name="mrs_materials_model_id"/>
+                                        <field name="purchase_date"/>
+                                        <field name="purchase_batch"/>
+                                    </group>
+                                    <group>
+                                        <field name="supplier"/>
+                                        <field name="warehouse_name"/>
+                                        <field name="warehouse_area"/>
+                                        <field name="warehouse_location"/>
+                                    </group>
+                                </group>
+                            </page>
+                            <page string="刀片信息" attrs="{'invisible': [('cutting_tool_type','!=','刀片')]}">
+                                <group>
+                                    <group>
+                                        <field name="blade_code" invisible="True"/>
+                                        <field name="blade_length"/>
+                                        <field name="blade_width"/>
+                                        <field name="blade_height"/>
+                                        <field name="blade_radius"/>
+                                        <field name="blade_hardness"/>
+                                        <field name="blade_accuracy"/>
+                                        <field name="blade_coating_material_id"/>
+                                        <field name="mrs_cutting_tool_model_blade_cutter_bar_ids" widget="many2many_tags"/>
+                                    </group>
+                                    <group>
+                                        <field name="blade_top_angle"/>
+                                        <field name="blade_front_angle"/>
+                                        <field name="blade_rear_angle"/>
+                                        <field name="blade_main_included_angle"/>
+                                        <field name="blade_r_angle"/>
+                                        <field name="blade_nut"/>
+                                        <field name="mrs_cutting_tool_model_blade_cutter_pad_ids" widget="many2many_tags"/>
+                                    </group>
+                                </group>
+                            </page>
+                            <page string="整体式刀具信息" attrs="{'invisible': [('cutting_tool_type','!=','整体式刀具')]}">
+                                <group>
+                                    <group>
+                                        <field name="integral_code" invisible="True"/>
+                                        <field name="integral_total_length"/>
+                                        <field name="integral_shank_length"/>
+                                        <field name="integral_blade_length"/>
+                                        <field name="integral_diameter"/>
+                                        <field name="integral_blade_number"/>
+                                        <field name="integral_accuracy"/>
+                                    </group>
+                                    <group>
+                                        <field name="integral_front_angle"/>
+                                        <field name="integral_rear_angle"/>
+                                        <field name="integral_main_included_angle"/>
+                                        <field name="integral_nut"/>
+                                        <field name="integral_hardness"/>
+                                        <field name="integral_coating_material"/>
+                                        <field name="integral_scope"/>
+                                    </group>
+                                </group>
+                            </page>
+                            <page string="刀杆信息" attrs="{'invisible': [('cutting_tool_type','!=','刀杆')]}">
+                                <group>
+                                    <group>
+                                        <field name="bar_code" invisible="True"/>
+                                        <field name="bar_c_diameter"/>
+                                        <field name="bar_total_length"/>
+                                        <field name="bar_blade_number"/>
+                                        <field name="bar_d_diameter"/>
+                                        <field name="bar_scope"/>
+                                        <field name="mrs_cutting_tool_model_bar_blade_ids" widget="many2many_tags"/>
+                                    </group>
+                                    <group>
+                                        <field name="bar_wrench"/>
+                                        <field name="bar_screw"/>
+                                        <field name="bar_radius"/>
+                                        <field name="bar_accuracy"/>
+                                        <field name="bar_hardness"/>
+                                    </group>
+                                </group>
+                            </page>
+                            <page string="刀盘信息" attrs="{'invisible': [('cutting_tool_type','!=','刀盘')]}">
+                                <group>
+                                    <group>
+                                        <field name="pad_code" invisible="True"/>
+                                        <field name="pad_c_diameter"/>
+                                        <field name="pad_total_length"/>
+                                        <field name="pad_blade_number"/>
+                                        <field name="pad_d_diameter"/>
+                                        <field name="pad_scope"/>
+                                        <field name="mrs_cutting_tool_model_pad_blade_ids" widget="many2many_tags"/>
+                                    </group>
+                                    <group>
+                                        <field name="pad_wrench"/>
+                                        <field name="pad_screw"/>
+                                        <field name="pad_radius"/>
+                                        <field name="pad_accuracy"/>
+                                        <field name="pad_hardness"/>
+                                    </group>
+                                </group>
+                            </page>
+                            <page string="刀柄信息" attrs="{'invisible': [('cutting_tool_type','!=','刀柄')]}">
+                                <group>
+                                    <group>
+                                        <field name="handle_code" invisible="True"/>
+                                        <field name="handle_diameter"/>
+                                        <field name="handle_flange_length"/>
+                                        <field name="handle_flange_diameter"/>
+                                        <field name="handle_clamping_diameter_min"/>
+                                        <field name="handle_clamping_diameter_max"/>
+                                        <field name="handle_clamping_range"/>
+                                        <field name="handle_detection_accuracy"/>
+                                        <field name="mrs_cutting_tool_model_handle_chuck_model_ids" widget="many2many_tags"/>
+                                    </group>
+                                    <group>
+                                        <field name="handle_jump_accuracy"/>
+                                        <field name="handle_max_speed"/>
+                                        <field name="handle_standard_speed"/>
+                                        <field name="handle_weight"/>
+                                        <field name="handle_body_accuracy"/>
+                                        <field name="handle_nut"/>
+                                        <field name="handle_detection_hardness"/>
+                                    </group>
+                                </group>
+                            </page>
+                            <page string="夹头信息" attrs="{'invisible': [('cutting_tool_type','!=','夹头')]}">
+                                <group>
+                                    <group>
+                                        <field name="chuck_code" invisible="True"/>
+                                        <field name="chuck_clamping_diameter_min"/>
+                                        <field name="chuck_clamping_diameter_max"/>
+                                        <field name="chuck_diameter"/>
+                                        <field name="chuck_inner_diameter"/>
+                                        <field name="chuck_feature"/>
+                                        <field name="mrs_cutting_tool_model_chuck_handle_model_ids" widget="many2many_tags"/>
+                                    </group>
+                                    <group>
+                                        <field name="chuck_accuracy"/>
+                                        <field name="chuck_height"/>
+                                        <field name="chuck_nut"/>
+                                        <field name="chuck_clamping_range"/>
+                                        <field name="image"/>
+                                    </group>
+                                </group>
+                            </page>
+                        </notebook>
                         <group>
                             <field name="cutting_tool_material_name" invisible="True"/>
                             <field name="cutting_tool_type" invisible="True"/>
                         </group>
-                        <group string="刀片信息" attrs="{'invisible': [('cutting_tool_type','!=','刀片')]}">
-                            <group>
-                                <field name="blade_code" invisible="True"/>
-                                <field name="blade_length"/>
-                                <field name="blade_width"/>
-                                <field name="blade_height"/>
-                                <field name="blade_radius"/>
-                                <field name="blade_hardness"/>
-                                <field name="blade_accuracy"/>
-                                <field name="blade_coating_material_id"/>
-                                <field name="mrs_cutting_tool_model_blade_cutter_bar_ids" widget="many2many_tags"/>
-                            </group>
-                            <group>
-                                <field name="blade_top_angle"/>
-                                <field name="blade_front_angle"/>
-                                <field name="blade_rear_angle"/>
-                                <field name="blade_main_included_angle"/>
-                                <field name="blade_r_angle"/>
-                                <field name="blade_nut"/>
-                                <field name="mrs_cutting_tool_model_blade_cutter_pad_ids" widget="many2many_tags"/>
-                            </group>
-                        </group>
-
-                        <group string="整体式刀具信息" attrs="{'invisible': [('cutting_tool_type','!=','整体式刀具')]}">
-                            <group>
-                                <field name="integral_code" invisible="True"/>
-                                <field name="integral_total_length"/>
-                                <field name="integral_shank_length"/>
-                                <field name="integral_blade_length"/>
-                                <field name="integral_diameter"/>
-                                <field name="integral_blade_number"/>
-                                <field name="integral_accuracy"/>
-                            </group>
-                            <group>
-                                <field name="integral_front_angle"/>
-                                <field name="integral_rear_angle"/>
-                                <field name="integral_main_included_angle"/>
-                                <field name="integral_nut"/>
-                                <field name="integral_hardness"/>
-                                <field name="integral_coating_material"/>
-                                <field name="integral_scope"/>
-                            </group>
-                        </group>
-
-                        <group string="刀杆信息" attrs="{'invisible': [('cutting_tool_type','!=','刀杆')]}">
-                            <group>
-                                <field name="bar_code" invisible="True"/>
-                                <field name="bar_c_diameter"/>
-                                <field name="bar_total_length"/>
-                                <field name="bar_blade_number"/>
-                                <field name="bar_d_diameter"/>
-                                <field name="bar_scope"/>
-                                <field name="mrs_cutting_tool_model_bar_blade_ids" widget="many2many_tags"/>
-                            </group>
-                            <group>
-                                <field name="bar_wrench"/>
-                                <field name="bar_screw"/>
-                                <field name="bar_radius"/>
-                                <field name="bar_accuracy"/>
-                                <field name="bar_hardness"/>
-                            </group>
-                        </group>
-
-                        <group string="刀盘信息" attrs="{'invisible': [('cutting_tool_type','!=','刀盘')]}">
-                            <group>
-                                <field name="pad_code" invisible="True"/>
-                                <field name="pad_c_diameter"/>
-                                <field name="pad_total_length"/>
-                                <field name="pad_blade_number"/>
-                                <field name="pad_d_diameter"/>
-                                <field name="pad_scope"/>
-                                <field name="mrs_cutting_tool_model_pad_blade_ids" widget="many2many_tags"/>
-                            </group>
-                            <group>
-                                <field name="pad_wrench"/>
-                                <field name="pad_screw"/>
-                                <field name="pad_radius"/>
-                                <field name="pad_accuracy"/>
-                                <field name="pad_hardness"/>
-                            </group>
-                        </group>
-
-                        <group string="刀柄信息" attrs="{'invisible': [('cutting_tool_type','!=','刀柄')]}">
-                            <group>
-                                <field name="handle_code" invisible="True"/>
-                                <field name="handle_diameter"/>
-                                <field name="handle_flange_length"/>
-                                <field name="handle_flange_diameter"/>
-                                <field name="handle_clamping_diameter_min"/>
-                                <field name="handle_clamping_diameter_max"/>
-                                <field name="handle_clamping_range"/>
-                                <field name="handle_detection_accuracy"/>
-                                <field name="mrs_cutting_tool_model_handle_chuck_model_ids" widget="many2many_tags"/>
-                            </group>
-                            <group>
-                                <field name="handle_jump_accuracy"/>
-                                <field name="handle_max_speed"/>
-                                <field name="handle_standard_speed"/>
-                                <field name="handle_weight"/>
-                                <field name="handle_body_accuracy"/>
-                                <field name="handle_nut"/>
-                                <field name="handle_detection_hardness"/>
-                            </group>
-                        </group>
-
-                        <group string="夹头信息" attrs="{'invisible': [('cutting_tool_type','!=','夹头')]}">
-                            <group>
-                                <field name="chuck_code" invisible="True"/>
-                                <field name="chuck_clamping_diameter_min"/>
-                                <field name="chuck_clamping_diameter_max"/>
-                                <field name="chuck_diameter"/>
-                                <field name="chuck_inner_diameter"/>
-                                <field name="chuck_feature"/>
-                                <field name="mrs_cutting_tool_model_chuck_handle_model_ids" widget="many2many_tags"/>
-                            </group>
-                            <group>
-                                <field name="chuck_accuracy"/>
-                                <field name="chuck_height"/>
-                                <field name="chuck_nut"/>
-                                <field name="chuck_clamping_range"/>
-                                <field name="image"/>
-                            </group>
-                        </group>
                     </sheet>
                 </form>
             </field>