Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工单文件优化

# Conflicts:
#	sf_manufacturing/models/mrp_workorder.py

sf_manufacturing/__manifest__.py

@@ -17,8 +17,8 @@
         'report/tray_report.xml',
         'views/mrp_maintenance_views.xml',
         'views/mrp_routing_workcenter_view.xml',
-        'views/mrp_workorder_view.xml',
         'views/mrp_workcenter_views.xml',
+        'views/mrp_workorder_view.xml',
         'views/tray_view.xml',
         'views/model_type_view.xml',
 

sf_manufacturing/models/__init__.py

@@ -6,6 +6,9 @@ from . import mrp_routing_workcenter
 from . import mrp_workorder
 from . import model_type
 from . import stock
+from . import res_user
+
+
 
 
 

sf_manufacturing/models/mrp_production.py

@@ -2,6 +2,9 @@
 from odoo import api, fields, models,_
 
 
+class resProduct(models.Model):
+    _inherit = 'product.template'
+    model_file = fields.Binary('模型文件')
 
 class MrpProduction(models.Model):
     _inherit = 'mrp.production'
@@ -10,6 +13,7 @@ class MrpProduction(models.Model):
     tray_ids = fields.One2many('sf.tray', 'production_id', string="托盘")
     maintenance_count = fields.Integer(compute='_compute_maintenance_count', string="Number of maintenance requests")
     request_ids = fields.One2many('maintenance.request', 'production_id')
+    model_file = fields.Binary('模型文件', related='product_id.model_file')
 
     @api.depends('request_ids')
     def _compute_maintenance_count(self):

sf_manufacturing/models/mrp_workcenter.py

@@ -7,6 +7,8 @@ class ResWorkcenter(models.Model):
     _inherit = "mrp.workcenter"
     machine_tool_id = fields.Many2one('sf.machine_tool', '机床')
 
+    users_ids = fields.Many2many("res.users", 'users_workcenter')
+
     equipment_ids = fields.One2many(
         'maintenance.equipment', 'workcenter_id', string="Maintenance Equipment",
         check_company=True)

sf_manufacturing/models/mrp_workorder.py

@@ -4,6 +4,7 @@ import math
 import requests
 import logging
 import base64
+import hashlib
 # import subprocess
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
@@ -19,6 +20,7 @@ class ResMrpWorkOrder(models.Model):
     _order = 'sequence'
 
     workcenter_id = fields.Many2one('mrp.workcenter', required=False)
+    users_ids = fields.Many2many("res.users", 'users_workorder', related="workcenter_id.users_ids")
     processing_panel = fields.Char('加工面')
     sequence = fields.Integer(string='工序')
     routing_type = fields.Selection([
@@ -29,6 +31,26 @@ class ResMrpWorkOrder(models.Model):
         ('后置三元质量检测', '后置三元质量检测'),
         ('解除装夹', '解除装夹'),
     ], string="工序类型")
+
+    @api.onchange('users_ids')
+    def get_user_permissions(self):
+        uid = self.env.uid
+        for workorder in self:
+            if workorder.users_ids:
+                list_user_id = []
+                for item in workorder.users_ids:
+                    list_user_id.append(item.id)
+                if uid in list_user_id:
+                    workorder.user_permissions = True
+                else:
+                    workorder.user_permissions = False
+            else:
+                workorder.user_permissions = False
+
+    user_permissions = fields.Boolean('用户权限', compute='get_user_permissions')
+    programming_no = fields.Char('编程单号')
+    work_state = fields.Char('业务状态')
+    programming_state = fields.Char('编程状态')
     cnc_worksheet = fields.Binary(
         '工作指令', readonly=True)
     material_center_point = fields.Char(string='配料中心点')
@@ -104,7 +126,11 @@ class ResMrpWorkOrder(models.Model):
         print("(%.2f,%.2f)" % (x, y))
         self.material_center_point = ("(%.2f,%.2f,%.2f)" % (x, y, z))
         self.X_deviation_angle = jdz
