jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并下发已完成，正在增加下发记录对象

Browse Source
This commit is contained in:
mgw
2023-02-23 22:11:32 +08:00
parent 444e99b4cf
commit 5fbe834528
11 changed files with 206 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
sf_machine_connect/views/cnc.xml
View File

@@ -1,27 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<record id="sf_cnc_tree_view" model="ir.ui.view">
<field name="name">sf.cnc.tree</field>
<field name="model">sf.cnc.processing</field>
<field name="arch" type="xml">
<tree>
<field name="sequence_number"/>
<field name="program_name"/>
<field name="cnc_id" string="文件"/>
<field name="cutting_tool_name"/>
<field name="cutting_tool_no"/>
<field name="processing_type"/>
<field name="margin_x_y"/>
<field name="margin_z"/>
<field name="depth_of_processing_z"/>
<field name="cutting_tool_extension_length"/>
<field name="cutting_tool_handle_type"/>
<field name="estimated_processing_time"/>
<field name="remark"/>
</tree>
</field>
</record>
</odoo>

3
sf_machine_connect/views/compensation.xml
View File

@@ -22,8 +22,7 @@
<!-- <field name="button_up_all_state" attrs='{"invisible": ["|",-->
<!-- ("state","!=","progress"),("user_permissions","=",False)]}'/>-->
<button string="一键下发" name="up_all" type="object" style="text-align: right;" confirm="是否确认一键下发"
class="btn-primary" attrs='{"invisible": ["|",
("state","!=","progress"),("user_permissions","=",False)]}'/>
class="btn-primary" context="{'default_workorder_id': id}"/>
<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}"/>
</div>

28
sf_machine_connect/views/default_delivery.xml Normal file
View File

@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<record id="delivery_tree" model="ir.ui.view">
<field name="name">delivery.record.tree</field>
<field name="model">delivery.record</field>
<field name="arch" type="xml">
<tree>
<field name="delivery_type"/>
<field name="delivery_time"/>
<field name="influence_record"/>
</tree>
</field>
</record>
<record id="delivery_tree" model="ir.ui.view">
<field name="name">delivery.record.tree</field>
<field name="model">delivery.record</field>
<field name="arch" type="xml">
<form>
<field name="delivery_type"/>
<field name="delivery_time"/>
<field name="influence_record"/>
</form>
</field>
</record>
</odoo>

34
sf_machine_connect/views/delivery_record.xml
View File

@@ -8,25 +8,25 @@
<xpath expr="//page[last()-3]" position="before">
<!-- <page string="下发记录" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>-->
<page string="下发记录">
<group string="机床信息">
<field name="machine_tool_name"/>
<field name="machine_tool_type_id"/>
<field name="machine_tool_machine_ip"/>
</group>
<group string="运行信息">
<field name="machine_tool_timestamp"/>
<field name="machine_tool_status"/>
<field name="machine_tool_run_status"/>
<field name="machine_tool_time_on"/>
<field name="machine_tool_time_on_now"/>
<field name="machine_tool_tool_num"/>
<field name="machine_tool_program"/>
<field name="machine_tool_cut_status"/>
<field name="machine_tool_compensation_value_x"/>
<field name="machine_tool_compensation_value_y"/>
</group>
<field name="delivery_records">
<tree create="false">
<field name="delivery_type"/>
<field name="delivery_time"/>
<field name="influence_record"/>
</tree>
</field>
</page>
</xpath>
</field>
</record>
<!-- <record id="seqence_b_purchase_order" model='ir.sequence'> -->
<!-- <field name='name'>Purchase Order</field> -->
<!-- <field name='code'>sf_machine_connect.delivery.record</field> -->
<!-- <field name='prefix'>%(year)s%(month)s%(day)s</field> -->
<!-- <field name='padding'>5</field> -->
<!-- </record> -->
</odoo>

7
sf_machine_connect/views/ftp_button.xml
View File

@@ -15,9 +15,10 @@
<field name="state" invisible="1"/>
<field name="button_state" attrs='{"invisible": ["|",("state","!=","progress"),
("user_permissions","!=",True)]}' optional="show"/>
<button string="下发" name="up" type="object" class="btn-primary" confirm="是否确认下发此程序"
attrs='{"invisible": ["|",("state","!=","progress"),
("user_permissions","!=",True)]}'/>
<!-- <button string="下发" name="up" type="object" class="btn-primary" confirm="是否确认下发此程序" -->
<!-- attrs='{"invisible": ["|",("state","!=","progress"), -->
<!-- ("user_permissions","!=",True)]}'/> -->
<button string="下发" name="up" type="object" class="btn-primary" confirm="是否确认下发此程序" context="{'default_workorder_id': id}"/>
<!-- <button string="下发" name="up" type="object" class="btn-primary" confirm="是否确认下发此程序"/>-->
<!-- <button string="下发" name="up" type="object" class="btn-primary" confirm="是否确认下发此程序"-->
<!-- />-->

13
sf_machine_connect/views/project_sequence.xml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo noupdate="1">
<record id="seq_test" model="ir.sequence">
<field name="name">Test</field>
<field name="code">sf_machine_connect.delivery.record</field>
<field name="prefix">T%(range_year)s</field>
<field name="padding">4</field>
<field name="company_id" eval="False"/>
</record>
</odoo>