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

Merge branch 'master' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into release/release1.0

Browse Source 
# Conflicts:
#	sf_base/__init__.py
#	sf_base/__manifest__.py
#	sf_base/commons/__init__.py
#	sf_base/commons/common.py
#	sf_base/models/__init__.py
#	sf_base/models/base.py
#	sf_base/models/common.py
#	sf_base/security/group_security.xml
#	sf_base/security/ir.model.access.csv
#	sf_base/views/base_view.xml
#	sf_base/views/common_view.xml
#	sf_base/views/menu_view.xml
#	sf_bf_connect/__init__.py
#	sf_bf_connect/__manifest__.py
#	sf_bf_connect/controllers/__init__.py
#	sf_bf_connect/controllers/controllers.py
#	sf_bf_connect/models/__init__.py
#	sf_bf_connect/models/http.py
#	sf_bf_connect/models/models.py
#	sf_bf_connect/models/process_status.py
#	sf_bf_connect/views/res_partner_view.xml
#	sf_dlm/__manifest__.py
#	sf_dlm/data/product_data.xml
#	sf_dlm/models/__init__.py
#	sf_dlm/models/product_supplierinfo.py
#	sf_dlm/views/product_template_view.xml
#	sf_machine_connect/__init__.py
#	sf_machine_connect/__manifest__.py
#	sf_machine_connect/models/__init__.py
#	sf_machine_connect/models/ftp_client.py
#	sf_machine_connect/models/ftp_operate.py
#	sf_machine_connect/models/py2opcua.py
#	sf_machine_connect/security/ir.model.access.csv
#	sf_machine_connect/views/SfWorkOrderBarcodes.xml
#	sf_machine_connect/views/WorkCenterBarcodes.xml
#	sf_machine_connect/views/compensation.xml
#	sf_machine_connect/views/default_delivery.xml
#	sf_machine_connect/views/delivery_record.xml
#	sf_machine_connect/views/ftp_button.xml
#	sf_machine_connect/views/machine_info_present.xml
#	sf_machine_connect/views/machine_monitor.xml
#	sf_machine_connect/wizard/__init__.py
#	sf_machine_connect/wizard/action_up.py
#	sf_manufacturing/__init__.py
#	sf_manufacturing/__manifest__.py
#	sf_manufacturing/models/__init__.py
#	sf_manufacturing/models/model_type.py
#	sf_manufacturing/models/mrp_maintenance.py
#	sf_manufacturing/models/mrp_production.py
#	sf_manufacturing/models/mrp_routing_workcenter.py
#	sf_manufacturing/models/mrp_workcenter.py
#	sf_manufacturing/models/mrp_workorder.py
#	sf_manufacturing/models/res_user.py
#	sf_manufacturing/models/stock.py
#	sf_manufacturing/security/group_security.xml
#	sf_manufacturing/security/ir.model.access.csv
#	sf_manufacturing/views/model_type_view.xml
#	sf_manufacturing/views/mrp_routing_workcenter_view.xml
#	sf_manufacturing/views/mrp_workcenter_views.xml
#	sf_manufacturing/views/mrp_workorder_view.xml
#	sf_mrs_connect/__init__.py
#	sf_mrs_connect/__manifest__.py
#	sf_mrs_connect/controllers/controllers.py
#	sf_mrs_connect/data/ir_cron_data.xml
#	sf_mrs_connect/models/__init__.py
#	sf_mrs_connect/models/ftp_operate.py
#	sf_mrs_connect/models/res_config_setting.py
#	sf_mrs_connect/models/sync_common.py
#	sf_mrs_connect/views/res_config_settings_views.xml
#	sf_sale/__init__.py
#	sf_sale/__manifest__.py
#	sf_sale/models/__init__.py
#	sf_sale/models/sale_order.py
#	sf_sale/views/sale_order_view.xml
#	yizuo_login_background_and_styles/__manifest__.py
#	yizuo_login_background_and_styles/controllers/main.py
#	yizuo_login_background_and_styles/models/login_image.py
#	yizuo_login_background_and_styles/models/res_config_settings.py
This commit is contained in:
mgw
2024-05-18 22:39:05 +08:00
parent 5fccd41e07 0077d97cfa
commit 187495eb67
161 changed files with 6351 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
sf_manufacturing/views/mrp_maintenance_views.xml Normal file
View File

