-
+
@@ -200,15 +244,15 @@
-
-
-
+
+
+
diff --git a/sf_manufacturing/__manifest__.py b/sf_manufacturing/__manifest__.py
index 1a1f11db..a3c2c70c 100644
--- a/sf_manufacturing/__manifest__.py
+++ b/sf_manufacturing/__manifest__.py
@@ -15,6 +15,7 @@
'data/stock_data.xml',
'security/group_security.xml',
'security/ir.model.access.csv',
+ 'views/mrp_production_addional_change.xml',
'report/tray_report.xml',
# 'views/mrp_maintenance_views.xml',
'views/mrp_routing_workcenter_view.xml',
@@ -42,6 +43,14 @@
],
'qweb': [
],
+ 'assets': {
+ 'web.assets_backend': [
+ 'sf_manufacturing/static/src/js/kanban_change.js',
+ 'sf_manufacturing/static/src/scss/kanban_change.scss',
+ 'sf_manufacturing/static/src/xml/kanban_change.xml',
+ ],
+
+ },
'license': 'LGPL-3',
'installable': True,
'application': False,
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 710fdb63..85f8313f 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -147,7 +147,8 @@ class ResProductMo(models.Model):
fixture_maximum_carrying_weight = fields.Float(string="最大承载重量[kg]", digits=(16, 4))
fixture_maximum_clamping_force = fields.Integer(string="最大夹持力[n]", size=8)
fixture_driving_way = fields.Char(string="驱动方式")
- fixture_apply_machine_tool_type_id = fields.Many2one('sf.machine_tool.type', string="适用机床型号")
+ fixture_apply_machine_tool_type_ids = fields.Many2many('sf.machine_tool.type', 'rel_product_machine_tool_type',
+ string="适用机床型号")
fixture_through_hole_size = fields.Integer(string="过孔大小[mm]", size=6)
fixture_screw_size = fields.Integer(string="螺牙大小[mm]", size=6)
@@ -205,7 +206,7 @@ class ResProductMo(models.Model):
item.fixture_clamp_workpiece_width_max = item.fixture_model_id.clamp_workpiece_width_max
item.fixture_clamp_workpiece_height_max = item.fixture_model_id.clamp_workpiece_height_max
item.fixture_clamp_workpiece_diameter_max = item.fixture_model_id.clamp_workpiece_diameter_max
- item.fixture_apply_machine_tool_type_id = item.fixture_model_id.apply_machine_tool_type_id.id
+ item.fixture_apply_machine_tool_type_id = self._get_ids(item.fixture_model_id.apply_machine_tool_type_ids)
@api.onchange('cutting_tool_model_id')
def _onchange_cutting_tool_model_id(self):
diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
new file mode 100644
index 00000000..716cdb76
--- /dev/null
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -0,0 +1,46 @@
+
+
+
+
+ custom.mrp.production.tree
+ mrp.production
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sf_manufacturing/views/mrp_workcenter_views.xml b/sf_manufacturing/views/mrp_workcenter_views.xml
index b2414a68..8e360993 100644
--- a/sf_manufacturing/views/mrp_workcenter_views.xml
+++ b/sf_manufacturing/views/mrp_workcenter_views.xml
@@ -56,7 +56,7 @@
- 工作中心看板
+ 生产线驾驶舱
ir.actions.act_window
mrp.workcenter
kanban,form
@@ -76,7 +76,7 @@