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

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop

Browse Source
This commit is contained in:
jinling.yang
2023-10-23 17:36:15 +08:00
parent dc8aecba93
commit 919a200750
13 changed files with 372 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_dlm/__init__.py
View File

@@ -1 +1 @@
from . import wizard

2
sf_dlm/__manifest__.py
View File

@@ -17,7 +17,7 @@
'data/product_data.xml',
'data/uom_data.xml',
'security/ir.model.access.csv',
'wizard/cutting_tool_specification_wizard.xml',
# 'wizard/cutting_tool_specification_wizard.xml',
'views/product_template_view.xml',
'views/product_workorder.xml'
],

1
sf_dlm/security/ir.model.access.csv
View File

@@ -1,5 +1,4 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_sf_cutting_tool_specification_wizard,sf_cutting_tool_specification_wizard,model_sf_cutting_tool_specification_wizard,base.group_user,1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
access_sf_cutting_tool_specification_wizard sf_cutting_tool_specification_wizard model_sf_cutting_tool_specification_wizard base.group_user 1 1 1 1
2
3
4

7
sf_dlm/views/product_template_view.xml
View File

@@ -56,9 +56,10 @@
<div attrs="{'invisible': [('categ_type', '!=', '刀具')]}" class="button_width">
<field name="cutting_tool_model_id" placeholder="请选择"
domain="[('cutting_tool_material_id','=',cutting_tool_material_id)]"/>
<button string="选择刀具规格" type="action" name="%(action_cutting_tool_specification_wizard)d"
class="oe_highlight"
context="{'default_cutting_tool_material_id': cutting_tool_material_id,
<button string="选择刀具规格" type="action"
name="%(sf_manufacturing.action_cutting_tool_specification_wizard)d"
class="oe_highlight" context="{'default_product_id':active_id,
'default_cutting_tool_material_id': cutting_tool_material_id,
'default_cutting_tool_library_id': cutting_tool_model_id,
'default_cutting_tool_type': cutting_tool_type}"
/>

7
sf_dlm/wizard/cutting_tool_specification_wizard.py
View File

@@ -11,11 +11,14 @@ class Cutting_toolSpecificationWizard(models.TransientModel):
_name = "sf.cutting_tool.specification.wizard"
_description = u'刀具规格'
cutting_tool_library_id = fields.Many2one('sf.cutting_tool.standard.library', '刀具标准库')
product_id = fields.Many2one('product.template', string='产品')
cutting_tool_library_id = fields.Many2one('sf.cutting_tool.standard.library', '刀具标准库',related='product_id.cutting_tool_library_id')
# cutting_tool_library_id = fields.Many2one('sf.cutting_tool.standard.library', '刀具标准库')
cutting_tool_material_id = fields.Many2one('sf.cutting.tool.material', '刀具物料')
cutting_tool_type = fields.Char(related=cutting_tool_material_id.name)
cutting_tool_type_id = fields.Many2one('sf.cutting.tool.type', '刀具类型')
brand_id = fields.Many2one('sf.machine.brand', '品牌')
brand_id = fields.Many2one('sf.machine.brand', '品牌',related=cutting_tool_library_id.brand_id)
integral_tool_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
'specification_id', string='整体式刀具基本参数')
blade_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',