优化工单页面和下发编程单接口

sf_machine_connect/views/compensation.xml

@@ -5,10 +5,10 @@
         <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" attrs='{"invisible": ["|",
-                                    ("user_permissions","=",False),("routing_type","!=","CNC加工")]}'/>
-            </xpath>
+<!--            <xpath expr="//header" position="inside">-->
+<!--                <button string="程序下载" name="cnc_file_download" type="object" class="oe_highlight" attrs='{"invisible": ["|",-->
+<!--                                    ("user_permissions","=",False),("routing_type","!=","CNC加工")]}'/>-->
+<!--            </xpath>-->
                 <xpath expr="//page//field[@name='cnc_ids']" position="before">
                     <group>
                         <group>
@@ -19,21 +19,21 @@
                             <div>
                                 <field name="button_compensation_state" attrs='{"invisible": ["|",
                                     ("state","!=","progress"),("user_permissions","=",False)]}'/>
-                                <button string="一键补偿" name="compensation" type="object" confirm="是否确认下发补偿"
-                                    class="btn-primary" attrs='{"invisible": ["|",
-                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>
-                                <span>&#32;</span>
-                                <button string="一键下发" name="up_all" type="object" style="text-align: right;" confirm="是否确认一键下发"
-                                    class="btn-primary" context="{'default_workorder_id': id}"  attrs='{"invisible": ["|",
-                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>
-                                <span>&#32;</span>
-                                <button string="合并下发" id="action_up_select" name="%(sf_machine_connect.action_up_select)d"
-                                type="action" class="btn-primary" context="{'default_workorder_id': id}"  attrs='{"invisible": ["|",
-                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>
-                                <span>&#32;</span>
-                                <button string="一键合并下发" name="up_merge_all" type="object" style="text-align: right;" confirm="是否确认一键合并下发"
-                                    class="btn-primary" context="{'default_workorder_id': id}"  attrs='{"invisible": ["|",
-                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>
+<!--                                <button string="一键补偿" name="compensation" type="object" confirm="是否确认下发补偿"-->
+<!--                                    class="btn-primary" attrs='{"invisible": ["|",-->
+<!--                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>-->
+<!--                                <span>&#32;</span>-->
+<!--                                <button string="一键下发" name="up_all" type="object" style="text-align: right;" confirm="是否确认一键下发"-->
+<!--                                    class="btn-primary" context="{'default_workorder_id': id}"  attrs='{"invisible": ["|",-->
+<!--                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>-->
+<!--                                <span>&#32;</span>-->
+<!--                                <button string="合并下发" id="action_up_select" name="%(sf_machine_connect.action_up_select)d"-->
+<!--                                type="action" class="btn-primary" context="{'default_workorder_id': id}"  attrs='{"invisible": ["|",-->
+<!--                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>-->
+<!--                                <span>&#32;</span>-->
+<!--                                <button string="一键合并下发" name="up_merge_all" type="object" style="text-align: right;" confirm="是否确认一键合并下发"-->
+<!--                                    class="btn-primary" context="{'default_workorder_id': id}"  attrs='{"invisible": ["|",-->
+<!--                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>-->
                             </div>
                         </div>
                     </group>

sf_manufacturing/security/ir.model.access.csv

@@ -3,7 +3,7 @@ access_sf_cnc_processing_group_sf_mrp_user,sf_cnc_processing,model_sf_cnc_proces
 access_sf_cnc_processing_manager,sf_cnc_processing,model_sf_cnc_processing,sf_base.group_sf_mrp_manager,1,1,1,0
 access_sf_cmm_program_group_sf_mrp_user,sf_cmm_program_group_sf_mrp_user,model_sf_cmm_program,sf_base.group_sf_mrp_user,1,0,0,0
 access_sf_cmm_program_group_sf_mrp_manager,sf_cmm_program_group_sf_mrp_manager,model_sf_cmm_program,sf_base.group_sf_mrp_manager,1,0,0,0
-access_sf_cmm_program_admin,sf_cmm_program_admin,model_sf_cmm_program,base.group_system,1,1,1,0
+access_sf_cmm_program_admin,sf_cmm_program_admin,model_sf_cmm_program,base.group_system,1,1,1,1
 access_sf_model_type_group_sf_mrp_user,sf_model_type,model_sf_model_type,sf_base.group_sf_mrp_user,1,0,0,0
 access_sf_model_type_admin,sf_model_type_admin,model_sf_model_type,base.group_system,1,1,1,0
 access_sf_model_type_manager,sf_model_type,model_sf_model_type,sf_base.group_sf_mrp_manager,1,1,1,0

sf_manufacturing/views/mrp_workorder_view.xml

@@ -218,9 +218,6 @@
                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
                     <field name="functional_fixture_type_id"
                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
-                    <field name="rfid_code" force_save="1" readonly="1" cache="True"
-                           attrs="{'invisible': [('rfid_code_old', '!=', False)]}"/>
-                    <field name="rfid_code_old" readonly="1" attrs="{'invisible': [('rfid_code_old', '=', False)]}"/>
                 </group>
                 <!--                <group>-->
                 <!--                    <div>-->
@@ -500,7 +497,8 @@
             </xpath>
             <xpath expr="//page[1]" position="before">
                 <page string="CNC程序" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
