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

合并企业版模块

Browse Source
This commit is contained in:
qihao.gong@jikimo.com
2023-04-21 11:24:52 +08:00
parent d28525526a
commit b12470b813
5 changed files with 32 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
mrp_workorder/views/mrp_workcenter_views.xml
View File

@@ -1,37 +1,29 @@
<odoo> <odoo>
<record id="mrp_workcenter_view_kanban_inherit_workorder" model="ir.ui.view"> <!-- <record id="mrp_workcenter_view_kanban_inherit_workorder" model="ir.ui.view">-->
<field name="name">mrp.workcenter.view.kanban.inherit.mrp.workorder</field> <!-- <field name="name">mrp.workcenter.view.kanban.inherit.mrp.workorder</field>-->
<field name="model">mrp.workcenter</field> <!-- <field name="model">mrp.workcenter</field>-->
<field name="inherit_id" ref="mrp.mrp_workcenter_kanban"/> <!-- <field name="inherit_id" ref="mrp.mrp_workcenter_kanban"/>-->
<field name="arch" type="xml"> <!-- <field name="arch" type="xml">-->
<!-- Desktop view --> <!-- &lt;!&ndash; Desktop view &ndash;&gt;-->
<xpath expr="//div[@name='o_wo']" position="inside"> <!-- <xpath expr="//div[@name='o_wo']" position="inside">-->
<button class="btn btn-secondary fa fa-desktop" name="action_work_order" type="object" context="{'search_default_ready': 1, 'search_default_progress': 1, 'search_default_pending': 1, 'desktop_list_view': 1, 'search_default_workcenter_id': active_id}" title="Work orders" aria-label="Work orders"/> <!-- <button class="btn btn-secondary fa fa-desktop" name="action_work_order" type="object" context="{'search_default_ready': 1, 'search_default_progress': 1, 'search_default_pending': 1, 'desktop_list_view': 1, 'search_default_workcenter_id': active_id}" title="Work orders" aria-label="Work orders"/>-->
</xpath> <!-- </xpath>-->
</field> <!-- </field>-->
</record> <!-- </record>-->
<!-- override to change the no content image -->
<record id="mrp.action_work_orders" model="ir.actions.act_window">
<field name="help" type="html">
<p class="o_view_nocontent_workorder">
No work orders to do!
</p><p>
Work orders are operations to do as part of a manufacturing order.
Operations are defined in the bill of materials or added in the manufacturing order directly.
</p><p>
Use the table work center control panel to register operations in the shop floor directly.
The tablet provides worksheets for your workers and allow them to scrap products, track time,
launch a maintenance request, perform quality tests, etc.
</p>
</field>
</record>
<menuitem id="menu_mrp_dashboard"
name="Overview"
action="mrp.mrp_workcenter_kanban_action"
groups="mrp.group_mrp_routings"
parent="mrp.menu_mrp_root"
sequence="5"/>
<!-- &lt;!&ndash; override to change the no content image &ndash;&gt;-->
<!-- <record id="mrp.action_work_orders" model="ir.actions.act_window">-->
<!-- <field name="help" type="html">-->
<!-- <p class="o_view_nocontent_workorder">-->
<!-- No work orders to do!-->
<!-- </p><p>-->
<!-- Work orders are operations to do as part of a manufacturing order.-->
<!-- Operations are defined in the bill of materials or added in the manufacturing order directly.-->
<!-- </p><p>-->
<!-- Use the table work center control panel to register operations in the shop floor directly.-->
<!-- The tablet provides worksheets for your workers and allow them to scrap products, track time,-->
<!-- launch a maintenance request, perform quality tests, etc.-->
<!-- </p>-->
<!-- </field>-->
<!-- </record>-->
</odoo> </odoo>

2
odoo.conf
View File

@@ -4,7 +4,7 @@ csv_internal_sep = ,
data_dir = /var/lib/odoo data_dir = /var/lib/odoo
db_host = 172.17.0.2 db_host = 172.17.0.2
db_maxconn = 64 db_maxconn = 64
db_name = sf_dev db_name = sf_dev_pro
db_password = sf db_password = sf
db_port = 5432 db_port = 5432
db_sslmode = prefer db_sslmode = prefer

5
sf_base/views/common_view.xml
View File

@@ -203,10 +203,7 @@
</group> </group>
<group> <group>
<field name="remark"/>
<button string="测试跳转" name="open_url_action" type="object" confirm="是否确认下发补偿"
class="btn-primary" />
<field name="remark" widget="code"/>
</group> </group>
</form> </form>
</field> </field>

6
sf_manufacturing/models/mrp_production.py
View File

@@ -135,9 +135,9 @@ class MrpProduction(models.Model):
for route in embryo_routing_workcenter: for route in embryo_routing_workcenter:
workorders_values.append( workorders_values.append(
self.env['mrp.workorder'].json_workorder_str('', production, route)) self.env['mrp.workorder'].json_workorder_str('', production, route))
# production.workorder_ids = workorders_values production.workorder_ids= workorders_values
# for workorder in production.workorder_ids: for workorder in production.workorder_ids:
# workorder.duration_expected = workorder._get_duration_expected() workorder.duration_expected = workorder._get_duration_expected()
#在之前的销售单上重新生成制造订单 #在之前的销售单上重新生成制造订单

1
sf_manufacturing/models/mrp_workorder.py
View File

@@ -145,6 +145,7 @@ class ResMrpWorkOrder(models.Model):
'operation_id': False, 'operation_id': False,
'name': route.route_workcenter_id.name, 'name': route.route_workcenter_id.name,
'processing_panel': k, 'processing_panel': k,
'quality_point_ids':route.route_workcenter_id.quality_point_ids,
'routing_type': route.routing_type, 'routing_type': route.routing_type,
'work_state': '' if not route.routing_type == '获取CNC加工程序' else '待发起', 'work_state': '' if not route.routing_type == '获取CNC加工程序' else '待发起',
'workcenter_id': self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids, 'workcenter_id': self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids,