From 7d877a0cbb22dd281cda32d7847a4cdba6e4d947 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Fri, 20 Sep 2024 11:45:23 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E8=AF=8D=E5=88=B6=E9=80=A0=E8=AE=A2=E5=8D=95=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=9B=E5=A4=84=E7=90=86=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8C=89=E9=92=AE=E6=98=BE=E9=9A=90=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_machine_connect/controllers/controllers.py | 2 +-
 sf_manufacturing/models/mrp_workorder.py      | 5 ++++-
 sf_manufacturing/views/mrp_workorder_view.xml | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sf_machine_connect/controllers/controllers.py b/sf_machine_connect/controllers/controllers.py
index e301154b..5ba1261f 100644
--- a/sf_machine_connect/controllers/controllers.py
+++ b/sf_machine_connect/controllers/controllers.py
@@ -623,7 +623,7 @@ class Sf_Dashboard_Connect(http.Controller):
             # 未完成订单
             not_done_orders = plan_obj.search(
                 [('production_line_id.name', '=', line), ('state', 'not in', ['finished']),
-                 ('production_id.state', 'not in', ['cancel']), ('active', '=', True)
+                 ('production_id.state', 'not in', ['cancel', 'done']), ('active', '=', True)
                  ])
             # print(not_done_orders)
             # 完成订单
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 5de5e780..5a78f36b 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1582,8 +1582,11 @@ class SfWorkOrderBarcodes(models.Model):
             [('routing_type', '=', '装夹预调'), ('rfid_code', '=', barcode)])
         if workorder_olds:
             name = ''
+            tem_list = []
             for workorder in workorder_olds:
-                name = '%s  %s' % (name, workorder.production_id.name)
+                tem_list.append(workorder.production_id.name)
+            for i in list(set(tem_list)):
+                name = '%s  %s' % (name, i)
             raise UserError('该托盘已绑定【%s】制造订单，请先解除绑定！！！' % name)
         if workorder:
             if workorder.routing_type == '装夹预调':
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index e38f502f..e5ca2660 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -520,7 +520,7 @@
 
             <xpath expr="//form//header" position="inside">
                 <button type="object" class="oe_highlight jikimo_button_confirm" name="get_three_check_datas"
-                        string="获取数据" attrs='{"invisible": [("state","!=","progress")]}'/>
+                        string="获取数据" attrs='{"invisible": [("state","!=","progress"), ("routing_type","!=","装夹预调")]}'/>
             </xpath>
 
 

From f74215c9f60e09d5ad0ac4e278c9a0c76225ad5d Mon Sep 17 00:00:00 2001
From: hy <1298386937@qq.com>
Date: Fri, 20 Sep 2024 16:27:12 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B6=E9=83=A8?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/src/scss/theme.scss                | 57 +++++++++++++++++++
 .../static/src/xml/top_bar.xml                | 26 +++++++--
 2 files changed, 79 insertions(+), 4 deletions(-)

