合并代码
This commit is contained in:
gqh
@@ -12,7 +12,7 @@
|
||||
<notebook>
|
||||
<page string="机床监控">
|
||||
<!-- <group string="监控">-->
|
||||
<group>
|
||||
<group col='12'>
|
||||
<field name="timestamp"/>
|
||||
<field name="signed"/>
|
||||
<field name="status"/>
|
||||
@@ -24,79 +24,108 @@
|
||||
<!-- <field name="cut_time"/>-->
|
||||
<field name="program"/>
|
||||
<field name="tool_num"/>
|
||||
<!-- <div class="o_address_format">-->
|
||||
<!-- <label for="tool_num_process_time1" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time1" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time2" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time2" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time3" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time3" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time4" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time4" class="o_form_label"/>-->
|
||||
<!-- <div></div>-->
|
||||
<!-- <label for="tool_num_process_time5" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time5" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time6" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time6" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time7" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time7" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time8" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time8" class="o_form_label"/>-->
|
||||
<!-- <div></div>-->
|
||||
<!-- <label for="tool_num_process_time9" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time9" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time10" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time10" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time11" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time11" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time12" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time12" class="o_form_label"/>-->
|
||||
<!-- <div></div>-->
|
||||
<!-- <label for="tool_num_process_time13" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time13" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time14" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time14" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time15" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time15" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time16" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time16" class="o_form_label"/>-->
|
||||
<!-- <div></div>-->
|
||||
<!-- <label for="tool_num_process_time17" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time17" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time18" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time18" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time19" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time19" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time20" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time20" class="o_form_label"/>-->
|
||||
<!-- <div></div>-->
|
||||
<!-- <label for="tool_num_process_time21" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time21" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time22" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time22" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time23" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time23" class="o_form_label"/>-->
|
||||
<!-- <span>&nbsp;</span>-->
|
||||
<!-- <label for="tool_num_process_time24" string="刀位1"/>-->
|
||||
<!-- <field name="tool_num_process_time24" class="o_form_label"/>-->
|
||||
<!-- </div>-->
|
||||
<field name="spindle_speed"/>
|
||||
|
||||
</group>
|
||||
<group string='刀位统计' col='8'>
|
||||
<field name="tool_num_process_time1"/>
|
||||
<field name="tool_num_process_time2"/>
|
||||
<field name="tool_num_process_time3"/>
|
||||
<field name="tool_num_process_time4"/>
|
||||
<field name="tool_num_process_time5"/>
|
||||
<field name="tool_num_process_time6"/>
|
||||
<field name="tool_num_process_time7"/>
|
||||
<field name="tool_num_process_time8"/>
|
||||
<field name="tool_num_process_time9"/>
|
||||
<field name="tool_num_process_time10"/>
|
||||
<field name="tool_num_process_time11"/>
|
||||
<field name="tool_num_process_time12"/>
|
||||
<field name="tool_num_process_time13"/>
|
||||
<field name="tool_num_process_time14"/>
|
||||
<field name="tool_num_process_time15"/>
|
||||
<field name="tool_num_process_time16"/>
|
||||
<field name="tool_num_process_time17"/>
|
||||
<field name="tool_num_process_time18"/>
|
||||
<field name="tool_num_process_time19"/>
|
||||
<field name="tool_num_process_time20"/>
|
||||
<field name="tool_num_process_time21"/>
|
||||
<field name="tool_num_process_time22"/>
|
||||
<field name="tool_num_process_time23"/>
|
||||
<field name="tool_num_process_time24"/>
|
||||
|
||||
<!-- <div class="o_address_format"> -->
|
||||
<!-- <label for="tool_num_process_time1" string="刀位1"/> -->
|
||||
<!-- <field name="tool_num_process_time1" class="o_form_label"/> -->
|
||||
<!-- <span>&nbsp;</span> -->
|
||||
<!-- <label for="tool_num_process_time2" string="刀位2"/> -->
|
||||
<!-- <field name="tool_num_process_time2" class="o_form_label"/> -->
|
||||
<!-- <span>&nbsp;</span> -->
|
||||
<!-- <label for="tool_num_process_time3" string="刀位3"/> -->
|
||||
<!-- <field name="tool_num_process_time3" class="o_form_label"/> -->
|
||||
<!-- <span>&nbsp;</span> -->
|
||||
<!-- <label for="tool_num_process_time4" string="刀位4"/> -->
|
||||
<!-- <field name="tool_num_process_time4" class="o_form_label"/> -->
|
||||
<!-- <div></div> -->
|
||||
<!-- <label for="tool_num_process_time5" string="刀位5"/> -->
|
||||
<!-- <field name="tool_num_process_time5" class="o_form_label"/> -->
|
||||
<!-- <span>&nbsp;</span> -->
|
||||
<!-- <label for="tool_num_process_time6" string="刀位6"/> -->
|
||||
<!-- <field name="tool_num_process_time6" class="o_form_label"/> -->
|
||||
<!-- <span>&nbsp;</span> -->
|
||||
<!-- <label for="tool_num_process_time7" string="刀位7"/> -->
|
||||
<!-- <field name="tool_num_process_time7" class="o_form_label"/> -->
|
||||
<!-- <span>&nbsp;</span> -->
|
||||
<!-- <label for="tool_num_process_time8" string="刀位8"/> -->
|
||||
<!-- <field name="tool_num_process_time8" class="o_form_label"/> -->
|
||||
<!-- <div></div> -->
|
||||
<!-- <label for="tool_num_process_time9" string="刀位9"/> -->
|
||||
<!-- <field name="tool_num_process_time9" class="o_form_label"/> -->
|
||||
<!-- <span>&nbsp;</span> -->
|
||||
<!-- <label for="tool_num_process_time10" string="刀位10"/> -->
|
||||
<!-- <field name="tool_num_process_time10" class="o_form_label"/> -->
|
||||
<!-- <span>&nbsp;</span> -->
|
||||
<!-- <label for="tool_num_process_time11" string="刀位11"/> -->
|
||||
<!-- <field name="tool_num_process_time11" class="o_form_label"/> -->
|
||||
<!-- <span>&nbsp;</span> -->
|
||||
<!-- <label for="tool_num_process_time12" string="刀位12"/> -->
|
||||
<!-- <field name="tool_num_process_time12" class="o_form_label"/> -->
|
||||
<!-- <div></div> -->
|
||||
<!-- <label for="tool_num_process_time13" string="刀位13"/> -->
|
||||
<!-- <field name="tool_num_process_time13" class="o_form_label"/> -->
|
||||
<!-- <span>&nbsp;</span> -->
|
||||
<!-- <label for="tool_num_process_time14" string="刀位14"/> -->
|
||||
<!-- <field name="tool_num_process_time14" class="o_form_label"/> -->
|
||||
<!-- <span>&nbsp;</span> -->
|
||||
<!-- <label for="tool_num_process_time15" string="刀位15"/> -->
|
||||
<!-- <field name="tool_num_process_time15" class="o_form_label"/> -->
|
||||
<!-- <span>&nbsp;</span> -->
|
||||
<!-- <label for="tool_num_process_time16" string="刀位16"/> -->
|
||||
<!-- <field name="tool_num_process_time16" class="o_form_label"/> -->
|
||||
<!-- <div></div> -->
|
||||
<!-- <label for="tool_num_process_time17" string="刀位17"/> -->
|
||||
<!-- <field name="tool_num_process_time17" class="o_form_label"/> -->
|
||||
<!-- <span>&nbsp;</span> -->
|
||||
<!-- <label for="tool_num_process_time18" string="刀位18"/> -->
|
||||
<!-- <field name="tool_num_process_time18" class="o_form_label"/> -->
|
||||
<!-- <span>&nbsp;</span> -->
|
||||
<!-- <label for="tool_num_process_time19" string="刀位19"/> -->
|
||||
<!-- <field name="tool_num_process_time19" class="o_form_label"/> -->
|
||||
<!-- <span>&nbsp;</span> -->
|
||||
<!-- <label for="tool_num_process_time20" string="刀位20"/> -->
|
||||
<!-- <field name="tool_num_process_time20" class="o_form_label"/> -->
|
||||
<!-- <div></div> -->
|
||||
<!-- <label for="tool_num_process_time21" string="刀位21"/> -->
|
||||
<!-- <field name="tool_num_process_time21" class="o_form_label"/> -->
|
||||
<!-- <span>&nbsp;</span> -->
|
||||
<!-- <label for="tool_num_process_time22" string="刀位22"/> -->
|
||||
<!-- <field name="tool_num_process_time22" class="o_form_label"/> -->
|
||||
<!-- <span>&nbsp;</span> -->
|
||||
<!-- <label for="tool_num_process_time23" string="刀位23"/> -->
|
||||
<!-- <field name="tool_num_process_time23" class="o_form_label"/> -->
|
||||
<!-- <span>&nbsp;</span> -->
|
||||
<!-- <label for="tool_num_process_time24" string="刀位24"/> -->
|
||||
<!-- <field name="tool_num_process_time24" class="o_form_label"/> -->
|
||||
<!-- </div> -->
|
||||
</group>
|
||||
</page>
|
||||
<page string="机床配置">
|
||||
@@ -126,14 +155,86 @@
|
||||
<field name="machine_cut_status"/>
|
||||
<field name="machine_emg_status"/>
|
||||
<field name="machine_mode"/>
|
||||
<field name="machine_spindle_speed"/>
|
||||
</group>
|
||||
|
||||
</group>
|
||||
</page>
|
||||
<page string="刀位配置">
|
||||
<!-- <group string="机床配置">-->
|
||||
<group>
|
||||
<field name="tool_num1"/>
|
||||
<field name="tool_num2"/>
|
||||
<field name="tool_num3"/>
|
||||
<field name="tool_num4"/>
|
||||
<field name="tool_num5"/>
|
||||
<field name="tool_num6"/>
|
||||
<field name="tool_num7"/>
|
||||
<field name="tool_num8"/>
|
||||
<field name="tool_num9"/>
|
||||
<field name="tool_num10"/>
|
||||
<field name="tool_num11"/>
|
||||
<field name="tool_num12"/>
|
||||
<field name="tool_num13"/>
|
||||
<field name="tool_num14"/>
|
||||
<field name="tool_num15"/>
|
||||
<field name="tool_num16"/>
|
||||
<field name="tool_num17"/>
|
||||
<field name="tool_num18"/>
|
||||
<field name="tool_num19"/>
|
||||
<field name="tool_num20"/>
|
||||
<field name="tool_num21"/>
|
||||
<field name="tool_num22"/>
|
||||
<field name="tool_num23"/>
|
||||
<field name="tool_num24"/>
|
||||
</group>
|
||||
|
||||
</page>
|
||||
</notebook>
|
||||
|
||||
|
||||
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
<record id="view_cutting_tool_inherited" model="ir.ui.view">
|
||||
<field name="name">sf_cutting_tool_extension</field>
|
||||
<field name="model">sf.cutting_tool.type</field>
|
||||
<field name="inherit_id" ref="sf_base.form_sf_cutting_tool_type"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//form//group" position="after">
|
||||
<group string='刀具寿命'>
|
||||
<group>
|
||||
<field name="total_cut_time"/>
|
||||
<field name="tool_position"/>
|
||||
|
||||
</group>
|
||||
<group>
|
||||
<field name="predict_life_time"/>
|
||||
|
||||
</group>
|
||||
|
||||
<div>
|
||||
|
||||
<div>
|
||||
<field name='is_connect_tool_position' invisible='1'/>
|
||||
<button string="绑定刀位" name="tool_connect_machine" type="object" confirm="是否确认绑定此刀位"
|
||||
class="btn-primary"/>
|
||||
<!-- attrs='{"invisible": [("is_connect_tool_position","!=", -->
|
||||
<!-- "False")]}' -->
|
||||
<span> </span>
|
||||
<button string="解绑刀位" name="tool_unconnect_machine" type="object" confirm="是否解绑此刀位"
|
||||
class="btn-primary"/>
|
||||
<!-- attrs='{"invisible": [("is_connect_tool_position","!=", -->
|
||||
<!-- "False")]}' -->
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</group>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
Reference in New Issue
Block a user