-        return self.material_center_point
+        # 将补偿值写入CNC加工工单
+        workorder = self.env['mrp.workorder'].browse(self.ids)
+        work = workorder.production_id.workorder_ids
+        work.compensation_value_x = eval(self.material_center_point)[0]
+        work.compensation_value_y = eval(self.material_center_point)[1]
 
     def json_workorder_str(self, k, production, route):
         workorders_values_str = [0, '', {
@@ -114,6 +140,7 @@ class ResMrpWorkOrder(models.Model):
             'name': route.route_workcenter_id.name,
             'processing_panel': k,
             'routing_type': route.routing_type,
+            'work_state': '' if not route.routing_type == '获取CNC加工程序' else '待发起',
             'workcenter_id': self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids),
             'date_planned_start': False,
             'date_planned_finished': False,
@@ -231,6 +258,9 @@ class ResMrpWorkOrder(models.Model):
         else:
             return True
 
+    # def fetchCNCing(self):
+    #     return None
+
     # cnc程序获取
     def fetchCNC(self):
         try:
@@ -280,12 +310,21 @@ class ResMrpWorkOrder(models.Model):
                 self.write(
                     {'programming_no': ret['programming_no'], 'programming_state': '编程中', 'work_state': '编程中'})
             else:
-                logging.info('fetchCNC-error:%s' % ret['message'])
-                raise UserError(ret['message'])
+                logging.info('fetchCNC-error:%s' % cnc)
+                raise UserError('行业资源库解析失败')
         except Exception as e:
             logging.info('fetchCNC error:%s' % e)
             raise UserError(e)
 
+    # return {
+    #     'name': _("工单"),
+    #     'view_mode': 'form',
+    #     'res_model': 'mrp.workorder',
+    #     'res_id': self.id,
+    #     'type': 'ir.actions.act_window',
+    #     'target': 'new'
+    # }
+
     def json_workorder_str1(self, k, production, route):
         workorders_values_str = [0, '', {
             'product_uom_id': production.product_uom_id.id,
@@ -294,6 +333,7 @@ class ResMrpWorkOrder(models.Model):
             'name': route.route_workcenter_id.name,
             'processing_panel': k,
             'routing_type': route.routing_type,
+            'work_state': '' if not route.routing_type == '获取CNC加工程序' else '待发起',
             'workcenter_id': self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids),
             'date_planned_start': False,
             'date_planned_finished': False,
@@ -367,49 +407,78 @@ class CNCprocessing(models.Model):
     depth_of_processing_z = fields.Char('加工深度(Z)')
     cutting_tool_extension_length = fields.Char('刀具伸出长度')
     cutting_tool_handle_type = fields.Char('刀柄型号')
-    estimated_processing_time = fields.Datetime('预计加工时间')
+    estimated_processing_time = fields.Char('预计加工时间')
     remark = fields.Text('备注')
     workorder_id = fields.Many2one('mrp.workorder', string="工单")
 
     # mrs下发编程单创建CNC加工
-    def cnc_processing_create(self, obj):
-        workorder = self.env['mrp.workorder'].search([('production_id.name', '=', obj['manufacturing_order_no']),
-                                                      ('processing_panel', '=', obj['processing_panel']),
-                                                      ('routing_type', '=', 'CNC加工')])
-        vals = {
-            'workorder_id': workorder.id,
-            'sequence_number': obj['sequence_number'],
-            'program_name': obj['program_name'],
-            'cutting_tool_name': obj['cutting_tool_name'],
-            'cutting_tool_no': obj['cutting_tool_no'],
-            'processing_type': obj['processing_type'],
-            'margin_x_y': obj['margin_x_y'],
-            'margin_z': obj['margin_z'],
-            'depth_of_processing_z': obj['depth_of_processing_z'],
-            'cutting_tool_extension_length': obj['cutting_tool_extension_length'],
-            'cutting_tool_handle_type': obj['cutting_tool_handle_type'],
-            'estimated_processing_time': obj['estimated_processing_time'],
-            'remark': obj['remark']
-        }
-        return self.env['sf.cnc.processing'].create(vals)
+    def cnc_processing_create(self, cnc_workorder, ret):
+        for obj in ret['programming_list']:
+            workorder = self.env['mrp.workorder'].search([('production_id.name', '=', ret['production_order_no']),
+                                                          ('processing_panel', '=', obj['processing_panel']),
+                                                          ('routing_type', '=', 'CNC加工')])
+            cnc_processing = self.env['sf.cnc.processing'].create({
+                'workorder_id': workorder.id,
+                'sequence_number': obj['sequence_number'],
+                'program_name': obj['program_name'],
+                'cutting_tool_name': obj['cutting_tool_name'],
+                'cutting_tool_no': obj['cutting_tool_no'],
+                'processing_type': obj['processing_type'],
+                'margin_x_y': obj['margin_x_y'],
+                'margin_z': obj['margin_z'],
+                'depth_of_processing_z': obj['depth_of_processing_z'],
+                'cutting_tool_extension_length': obj['cutting_tool_extension_length'],
+                'cutting_tool_handle_type': obj['cutting_tool_handle_type'],
+                'estimated_processing_time': obj['estimated_processing_time'],
+                'remark': obj['remark']
+            })
+            self.get_cnc_processing_file(ret['folder_name'], cnc_processing)
+        cnc_workorder.state = 'done'
+        cnc_workorder.work_state = '已编程'
+        cnc_workorder.programming_state = '已编程'
+        cnc_workorder.time_ids.date_end = datetime.now()
+
+    def get_cnc_processing_file(self, folder_name, cnc_processing):
+        logging.info('folder_name:%s' % folder_name)
+        serverdir = os.path.join('/', folder_name, 'return', cnc_processing.processing_panel)
+        logging.info('serverdir:%s' % serverdir)
+        for root, dirs, files in os.walk(server_dir):
+            for f in files:
+                logging.info('f:%s' % f)
+                if os.path.splitext(f)[1] == ".pdf":
+                    full_path = os.path.join(server_dir, root, f)
+                    logging.info('pdf:%s' % full_path)
+                    if full_path != False:
+                        if not cnc_processing.workorder_id.cnc_worksheet:
+                            cnc_processing.workorder_id.cnc_worksheet = base64.b64encode(
+                                open(full_path, 'rb').read())
+                else:
+                    if cnc_processing.program_name == f.split('.')[0]:
+                        cnc_file_path = os.path.join(server_dir, root, f)
+                        logging.info('cnc_file_path:%s' % cnc_file_path)
+                        cnc_processing.with_user(request.env.ref("base.user_admin")).write_file(cnc_file_path,
+                                                                                                cnc_processing)
 
     # 创建附件(nc文件)
     def attachment_create(self, name, data):
         attachment = self.env['ir.attachment'].create({
             'datas': base64.b64encode(data),
             'type': 'binary',
+            'public': True,
             'description': '程序文件',
             'name': name
         })
         return attachment
 
     # 将FTP的nc文件下载到临时目录
-    def download_file_tmp(self, model_code, processing_panel):
-        remotepath = os.path.join('/', model_code, 'return', processing_panel)
-        serverdir = os.path.join('/tmp', model_code, 'return', processing_panel)
-        ftp = FtpController()
-        ftp.download_file_tree(remotepath, serverdir)
-        return serverdir
+    def download_file_tmp(self, production_no, processing_panel):
+        remotepath = os.path.join('/', production_no, 'return', processing_panel)
+        serverdir = os.path.join('/tmp', production_no, 'return', processing_panel)
+        ftp_resconfig = self.env['res.config.settings'].get_values()
+        ftp = FtpController(str(ftp_resconfig['ftp_host']), int(ftp_resconfig['ftp_port']), ftp_resconfig['ftp_user'],
+                            ftp_resconfig['ftp_password'])
+        download_state = ftp.download_file_tree(remotepath, serverdir)
+        return download_state
 
     # 将nc文件存到attach的datas里
     def write_file(self, nc_file_path, cnc):

sf_manufacturing/models/res_user.py

@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+from odoo import SUPERUSER_ID, _, api, fields, models, registry
+
+class Users(models.Model):
+    _inherit = 'res.users'
+
+    workcenter_ids = fields.Many2many("mrp.workcenter", 'users_workcenter')

sf_manufacturing/models/stock.py

@@ -66,9 +66,12 @@ class StockRule(models.Model):
         list2 = []
         for item in procurements:
             num = int(item[0].product_qty)
-            product = self.env['product.template'].search(
-                ["&", ("name", '=', item[0].product_id.display_name), ('single_manufacturing', '!=', False)])
-            if product:
+
+            product = self.env['product.product'].search(
+                [("id", '=', item[0].product_id.id)])
+            product_tmpl = self.env['product.template'].search(
+                ["&", ("id", '=', product.product_tmpl_id.id), ('single_manufacturing', "!=", False)])
+            if product_tmpl:
                 if num > 1:
                     for no in range(1, num + 1):
                         Procurement = namedtuple('Procurement', ['product_id', 'product_qty',

sf_manufacturing/models/tray.py

@@ -20,6 +20,41 @@ class Tray(models.Model):
     def updateTrayState(self):
 
         if self.workorder_id != False:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
             self.state = '占用'
         else:
             self.state = '空闲'

sf_manufacturing/views/mrp_workcenter_views.xml

@@ -24,14 +24,16 @@
         </field>
     </record>
 
-      <record id="mrp_workcenter_view_kanban_inherit_workorder" model="ir.ui.view">
+    <record id="mrp_workcenter_view_kanban_inherit_workorder" model="ir.ui.view">
         <field name="name">mrp.workcenter.view.kanban.inherit.mrp.workorder</field>
         <field name="model">mrp.workcenter</field>
         <field name="inherit_id" ref="mrp.mrp_workcenter_kanban"/>
         <field name="arch" type="xml">
             <!-- Desktop view -->
             <xpath expr="//div[@name='o_wo']" position="inside">
-                <button class="btn btn-secondary fa fa-desktop" name="action_work_order" type="object" context="{'search_default_ready': 1, 'search_default_progress': 1, 'search_default_pending': 1, 'desktop_list_view': 1, 'search_default_workcenter_id': active_id}" title="Work orders" aria-label="Work orders"/>
+                <button class="btn btn-secondary fa fa-desktop" name="action_work_order" type="object"
+                        context="{'search_default_ready': 1, 'search_default_progress': 1, 'search_default_pending': 1, 'desktop_list_view': 1, 'search_default_workcenter_id': active_id}"
+                        title="Work orders" aria-label="Work orders"/>
             </xpath>
         </field>
     </record>
@@ -39,25 +41,46 @@
     <!-- override to change the no content image -->
     <record id="mrp.action_work_orders" model="ir.actions.act_window">
         <field name="help" type="html">
-          <p class="o_view_nocontent_workorder">
-            No work orders to do!
-          </p><p>
-            Work orders are operations to do as part of a manufacturing order.
-            Operations are defined in the bill of materials or added in the manufacturing order directly.
-          </p><p>
-            Use the table work center control panel to register operations in the shop floor directly.
-            The tablet provides worksheets for your workers and allow them to scrap products, track time,
-            launch a maintenance request, perform quality tests, etc.
-          </p>
+            <p class="o_view_nocontent_workorder">
+                No work orders to do!
+            </p>
+            <p>
+                Work orders are operations to do as part of a manufacturing order.
+                Operations are defined in the bill of materials or added in the manufacturing order directly.
+            </p>
+            <p>
+                Use the table work center control panel to register operations in the shop floor directly.
+                The tablet provides worksheets for your workers and allow them to scrap products, track time,
+                launch a maintenance request, perform quality tests, etc.
+            </p>
+        </field>
+    </record>
+    <record id="mrp_workcenter_kanban_action1" model="ir.actions.act_window">
+        <field name="name">Work Centers Overview</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">mrp.workcenter</field>
+        <field name="view_mode">kanban,form</field>
+        <field name="view_id" ref="mrp.mrp_workcenter_kanban"/>
+        <field name="search_view_id" ref="mrp.view_mrp_workcenter_search"/>
+        <field name="domain">[('users_ids','in',uid)]</field>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+                Create a new work center
+            </p>
+            <p>
+                Manufacturing operations are processed at Work Centers. A Work Center can be composed of
+                workers and/or machines, they are used for costing, scheduling, capacity planning, etc.
+                They can be defined via the configuration menu.
+            </p>
         </field>
     </record>
 
     <menuitem id="menu_mrp_dashboard"
-        name="工作中心概述"
-        action="mrp.mrp_workcenter_kanban_action"
-        groups="mrp.group_mrp_routings"
-        parent="mrp.menu_mrp_root"
-        sequence="5"/>
+              name="工作中心概述"
+              action="mrp_workcenter_kanban_action1"
+              groups="mrp.group_mrp_routings"
+              parent="mrp.menu_mrp_root"
+              sequence="5"/>
 
     <!-- MRP.WORKCENTER -->
     <record model="ir.ui.view" id="view_mrp_workcenter_form_inherit_sf">
@@ -79,6 +102,9 @@
                     </field>
                 </page>
             </xpath>
+            <xpath expr="//field[@name='company_id']" position="after">
+                <field name="users_ids" widget="many2many_tags" string="可操作用户"/>
+            </xpath>
 
             <xpath expr="//field[@name='alternative_workcenter_ids']" position="after">
                 <field name="machine_tool_id"/>

sf_manufacturing/views/mrp_workorder_view.xml

@@ -7,10 +7,41 @@
         <field name="arch" type="xml">
             <field name="name" position="before">
                 <field name="sequence"/>
+                <field name='user_permissions'/>
             </field>
             <field name="name" position="after">
                 <field name="processing_panel"/>
             </field>
+            <xpath expr="//button[@name='button_start']" position="attributes">
+                <attribute name="attrs">{'invisible': ['|', '|', '|','|', ('production_state','in', ('draft', 'done',
+                    'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel')),
+                    ('is_user_working', '!=', False),("user_permissions","=",False)]}
+                </attribute>
+            </xpath>
+            <xpath expr="//button[@name='%(mrp.act_mrp_block_workcenter_wo)d']" position="attributes">
+                <attribute name="attrs">{'invisible': [("user_permissions","=",False)]}   </attribute>
+                <attribute name="string">停工</attribute>
+            </xpath>
+            <xpath expr="//button[@name='action_open_wizard']" position="attributes">
+                <attribute name="invisible">1</attribute>
+
+            </xpath>
+            <!--             <button name="button_start" type="object" string="Start" class="btn-success"-->
+            <!--                  attrs="{'invisible': ['|', '|', '|', ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel')), ('is_user_working', '!=', False)]}"/>-->
+            <!--                <button name="button_pending" type="object" string="Pause" class="btn-warning"-->
+            <!--                  attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False)]}"/>-->
+            <!--                <button name="button_finish" type="object" string="Done" class="btn-success"-->
+            <!--                  attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False)]}"/>-->
+            <!--                     <button name="%(mrp.act_mrp_block_workcenter_wo)d" type="action" string="Block" context="{'default_workcenter_id': workcenter_id}" class="btn-danger"-->
+            <!--                  attrs="{'invisible': ['|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked')]}"/>-->
+            <!--                <button name="button_unblock" type="object" string="Unblock" context="{'default_workcenter_id': workcenter_id}" class="btn-danger"-->
+            <!--                  attrs="{'invisible': ['|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '!=', 'blocked')]}"/>-->
+            <!--                <button name="action_open_wizard" type="object" icon="fa-external-link" class="oe_edit_only"-->
+            <!--                        title="Open Work Order"/>-->
+            <tree position="attributes">
+                <attribute name="multi_edit"></attribute>
+                <attribute name="editable"></attribute>
+            </tree>
         </field>
     </record>
 
@@ -57,10 +88,18 @@
         <field name="model">mrp.workorder</field>
         <field name="inherit_id" ref="mrp.mrp_production_workorder_form_view_inherit"/>
         <field name="arch" type="xml">
+            <xpath expr="field[@name='is_user_working']" position="before">
+                <field name='user_permissions' invisible="1"/>
+            </xpath>
             <xpath expr="//page[last()]" position="after">
                 <page string="获取CNC加工程序" attrs='{"invisible": [("routing_type","!=","获取CNC加工程序")]}'>
                     <div class="col-12 col-lg-6 o_setting_box">
-                        <button type="object" class="oe_highlight" name="fetchCNC" string="获取CNC程序代码"/>
+                         <div class="col-12 col-lg-6 o_setting_box" style="white-space: nowrap">
+                            <button type="object" class="oe_highlight" name="fetchCNC" string="获取CNC程序代码"
+                                     attrs='{"invisible": ["|",("state","!=","progress"),("user_permissions","=",False)]}'/>
+                            <button type="object" class="oe_highlight disabled" name="fetchCNC" string="获取CNC程序代码"
+                                    attrs='{"invisible": ["|",("user_permissions","=",False),("programming_no","=",False)]}'/>
+                        </div>
                     </div>
                 </page>
 
@@ -71,12 +110,14 @@
                         <field name="routing_type" invisible="1"/>
                         <field name="processing_panel" readonly="1"/>
                         <field name="tray_code"/>
+                        <field name="tray_id" readonly="1"/>
 
                     </group>
-                     <div class="col-12 col-lg-6 o_setting_box">
-                            <button type="object" class="oe_highlight" name="gettray" string="绑定托盘"
-                                    attrs='{"invisible": [("production_id","=",False)]}'/>
-                        </div>
+                    <div class="col-12 col-lg-6 o_setting_box">
+                        <button type="object" class="oe_highlight" name="gettray" string="绑定托盘"
+                                attrs='{"invisible": ["|","|",("tray_id","!=",False),("state","!=","progress"),("production_id","=",False)]}'/>
+
+                    </div>
                 </page>
 
             </xpath>
@@ -185,7 +226,8 @@
                     </div>
 
                     <div class="col-12 col-lg-6 o_setting_box">
-                        <button type="object" class="oe_highlight" name="getcenter" string="计算定位"/>
+                        <button type="object" class="oe_highlight" name="getcenter" string="计算定位"
+                                attrs='{"invisible": ["|","|",("material_center_point","!=",False),("state","!=","progress"),("user_permissions","=",False)]}'/>
                     </div>
 
                     <group>
@@ -222,25 +264,26 @@
             <xpath expr="//page[last()]" position="after">
                 <page string="后置三元检测" attrs='{"invisible": [("routing_type","!=","后置三元质量检测")]}'>
                     <group>