-                    <field name="cnc_ids" widget="one2many" string="工作程序" default_order="sequence_number,id">
+                    <field name="cnc_ids" widget="one2many" string="工作程序" default_order="sequence_number,id"
+                           readonly="1">
                         <tree decoration-success="button_state" decoration-bf="button_state">
                             <field name="sequence_number"/>
                             <field name="program_name"/>
@@ -513,8 +511,10 @@
                             <field name="cutting_tool_extension_length"/>
                             <field name="cutting_tool_handle_type"/>
                             <field name="estimated_processing_time"/>
+                            <field name="program_path"/>
+                            <field name="program_create_date"/>
                             <field name="remark"/>
-                            <field name="button_state" invisible="1"/>
+<!--                            <field name="button_state" invisible="1"/>-->
                         </tree>
                     </field>
                     <group>
@@ -522,7 +522,7 @@
                     </group>
                 </page>
                 <page string="CMM程序" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
-                    <field name="cmm_ids" widget="one2many" string="CMM程序">
+                    <field name="cmm_ids" widget="one2many" string="CMM程序" readonly="1">
                         <tree>
                             <field name="sequence_number"/>
                             <field name="program_name"/>
@@ -558,8 +558,8 @@
             </xpath>
             <xpath expr="//form//sheet//group//group//div[3]" position="after">
                 <field name="is_ok"/>
-                <field name="processing_user_id"/>
-                <field name="inspection_user_id"/>
+                <!--                <field name="processing_user_id"/>-->
+                <!--                <field name="inspection_user_id"/>-->
                 <field name="save_name" widget="CopyClipboardChar"
                        attrs="{'invisible':[('routing_type','!=','装夹预调')]}"/>
                 <label for="material_length" string="物料尺寸"/>
@@ -574,6 +574,9 @@
                     <field name="material_height" class="o_address_zip"/>
                 </div>
                 <field name="part_number" string="成品的零件图号"/>
+                <field name="rfid_code" force_save="1" readonly="1" cache="True"
+                       attrs="{'invisible': [('rfid_code_old', '!=', False)]}"/>
+                <field name="rfid_code_old" readonly="1" attrs="{'invisible': [('rfid_code_old', '=', False)]}"/>
             </xpath>
         </field>
     </record>

sf_mrs_connect/controllers/controllers.py

@@ -24,27 +24,25 @@ class Sf_Mrs_Connect(http.Controller):
             ret = json.loads(datas)
             ret = json.loads(ret['result'])
             logging.info('下发编程单:%s' % ret)
-            is_delete_file = False
             productions = request.env['mrp.production'].with_user(
                 request.env.ref("base.user_admin")).search(
                 [('programming_no', '=', ret['programming_no'])])
             if productions:
                 # 拉取所有加工面的程序文件
                 for r in ret['processing_panel'].split(','):
-                    if is_delete_file is True:
-                        program_path_tmp_r = os.path.join('/tmp', ret['folder_name'], 'return', r)
-                        files_r = os.listdir(program_path_tmp_r)
-                        if files_r:
-                            for file_name in files_r:
-                                file_path = os.path.join(program_path_tmp_r, file_name)
-                                os.remove(file_path)
-                    download_state = request.env['sf.cnc.processing'].with_user(
-                        request.env.ref("base.user_admin")).download_file_tmp(
-                        ret['folder_name'], r)
-                    if download_state == 0:
-                        res['status'] = -2
-                        res['message'] = '制造订单号为%s的CNC程序文件从FTP拉取失败' % (cnc_production.name)
-                        return json.JSONEncoder().encode(res)
+                    program_path_tmp_r = os.path.join('/tmp', ret['folder_name'], 'return', r)
+                    files_r = os.listdir(program_path_tmp_r)
+                    if files_r:
+                        for file_name in files_r:
+                            file_path = os.path.join(program_path_tmp_r, file_name)
+                            os.remove(file_path)
+                download_state = request.env['sf.cnc.processing'].with_user(
+                    request.env.ref("base.user_admin")).download_file_tmp(
+                    ret['folder_name'], r)
+                if download_state == 0:
+                    res['status'] = -2
+                    res['message'] = '制造订单号为%s的CNC程序文件从FTP拉取失败' % (cnc_production.name)
+                    return json.JSONEncoder().encode(res)
                 for production in productions:
                     if not production.workorder_ids:
                         production.product_id.model_processing_panel = ret['processing_panel']
@@ -56,11 +54,13 @@ class Sf_Mrs_Connect(http.Controller):
                                 lambda ac: ac.routing_type == 'CNC加工' and ac.state not in ['progress', 'done',
                                                                                              'cancel'] and ac.processing_panel == panel)
                             if cnc_workorder:
-                                if is_delete_file is True:
+                                if cnc_workorder.cnc_ids:
                                     cnc_workorder.cmm_ids.sudo().unlink()
                                     cnc_workorder.cnc_ids.sudo().unlink()
                                     request.env['sf.cam.work.order.program.knife.plan'].sudo().unlink_cam_plan(
                                         production)
+                                # program_path_tmp_panel = os.path.join('C://Users//43484//Desktop//fsdownload//test',
+                                #                                       panel)
                                 program_path_tmp_panel = os.path.join('/tmp', ret['folder_name'], 'return', panel)
                                 logging.info('program_path_tmp_panel:%s' % program_path_tmp_panel)
                                 files_panel = os.listdir(program_path_tmp_panel)