Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化生成工作日历记录功能
This commit is contained in:
yuxianghui
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0"?>
|
||||
<odoo>
|
||||
<!-- 设备类别 -->
|
||||
<!-- 设备类别 -->
|
||||
<record id="sf_maintenance_equipment_category" model="ir.ui.view">
|
||||
<field name="name">sf.maintenance.equipment.category</field>
|
||||
<field name="model">maintenance.equipment.category</field>
|
||||
@@ -19,50 +19,58 @@
|
||||
<field name="arch" type="xml">
|
||||
<data>
|
||||
<xpath expr="//field[@name='maintenance_team_id']" position="before">
|
||||
<field name="machine_tool_picture" widget="image" />
|
||||
<field name="machine_tool_picture" widget="image"/>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='category_id']" position="after">
|
||||
<field name="code" readonly="1"/>
|
||||
<field name="equipment_type"/>
|
||||
<field name="brand_id"/>
|
||||
<field name="type_id" attrs="{'invisible': [('equipment_type', '!=', '机床')]}"/>
|
||||
<field name="machine_tool_category" readonly="1" attrs="{'invisible': [('type_id', '=', False)]}" force_save="1"/>
|
||||
<field name="machine_tool_category" readonly="1" attrs="{'invisible': [('type_id', '=', False)]}"
|
||||
force_save="1"/>
|
||||
</xpath>
|
||||
<xpath expr="//page[@name='maintenance']" position="after">
|
||||
<page string="设备参数" name="sf_equipment" attrs="{'invisible': [('type_id', '=', False)]}">
|
||||
<group string="参数">
|
||||
<group>
|
||||
<field name="control_system_id" required="1" options="{'no_create': True}"/>
|
||||
<field name="workbench_L" required="1"/>
|
||||
<field name="workbench_W" required="1"/>
|
||||
<field name="machine_tool_L" required="1"/>
|
||||
<field name="machine_tool_W" required="1"/>
|
||||
<field name="machine_tool_H" required="1"/>
|
||||
<field name="knife_type" required="1"/>
|
||||
<field name="workpiece_load" required="1"/>
|
||||
<field name="lead_screw" required="1"/>
|
||||
<field name="taper" required="1"/>
|
||||
<field name="torque" required="1"/>
|
||||
<field name="motor_power" required="1"/>
|
||||
|
||||
<field name="knife_type" />
|
||||
<field name="workpiece_load"/>
|
||||
<field name="lead_screw"/>
|
||||
<field name="workbench_L"/>
|
||||
<field name="workbench_W"/>
|
||||
<field name="taper"/>
|
||||
<field name="torque"/>
|
||||
<field name="motor_power"/>
|
||||
<field name="tool_quality_max"/>
|
||||
<field name="tool_long_max"/>
|
||||
<field name="number_of_knife_library" required="1" options="{'format': false}"/>
|
||||
<field name="number_of_axles" widget="radio" options="{'horizontal': true}"/>
|
||||
<field name="number_of_axles" required="1" widget="radio"
|
||||
options="{'horizontal': true}"/>
|
||||
<label for="x_axis" string="加工行程(mm)"
|
||||
attrs="{'invisible': [('number_of_axles', '=', False)]}"/>
|
||||
<div class="o_address_format"
|
||||
<div class="test_model"
|
||||
attrs="{'invisible': [('number_of_axles', '=', False)]}">
|
||||
<label for="x_axis" string="x"/>
|
||||
<field name="x_axis" class="o_address_city" required="1"
|
||||
<field name="x_axis" class="o_address_zip" required="1"
|
||||
options="{'format': false}"/>
|
||||
<span>&nbsp;</span>
|
||||
<label for="y_axis" string="y"/>
|
||||
<field name="y_axis" class="o_address_zip" required="1"
|
||||
options="{'format': false}"/>
|
||||
<span>&nbsp;</span>
|
||||
<label for="z_axis" string="z"/>
|
||||
<field name="z_axis" class="o_address_zip" required="1"
|
||||
options="{'format': false}"/>
|
||||
<br></br>
|
||||
<label for="b_axis" string="b"
|
||||
attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"/>
|
||||
<field name="b_axis" class="o_address_city" required="1"
|
||||
<field name="b_axis" class="o_address_zip" required="1"
|
||||
attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"
|
||||
options="{'format': false}"/>
|
||||
<span>&nbsp;</span>
|
||||
<label for="c_axis" string="c"
|
||||
attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"/>
|
||||
<field name="c_axis" class="o_address_zip" required="1"
|
||||
@@ -71,22 +79,24 @@
|
||||
</div>
|
||||
</group>
|
||||
<group>
|
||||
<field name="heightened_way" required="1"/>
|
||||
<field name="tool_quality_max" required="1"/>
|
||||
<field name="tool_long_max" required="1"/>
|
||||
<field name="tool_diameter_max" required="1"/>
|
||||
<field name="guide_rail" required="1"/>
|
||||
|
||||
<field name="feed_speed" required="1"/>
|
||||
<field name="tool_speed" required="1"/>
|
||||
<field name="distance" required="1"/>
|
||||
<field name="rotate_speed" string="主轴转速(min)" required="1"
|
||||
options="{'format': false}"/>
|
||||
<field name="precision" required="1" string="X轴定位精度(mm)(mm)"/>
|
||||
|
||||
<field name="guide_rail"/>
|
||||
<field name="machine_tool_L"/>
|
||||
<field name="machine_tool_W"/>
|
||||
<field name="machine_tool_H"/>
|
||||
|
||||
<field name="feed_speed"/>
|
||||
<field name="tool_speed"/>
|
||||
<field name="distance"/>
|
||||
<field name="rotate_speed" required="1" string="转速(min)" options="{'format': false}"/>
|
||||
<field name="precision" required="1" string="加工精度(mm)"/>
|
||||
<field name="control_system_id" required="1" options="{'no_create': True}"/>
|
||||
<field name="state" widget="selection"/>
|
||||
</group>
|
||||
</group>
|
||||
<group string="其它">
|
||||
<field name="remark"/>
|
||||
</group>
|
||||
</page>
|
||||
<page string="其他">
|
||||
<group string="其他">
|
||||
@@ -155,29 +165,26 @@
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- <menuitem-->
|
||||
<!-- id="menu_maintenance_title_sf"-->
|
||||
<!-- name="设备管理"-->
|
||||
<!-- web_icon="maintenance,static/description/icon.svg"-->
|
||||
<!-- sequence="160"/>-->
|
||||
<!-- <menuitem-->
|
||||
<!-- id="menu_maintenance_title_sf"-->
|
||||
<!-- name="设备管理"-->
|
||||
<!-- web_icon="maintenance,static/description/icon.svg"-->
|
||||
<!-- sequence="160"/>-->
|
||||
|
||||
<record id="maintenance.menu_maintenance_title" model="ir.ui.menu">
|
||||
<field name="name">设备管理</field>
|
||||
</record>
|
||||
|
||||
<record id="maintenance.menu_m_request" model="ir.ui.menu">
|
||||
<record id="maintenance.menu_m_request" model="ir.ui.menu">
|
||||
<field name="name">设备管理</field>
|
||||
</record>
|
||||
|
||||
<!-- <menuitem-->
|
||||
<!-- id="menu_m_request"-->
|
||||
<!-- name="设备管理"-->
|
||||
<!-- parent="menu_maintenance_title_sf"-->
|
||||
<!-- groups="maintenance.group_equipment_manager,base.group_user"-->
|
||||
<!-- sequence="1"/>-->
|
||||
|
||||
|
||||
|
||||
<!-- <menuitem-->
|
||||
<!-- id="menu_m_request"-->
|
||||
<!-- name="设备管理"-->
|
||||
<!-- parent="menu_maintenance_title_sf"-->
|
||||
<!-- groups="maintenance.group_equipment_manager,base.group_user"-->
|
||||
<!-- sequence="1"/>-->
|
||||
|
||||
|
||||
</odoo>
|
||||
@@ -61,7 +61,7 @@ class ResWorkcenter(models.Model):
|
||||
AND equipment_id IS NOT NULL
|
||||
AND maintenance_equipment.workcenter_id IS NOT NULL
|
||||
AND maintenance_equipment.workcenter_id IN %s
|
||||
AND (schedule_date, schedule_date + INT ERVAL '1h' * duration) OVERLAPS (%s, %s)
|
||||
AND (schedule_date, schedule_date + INTERVAL '1 hour') OVERLAPS (%s, %s)
|
||||
GROUP BY maintenance_equipment.workcenter_id;
|
||||
"""
|
||||
self.env.cr.execute(sql, [tuple(self.ids), fields.Datetime.to_string(start_datetime.astimezone()),
|
||||
|
||||
@@ -4,5 +4,17 @@
|
||||
<record id="mrp.menu_mrp_manufacturing" model="ir.ui.menu">
|
||||
<field name="name">计划管理</field>
|
||||
</record>
|
||||
|
||||
<record id="mrp_workorder.mrp_workorder_menu_planning" model="ir.ui.menu">
|
||||
<field name="name">工单计划</field>
|
||||
<field name="sequence" eval="300"/>
|
||||
<field name="parent_id" ref="mrp.menu_mrp_manufacturing"/>
|
||||
</record>
|
||||
|
||||
<record id="mrp.mrp_planning_menu_root" model="ir.ui.menu">
|
||||
<field name="active" eval="False"/>
|
||||
</record>
|
||||
|
||||
|
||||
</data>
|
||||
</odoo>
|
||||
Reference in New Issue
Block a user