@@ -0,0 +1,105 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<record id="maintenance_equipment_view_form_inherit_mrp" model="ir.ui.view">
<field name="name">maintenance.equipment.view.form.inherit.mrp</field>
<field name="model">maintenance.equipment</field>
<field name="inherit_id" ref="maintenance.hr_equipment_view_form"/>
<field name="arch" type="xml">
<xpath expr="//div[@name='button_box']" position="inside">
<button name="button_mrp_workcenter" type="object" class="oe_stat_button"
icon="fa-cogs" string="Work Center" attrs="{'invisible': [('workcenter_id', '=', False)]}"
groups="mrp.group_mrp_routings">
</button>
</xpath>
<xpath expr="//field[@name='location']" position="after">
<field name="workcenter_id" context="{'default_company_id':company_id}"
groups="mrp.group_mrp_routings"/>
</xpath>
<xpath expr="//group[@name='maintenance']" position="after">
<group name="statistics">
<label for="expected_mtbf" string="Expected Mean Time Between Failure"/>
<div class="o_row">
<field name="expected_mtbf"/>
days
</div>
<label for="mtbf" string="Mean Time Between Failure"/>
<div class="o_row">
<field name="mtbf"/>
days
</div>
<label for="estimated_next_failure" string="Estimated Next Failure"/>
<div class="o_row">
<field name="estimated_next_failure"/>
</div>
<field name="latest_failure_date" string="Latest Failure"/>
<label for="mttr" string="Mean Time To Repair"/>
<div class="o_row">
<field name="mttr"/>
days
</div>
</group>
</xpath>
</field>
</record>
<record id="maintenance_request_view_form_inherit_mrp" model="ir.ui.view">
<field name="name">maintenance.request.view.form.inherit.mrp</field>
<field name="model">maintenance.request</field>
<field name="inherit_id" ref="maintenance.hr_equipment_request_view_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='maintenance_type']" position="after">
<field name="production_company_id" invisible="1"/>
<field name="workorder_id" invisible="1"/>
<field name="production_id" options="{'no_create': True, 'no_open': True}"/>
<field name="workorder_id" attrs="{'invisible': [('production_id', '=', False)]}"
options="{'no_create': True, 'no_open': True}" domain="[('production_id', '=', production_id)]"
groups="mrp.group_mrp_routings"/>
<!-- <field name="repair_id"/> -->
</xpath>
<xpath expr="//div[hasclass('oe_chatter')]" position="after">
<div invisible="not context.get('discard_on_footer_button', False)">
<footer class="oe_edit_only">
<button special="save" data-hotkey="v" string="Save" class="oe_highlight"/>
<button string="Discard" special="cancel" data-hotkey="z"/>
</footer>
</div>
</xpath>
<field name="equipment_id" position="attributes">
<attribute name="domain">['|', (not workorder_id and 1 or 0, '=', 1), '|', ('workcenter_id', '=',
False), ('workcenter_id.order_ids', 'in', workorder_id)]
</attribute>
</field>
</field>
</record>
<record id="maintenance_request_view_search_inherit_mrp" model="ir.ui.view">
<field name="name">maintenence.request.view.search.inherit.mrp</field>
<field name="model">maintenance.request</field>
<field name="inherit_id" ref="maintenance.hr_equipment_request_view_search"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='maintenance_team_id']" position="after">
<field name="production_id" string="Operation"
filter_domain="['|', ('production_id', 'ilike', self), ('workorder_id', 'ilike', self)]"/>
</xpath>
</field>
</record>
<menuitem
id="maintenance.menu_equipment_form"
name="Equipments"
parent="maintenance.menu_maintenance_title"
groups="maintenance.group_equipment_manager,base.group_user"
sequence="2"/>
<menuitem id="menu_workcenter_tree"
action="mrp.mrp_workcenter_action"
groups="mrp.group_mrp_routings"
parent="maintenance.menu_equipment_form"
sequence="1"/>
<menuitem
id="menu_equipment_dashboard"
name="Machines &amp; Tools"
parent="maintenance.menu_equipment_form"
action="maintenance.hr_equipment_action"
sequence="2"/>
</odoo>

31
sf_manufacturing/views/tray_view.xml Normal file
View File

@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data>
<record id="sf_tray_form_inherit" model="ir.ui.view">
<field name="name">托盘条形码生成</field>
<field name="model">sf.tray</field>
<field name="inherit_id" ref="sf_base.sf_tray_form"/>
<field name="arch" type="xml">
<xpath expr="//group[@name='group1']" position="after">
<notebook>
<page string="生成条形码">
<field name='qr_image' widget="image"/>
<group>
<field name='production_id' readonly="1"
attrs='{"invisible": [("production_id","=",False)]}'/>
<field name="workorder_id"/>
</group>
<div class="col
-12 col-lg-6 o_setting_box">
<button type="object" class="oe_highlight" name="unclamp" string="解除装夹"
attrs='{"invisible": [("state","=","空闲")]}'/>
</div>
</page>
</notebook>
</xpath>
</field>
</record>
</data>
</odoo>