From d16d47dfbe4c1c360c85a3ae91848deaf2c02174 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= <huyao@jikimo.com>
Date: Thu, 24 Apr 2025 14:13:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=EF=BC=8C?=
 =?UTF-8?q?=E5=88=B6=E9=80=A0=E8=AE=A2=E5=8D=95=E8=A7=86=E5=9B=BE=E4=B8=AD?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=A8=A1=E5=9E=8Bid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jikimo_printing/__manifest__.py               |  2 +-
 jikimo_printing/views/maintenance_views.xml   | 19 +++++++++++++++++++
 jikimo_work_reporting_api/__manifest__.py     |  1 -
 sf_maintenance/views/maintenance_views.xml    |  5 -----
 .../views/mrp_production_addional_change.xml  |  2 +-
 .../views/mrp_workcenter_views.xml            |  9 +++++----
 sf_sale/views/sale_order_view.xml             |  1 +
 7 files changed, 27 insertions(+), 12 deletions(-)
 create mode 100644 jikimo_printing/views/maintenance_views.xml

diff --git a/jikimo_printing/__manifest__.py b/jikimo_printing/__manifest__.py
index 8fef212b..e6496401 100644
--- a/jikimo_printing/__manifest__.py
+++ b/jikimo_printing/__manifest__.py
@@ -8,7 +8,7 @@
     'category': '机企猫',
     'depends': ['sf_manufacturing', 'sf_maintenance', 'base_report_to_printer'],
     'data': [
-        
+         'views/maintenance_views.xml',
     ],
     
     'application': True,
diff --git a/jikimo_printing/views/maintenance_views.xml b/jikimo_printing/views/maintenance_views.xml
new file mode 100644
index 00000000..b02f5b60
--- /dev/null
+++ b/jikimo_printing/views/maintenance_views.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<odoo>
+    <record id="sf_maintenance_equipment_view_form_qrcode_print" model="ir.ui.view">
+        <field name="name">sf_equipment.form</field>
+        <field name="model">maintenance.equipment</field>
+        <field name="inherit_id" ref="sf_maintenance.sf_hr_equipment_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='qr_code_image']" position="after">
+                <label for="print_single_method"/>
+                <div class="col-12 col-lg-6 o_setting_box" style="white-space: nowrap">
+                    <button type="object" class="oe_highlight" name='print_single_method' string="打印机床二维码"
+                            attrs="{'invisible': [('equipment_type', '!=', '机床')]}"/>
+                </div>
+            </xpath>
+        </field>
+    </record>
+</odoo>
+
+                    
\ No newline at end of file
diff --git a/jikimo_work_reporting_api/__manifest__.py b/jikimo_work_reporting_api/__manifest__.py
index 502ce9d5..c5567c41 100644
--- a/jikimo_work_reporting_api/__manifest__.py
+++ b/jikimo_work_reporting_api/__manifest__.py
@@ -8,7 +8,6 @@
     'category': 'sf',
     'depends': ['base', 'sf_maintenance', 'jikimo_mini_program'],
     'data': [
-        
     ],
     
     'application': True,
diff --git a/sf_maintenance/views/maintenance_views.xml b/sf_maintenance/views/maintenance_views.xml
index 381319a6..f1207107 100644
--- a/sf_maintenance/views/maintenance_views.xml
+++ b/sf_maintenance/views/maintenance_views.xml
@@ -1055,11 +1055,6 @@
 
                 <xpath expr="//group/field[@name='location']" position="after">
                     <field name="qr_code_image" widget="image" readonly="1" attrs="{'invisible': [('equipment_type', '!=', '机床')]}" />
-                    <label for="print_single_method"/>
-                    <div class="col-12 col-lg-6 o_setting_box" style="white-space: nowrap">
-                        <button type="object" class="oe_highlight" name='print_single_method' string="打印机床二维码"
-                                attrs="{'invisible': [('equipment_type', '!=', '机床')]}"/>
-                    </div>
                 </xpath> 
                 <xpath expr="//page[@name='maintenance']" position="after">
                     <page name="network_config" string="网络配置" attrs="{'invisible': [('equipment_type', '!=', '机床')]}" >
diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index 7a8591c0..1a6f9d26 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -110,12 +110,12 @@
                 </xpath>
                 <xpath expr="//sheet//group//group[2]//label" position="before">
                     <!--                     <field name="process_state"/> -->
+                    <field name="production_type" readonly="1"/>
                     <field name="state" readonly="1"/>
                     <!--                     <field name="process_state"/> -->
 
                 </xpath>
                 <xpath expr="//sheet//group//group//div[3]" position="after">
-                    <field name="production_type" readonly="1"/>
                     <field name="production_product_type" invisible="1"/>
                     <field name="manual_quotation" readonly="1"
                            attrs="{'invisible': ['|', ('production_type', 'not in', ['自动化产线加工', '人工线下加工']), ('production_product_type', '!=', '成品')]}"/>
diff --git a/sf_manufacturing/views/mrp_workcenter_views.xml b/sf_manufacturing/views/mrp_workcenter_views.xml
index 46b1a43f..6ab63117 100644
--- a/sf_manufacturing/views/mrp_workcenter_views.xml
+++ b/sf_manufacturing/views/mrp_workcenter_views.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <!-- 工作中心看板 -->
-    <record id="mrp_production_view_form_inherit_maintenance" model="ir.ui.view">
+    <!-- <record id="mrp_production_view_form_inherit_maintenance" model="ir.ui.view">
         <field name="name">mrp.production.view.form.inherit.maintenance</field>
         <field name="model">mrp.production</field>
         <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
-        <field name="arch" type="xml">
+        <field name="arch" type="xml"> -->
             <!--             <button name="action_cancel" position="before"> -->
             <!--                 <button name="button_maintenance_req" type="object" string="维修请求"/> -->
             <!--             </button> -->
-            <div name="button_box" position="inside">
+            <!-- <div name="button_box" position="inside">
                 <button name="open_maintenance_request_mo" type="object" class="oe_stat_button" icon="fa-wrench"
                         attrs="{'invisible': [('maintenance_count', '=', 0)]}"
                         context="{'search_default_production_id': active_id}">
@@ -22,7 +22,7 @@
                 </button>
             </div>
         </field>
-    </record>
+    </record> -->
 
     <record id="custom_model_form_view_inherit" model="ir.ui.view">
         <field name="name">custom.model.form.view.inherit</field>
@@ -451,6 +451,7 @@
             </div>
             <field name="product_id" position="after">
                 <field name="model_file" string="产品模型" readonly="1" widget="Viewer3D" attrs="{'invisible': [('model_file', '=', False)]}"/>
+                <field name="model_id" readonly="1"/>
                 <field name="glb_url" widget="Viewer3D" string="模型" readonly="1" force_save="1"
                            attrs="{'invisible': [('glb_url', '=', False)]}"/>
             </field>
diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml
index 1d047649..a7aed85d 100644
--- a/sf_sale/views/sale_order_view.xml
+++ b/sf_sale/views/sale_order_view.xml
@@ -107,6 +107,7 @@
                     <field name="glb_url" widget="Viewer3D" optional="show"
                            string="模型文件" readonly="1" attrs="{'column_invisible': [('parent.model_display_version', '!=', 'v2')], 'isInList': True}"/>
                     <field name="part_name" optional="show"/>
+                    <field name="model_id" optional="hide"/>
                 </xpath>
                 <xpath expr="//field[@name='order_line']/tree/field[@name='price_subtotal']" position="after">
                     <field name="remark"/>