-                        <field name="test_results" widget="selection" />
+                        <field name="test_results" widget="selection"/>
 
                     </group>
                     <div class="col-12 col-lg-6 o_setting_box">
-                            <button type="object" class="oe_highlight" name="recreateManufacturingOrWorkerOrder"
-                                    string="检测确认"/>
-                        </div>
+                        <button type="object" class="oe_highlight" name="recreateManufacturingOrWorkerOrder"
+                                string="检测确认" attrs='{"invisible": ["|",("state","!=","progress"),("user_permissions","=",False)]}'/>
+                    </div>
                 </page>
             </xpath>
             <xpath expr="//page[last()]" position="after">
                 <page string="解除装夹" attrs='{"invisible": [("routing_type","!=","解除装夹")]}'>
 
-                        <div class="col-12 col-lg-6 o_setting_box">
-                            <button type="object" class="oe_highlight" name="unbindtray" string="解除装夹"/>
-                        </div>
-                        <div class="col-12 col-lg-6 o_setting_box">
-                            <button type="action" class="oe_highlight" name="sf_manufacturing.label_sf_tray_code1"
-                                    string="打印标签"/>
-                        </div>
+                    <div class="col-12 col-lg-6 o_setting_box">
+                        <button type="object" class="oe_highlight" name="unbindtray" string="解除装夹"
+                                attrs='{"invisible": ["|",("state","!=","progress"),("user_permissions","=",False)]}'/>
+                    </div>
+                    <div class="col-12 col-lg-6 o_setting_box">
+                        <button type="action" class="oe_highlight" name="sf_manufacturing.label_sf_tray_code1"
+                                string="打印标签" attrs='{"invisible": ["|",("state","!=","progress"),("user_permissions","=",False)]}'/>
+                    </div>
 
                 </page>
             </xpath>