diff --git a/vista_backend_theme/static/src/scss/theme.scss b/vista_backend_theme/static/src/scss/theme.scss
index 22923a40..a7555c7f 100644
--- a/vista_backend_theme/static/src/scss/theme.scss
+++ b/vista_backend_theme/static/src/scss/theme.scss
@@ -1029,4 +1029,61 @@ div.dropdown-menu.bootstrap-datetimepicker-widget {
 .o_searchview .o_searchview_icon {
     z-index: 9999 !important;
     margin-top: 12px;
+}
+
+
+// 自定义的下拉
+.o_menu_sections_fix{
+    display: flex!important;
+    align-items: center;
+}
+.custom_dropdown {
+    position: relative;
+    .title {
+        color: #1f2631;
+        padding: 0 12px;
+        line-height: var(--o-navbar-height);
+        margin: 0;
+        cursor: pointer;
+        display: block;
+    }
+    .custom_dropdown_fixed {
+        position: absolute;
+        top: var(--o-navbar-height);
+        z-index: 1000;
+        padding: 0.5rem 0;
+        margin: 0;
+        font-size: 1.08333333rem;
+        color: #495057;
+        text-align: left;
+        background-color: #FFFFFF;
+        box-shadow: 0 1rem 1.1rem rgba(0, 0, 0, 0.1);
+        border-radius: 0.25rem;
+            display: none;
+        a {
+            display: block;
+            padding: 3px 20px;
+            clear: both;
+            font-weight: 400;
+            color: #495057;
+            text-align: inherit;
+            white-space: nowrap;
+            background-color: transparent;
+            border: 0;
+            &:hover {
+                color: #00005A !important;
+                background-color: #ebf0fd;
+                transition: all 0.3s linear;
+            }
+        }
+    }
+    &:hover {
+        .title {
+            background-color: rgba(0, 0, 0, 0.08);
+            transition: all .3s;
+        }
+        .custom_dropdown_fixed{
+            display: block;
+        }
+    }
 }
\ No newline at end of file
diff --git a/vista_backend_theme/static/src/xml/top_bar.xml b/vista_backend_theme/static/src/xml/top_bar.xml
index ba29b398..05b399b6 100644
--- a/vista_backend_theme/static/src/xml/top_bar.xml
+++ b/vista_backend_theme/static/src/xml/top_bar.xml
@@ -24,10 +24,28 @@
               </div>
 
               <!-- Current App Sections -->
-              <div class="d-none d-md-block">
-                  <t t-if="currentAppSections.length"
-                     t-call="web.NavBar.SectionsMenu">
-                    <t t-set="sections" t-value="currentAppSections"/>
+
+              <div class="d-none d-md-block o_menu_sections_fix ">
+<!--                  <t t-if="currentAppSections.length"-->
+<!--                     t-call="web.NavBar.SectionsMenu">-->
+<!--                    <t t-set="sections" t-value="currentAppSections"/>-->
+<!--                  </t>-->
+                  <t t-if="currentAppSections.length" >
+                  <t  t-foreach="currentAppSections" t-as="menu" t-key="menu.id">
+                      <div class="custom_dropdown" >
+                          <t  t-if="menu.childrenTree.length">
+                              <p class="title"><t t-esc="menu.name"></t> </p>
+                              <div class="custom_dropdown_fixed">
+                                  <t  t-foreach="menu.childrenTree" t-as="child" t-key="child.id">
+                                     <a t-attf-href="{{getMenuItemHref(child)}}">  <t t-esc="child.name"></t></a>
+                                  </t>
+                              </div>
+                          </t>
+                          <t t-if="!menu.childrenTree.length">
+                            <a class="title" t-attf-href="{{getMenuItemHref(menu)}}">  <t t-esc="menu.name"></t></a>
+                          </t>
+                      </div>
+                  </t>
                   </t>
               </div>
               <div class="d-xs-block d-sm-block  d-md-none">

From 4609ec442aa395fa1285f397f0ff07e6a457155d Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Fri, 20 Sep 2024 16:50:55 +0800
Subject: [PATCH 3/3] =?UTF-8?q?1=E3=80=81=E5=88=80=E5=85=B7=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E5=BA=93=E4=BC=98=E5=8C=96=EF=BC=8C=E6=95=B4=E4=BD=93?=
 =?UTF-8?q?=E5=BC=8F=E5=88=80=E5=85=B7=E7=89=A9=E6=96=99=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9B=E5=88=80=E5=85=B7=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96=EF=BC=9B2=E3=80=81?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BB=84=E8=A3=85=E5=8D=95=E6=89=AB=E6=8F=8F?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E7=BB=84=E8=A3=85=E5=92=8C=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=B5=8B=E9=87=8F=E5=80=BC=E5=8A=9F=E8=83=BD=EF=BC=9B=E7=BB=84?=
 =?UTF-8?q?=E8=A3=85=E5=8D=95=E6=9B=B4=E6=8D=A2=E7=89=A9=E6=96=99=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E4=BF=A1=E6=81=AF=E4=BC=98=E5=8C=96=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/models/tool_other_features.py                      | 3 ++-
 sf_base/static/src/js/custom_barcode_handlers.js           | 1 +
 sf_base/views/tool_basic_param.xml                         | 3 +++
 sf_base/views/tool_views.xml                               | 1 +
 .../views/product_template_management_view.xml             | 2 ++
 sf_manufacturing/models/product_template.py                | 6 ++++--
 sf_mrs_connect/models/sync_common.py                       | 4 ++++
 sf_tool_management/models/base.py                          | 4 +++-
 sf_tool_management/models/stock.py                         | 4 ++--
 sf_tool_management/views/stock.xml                         | 7 +++++--
 sf_tool_management/views/tool_base_views.xml               | 4 ++--
 11 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/sf_base/models/tool_other_features.py b/sf_base/models/tool_other_features.py
index f67e69fd..5bd597ae 100644
--- a/sf_base/models/tool_other_features.py
+++ b/sf_base/models/tool_other_features.py
@@ -22,7 +22,8 @@ class ToolMaterialsBasicParameters(models.Model):
     handle_diameter = fields.Float('柄部直径(mm)')
     handle_length = fields.Float('柄部长度(mm)')
     blade_tip_diameter = fields.Integer('刀尖直径(mm)')
-    blade_tip_working_size = fields.Char('刀尖处理尺寸(R半径mm/倒角度)', size=20)
+    blade_tip_working_size = fields.Char('刀尖倒角度(°)', size=20)
+    tip_r_size = fields.Float('刀尖R角(mm)')
     blade_tip_taper = fields.Integer('刀尖锥度(°)')
     blade_diameter = fields.Float('刃部直径(mm)')
     blade_length = fields.Float('刃部长度(mm)')
diff --git a/sf_base/static/src/js/custom_barcode_handlers.js b/sf_base/static/src/js/custom_barcode_handlers.js
index 220d2cbb..18db64e7 100644
--- a/sf_base/static/src/js/custom_barcode_handlers.js
+++ b/sf_base/static/src/js/custom_barcode_handlers.js
@@ -30,6 +30,7 @@ patch(barcodeGenericHandlers, "start", {
             "O-CMD.PAGER-FIRST": () => updatePager("first"),
             "O-CMD.PAGER-LAST": () => updatePager("last"),
             "O-CMD.CONFIRM": () => customClickOnButton(".jikimo_button_confirm"),
+            "O-CMD.FLUSHED": () => customClickOnButton(".jikimo_button_flushed"),
         };
 
         barcode.bus.addEventListener("barcode_scanned", (ev) => {
diff --git a/sf_base/views/tool_basic_param.xml b/sf_base/views/tool_basic_param.xml
index d138eeb8..06bb80bb 100644
--- a/sf_base/views/tool_basic_param.xml
+++ b/sf_base/views/tool_basic_param.xml
@@ -15,6 +15,7 @@
                     <field name="handle_length"/>
                     <field name="blade_tip_diameter"/>
                     <field name="blade_tip_working_size"/>
+                    <field name="tip_r_size"/>
                     <field name="blade_tip_taper"/>
                     <field name="blade_diameter"/>
                     <field name="blade_length"/>
@@ -95,6 +96,7 @@
                     <field name="handle_length"/>
                     <field name="blade_tip_diameter"/>
                     <field name="blade_tip_working_size"/>
+                    <field name="tip_r_size"/>
                     <field name="blade_tip_taper"/>
                     <field name="blade_diameter"/>
                     <field name="blade_length"/>
@@ -139,6 +141,7 @@
                             </group>
                             <group attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}">
                                 <field name="blade_tip_working_size"/>
+                                <field name="tip_r_size"/>
                                 <field name="blade_tip_diameter" class="diameter"/>
                                 <field name="blade_tip_taper"/>
                                 <field name="blade_helix_angle"/>
diff --git a/sf_base/views/tool_views.xml b/sf_base/views/tool_views.xml
index b90d1a5c..8b429f89 100644
--- a/sf_base/views/tool_views.xml
+++ b/sf_base/views/tool_views.xml
@@ -222,6 +222,7 @@
                                         <field name="handle_diameter" class="diameter"/>
                                         <field name="handle_length"/>
                                         <field name="blade_tip_working_size" class="du"/>
+                                        <field name="tip_r_size"/>
                                         <field name="blade_tip_diameter" class="diameter"/>
                                         <field name="blade_tip_taper" class="du"/>
                                         <field name="blade_helix_angle" class="du"/>
diff --git a/sf_dlm_management/views/product_template_management_view.xml b/sf_dlm_management/views/product_template_management_view.xml
index caefcb34..f53c5e2b 100644
--- a/sf_dlm_management/views/product_template_management_view.xml
+++ b/sf_dlm_management/views/product_template_management_view.xml
@@ -191,6 +191,8 @@
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_blade_tip_working_size"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/>
+                                <field name="cutting_tool_blade_tip_r_size"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_blade_tip_diameter" string="刀尖直径(mm)" class="diameter"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_blade_tip_taper" string="刀尖锥度(°)"
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 071f1167..48cabaf7 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -90,7 +90,8 @@ class ResProductMo(models.Model):
     cutting_tool_coarse_medium_fine = fields.Selection([('粗', '粗'), ('中', '中'), ('精', '精')], '粗/中/精')
     cutting_tool_run_out_accuracy_max = fields.Float('端跳精度max', digits=(6, 1))
     cutting_tool_run_out_accuracy_min = fields.Float('端跳精度min', digits=(6, 1))
-    cutting_tool_blade_tip_working_size = fields.Char('刀尖处理尺寸(R半径mm/倒角)', size=20)
+    cutting_tool_blade_tip_working_size = fields.Char('刀尖倒角度(°)', size=20)
+    cutting_tool_blade_tip_r_size = fields.Float('刀尖R角(mm)')
     fit_blade_shape_id = fields.Many2one('maintenance.equipment.image',
                                          '适配刀片形状', domain=[('type', '=', '刀片形状')])
     suitable_machining_method_ids = fields.Many2many('maintenance.equipment.image',
@@ -236,7 +237,8 @@ class ResProductMo(models.Model):
                 self.cutting_tool_blade_tip_diameter = self.specification_id.blade_tip_diameter
                 self.cutting_tool_blade_tip_taper = self.specification_id.blade_tip_taper
                 self.cutting_tool_blade_helix_angle = self.specification_id.blade_helix_angle
-                self.cutting_tool_blade_tip_working_size = self.specification_id.blade_tip_working_size
+                self.cutting_tool_blade_tip_working_size = self.specification_id.tip_r_size
+                self.cutting_tool_blade_tip_r_size = self.specification_id.blade_tip_working_size
                 self.cutting_tool_pitch = self.specification_id.pitch
                 self.cutting_tool_blade_width = self.specification_id.blade_width
                 self.cutting_tool_blade_depth = self.specification_id.blade_depth
diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py
index e106bbf2..25d30333 100644
--- a/sf_mrs_connect/models/sync_common.py
+++ b/sf_mrs_connect/models/sync_common.py
@@ -2438,6 +2438,7 @@ class CuttingToolBasicParameters(models.Model):
                                     'handle_length': integral_tool_item['shank_length'],
                                     'blade_tip_diameter': integral_tool_item['tip_diameter'],
                                     'blade_tip_working_size': integral_tool_item['tip_handling_size'],
+                                    'tip_r_size': integral_tool_item['tip_r_size'],
                                     'blade_tip_taper': integral_tool_item['knife_tip_taper'],
                                     'blade_helix_angle': integral_tool_item['blade_helix_angle'],
                                     'blade_width': integral_tool_item['blade_width'],
@@ -2459,6 +2460,7 @@ class CuttingToolBasicParameters(models.Model):
                                     'handle_length': integral_tool_item['shank_length'],
                                     'blade_tip_diameter': integral_tool_item['tip_diameter'],
                                     'blade_tip_working_size': integral_tool_item['tip_handling_size'],
+                                    'tip_r_size': integral_tool_item['tip_r_size'],
                                     'blade_tip_taper': integral_tool_item['knife_tip_taper'],
                                     'blade_helix_angle': integral_tool_item['blade_helix_angle'],
                                     'blade_width': integral_tool_item['blade_width'],
@@ -2789,6 +2791,7 @@ class CuttingToolBasicParameters(models.Model):
                                     'handle_length': integral_tool_item['shank_length'],
                                     'blade_tip_diameter': integral_tool_item['tip_diameter'],
                                     'blade_tip_working_size': integral_tool_item['tip_handling_size'],
+                                    'tip_r_size': integral_tool_item['tip_r_size'],
                                     'blade_tip_taper': integral_tool_item['knife_tip_taper'],
                                     'blade_helix_angle': integral_tool_item['blade_helix_angle'],
                                     'blade_width': integral_tool_item['blade_width'],
@@ -2810,6 +2813,7 @@ class CuttingToolBasicParameters(models.Model):
                                     'handle_length': integral_tool_item['shank_length'],
                                     'blade_tip_diameter': integral_tool_item['tip_diameter'],
                                     'blade_tip_working_size': integral_tool_item['tip_handling_size'],
+                                    'tip_r_size': integral_tool_item['tip_r_size'],
                                     'blade_tip_taper': integral_tool_item['knife_tip_taper'],
                                     'blade_helix_angle': integral_tool_item['blade_helix_angle'],
                                     'blade_width': integral_tool_item['blade_width'],
diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index d9ab1536..cbdc1d22 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -357,6 +357,8 @@ class FunctionalToolAssembly(models.Model):
         """
         智能工厂组装单处扫码校验刀具物料
         """
+        if 'O-CMD' in barcode:
+            return ''
         for record in self:
             tool_assembly_id = self.env['sf.functional.tool.assembly'].browse(self.ids)
             lot_ids = self.env['stock.lot'].sudo().search([('rfid', '=', barcode)])
@@ -835,7 +837,7 @@ class FunctionalToolAssembly(models.Model):
 
         if options == '刀柄+整体式刀具':
             if not integral_ids:
-                raise ValidationError('功能刀具清单的BOM未配置[刀柄]信息，请先配置BOM再开始组装！')
+                raise ValidationError('功能刀具清单的BOM未配置[整体式刀具]信息，请先配置BOM再开始组装！')
             return {'options': options, 'handle_ids': handle_ids, 'integral_ids': integral_ids}
         elif options == '刀柄+刀杆+刀片':
             if not blade_ids:
diff --git a/sf_tool_management/models/stock.py b/sf_tool_management/models/stock.py
index 32719520..9f0d9f82 100644
--- a/sf_tool_management/models/stock.py
+++ b/sf_tool_management/models/stock.py
@@ -298,8 +298,8 @@ class SfShelfLocationLot(models.Model):
     brand_id = fields.Many2one('sf.machine.brand', '品牌', related='product_id.brand_id')
 
     cutting_tool_blade_diameter = fields.Float('刃部直径(mm)', related='product_id.cutting_tool_blade_diameter')
-    cutting_tool_blade_tip_working_size = fields.Char('刀尖R角(mm)',
-                                                      related='product_id.cutting_tool_blade_tip_working_size')
+    cutting_tool_blade_tip_working_size = fields.Float('刀尖R角(mm)',
+                                                       related='product_id.cutting_tool_blade_tip_r_size')
     cutting_tool_blade_radius = fields.Char('刀尖圆弧半径(mm)',
                                             related='product_id.cutting_tool_blade_tip_circular_arc_radius')
     cutting_tool_cutter_arbor_diameter = fields.Float('刀杆直径(mm)',
diff --git a/sf_tool_management/views/stock.xml b/sf_tool_management/views/stock.xml
index c0942282..60e94886 100644
--- a/sf_tool_management/views/stock.xml
+++ b/sf_tool_management/views/stock.xml
@@ -18,8 +18,7 @@
         <field name="arch" type="xml">
             <tree create="0" export_xlsx="0" delete="0">
                 <header>
-                    <button string="确认" name="set_tool_material" type="object"
-                            class="treeHeaderBtn"/>
+                    <button string="确认" name="set_tool_material" type="object" class="treeHeaderBtn"/>
                 </header>
                 <field name="name"/>
                 <field name="cutting_tool_type_id"/>
@@ -62,6 +61,7 @@
                 <field name="brand_id"/>
                 <field name="shelf_location_id"/>
                 <field name="lot_id"/>
+                <field name="qty"/>
             </tree>
         </field>
     </record>
@@ -86,6 +86,7 @@
                 <field name="brand_id"/>
                 <field name="shelf_location_id"/>
                 <field name="lot_id"/>
+                <field name="qty"/>
             </tree>
         </field>
     </record>
@@ -111,6 +112,7 @@
                 <field name="brand_id"/>
                 <field name="shelf_location_id"/>
                 <field name="lot_id"/>
+                <field name="qty"/>
             </tree>
         </field>
     </record>
@@ -135,6 +137,7 @@
                 <field name="brand_id"/>
                 <field name="shelf_location_id"/>
                 <field name="lot_id"/>
+                <field name="qty"/>
             </tree>
         </field>
     </record>
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 2a68ce8e..130936d8 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -478,9 +478,9 @@
                                 class="btn-primary"/>
                         <button string="确认组装" name="functional_tool_assembly" type="object"
                                 attrs="{'invisible': [('assemble_status', 'not in', ['01'])]}"
-                                class="btn-primary"/>
+                                class="btn-primary jikimo_button_confirm"/>
                         <button name="get_tool_preset_parameter" string="获取测量值"
-                                type="object" class="btn-primary"
+                                type="object" class="btn-primary jikimo_button_flushed"
                                 attrs="{'invisible': [('assemble_status', 'in', ['0','1','2'])]}"
                         />
                         <field name="assemble_status" widget="statusbar" statusbar_visible="0,01,1"/>