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

Accept Merge Request #1005: (feature/修复表面工艺可选参数和模版类型 -> develop)

Browse Source 
Merge Request: 修复表面工艺可选参数和模版类型

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1005?initial=true
This commit is contained in:
杨金灵
2024-05-11 15:42:31 +08:00
committed by Coding
parent 47ed09152d 76b7d00643
commit 05307fa25e
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_base/views/common_view.xml
View File

@@ -33,7 +33,7 @@
</group> </group>
<notebook> <notebook>
<page string="适用材料"> <page string="适用材料">
<field name="materials_model_ids" readonly="1"></field> <field name="materials_model_ids"></field>
</page> </page>
</notebook> </notebook>
</sheet> </sheet>

7
sf_manufacturing/models/model_type.py
View File

@@ -21,7 +21,8 @@ class ProductModelTypeRoutingSort(models.Model):
_description = '成品工序排序' _description = '成品工序排序'
sequence = fields.Integer('Sequence') sequence = fields.Integer('Sequence')
route_workcenter_id = fields.Many2one('mrp.routing.workcenter') route_workcenter_id = fields.Many2one('mrp.routing.workcenter',
domain=[('routing_type', 'in', ['装夹预调', 'CNC加工', '解除装夹'])])
is_repeat = fields.Boolean('重复', related='route_workcenter_id.is_repeat') is_repeat = fields.Boolean('重复', related='route_workcenter_id.is_repeat')
# routing_type = fields.Selection([ # routing_type = fields.Selection([
@@ -54,7 +55,7 @@ class EmbryoModelTypeRoutingSort(models.Model):
_description = '坯料工序排序' _description = '坯料工序排序'
sequence = fields.Integer('Sequence') sequence = fields.Integer('Sequence')
route_workcenter_id = fields.Many2one('mrp.routing.workcenter') route_workcenter_id = fields.Many2one('mrp.routing.workcenter', domain=[('routing_type', 'in', ['切割'])])
is_repeat = fields.Boolean('重复', related='route_workcenter_id.is_repeat') is_repeat = fields.Boolean('重复', related='route_workcenter_id.is_repeat')
# routing_type = fields.Selection([ # routing_type = fields.Selection([
@@ -87,7 +88,7 @@ class SurfaceTechnicsModelTypeRoutingSort(models.Model):
_description = '表面工艺工序排序' _description = '表面工艺工序排序'
sequence = fields.Integer('Sequence') sequence = fields.Integer('Sequence')
route_workcenter_id = fields.Many2one('mrp.routing.workcenter') route_workcenter_id = fields.Many2one('mrp.routing.workcenter', domain=[('routing_type', 'in', ['表面工艺'])])
is_repeat = fields.Boolean('重复', related='route_workcenter_id.is_repeat') is_repeat = fields.Boolean('重复', related='route_workcenter_id.is_repeat')
# routing_type = fields.Selection([ # routing_type = fields.Selection([

8
sf_manufacturing/views/model_type_view.xml
View File

@@ -37,7 +37,7 @@
<field name='product_routing_tmpl_ids'> <field name='product_routing_tmpl_ids'>
<tree editable='bottom'> <tree editable='bottom'>
<field name="sequence" widget="handle" string="序号"/> <field name="sequence" widget="handle" string="序号"/>
<field name="route_workcenter_id" string="工序"/> <field name="route_workcenter_id" string="工序" options="{'no_create': True}"/>
<field name="routing_type" string="类型"/> <field name="routing_type" string="类型"/>
<field name="is_repeat" string="重复"/> <field name="is_repeat" string="重复"/>
<field name="workcenter_ids" string="工作中心" widget="many2many_tags"/> <field name="workcenter_ids" string="工作中心" widget="many2many_tags"/>
@@ -48,18 +48,18 @@
<field name='embryo_routing_tmpl_ids'> <field name='embryo_routing_tmpl_ids'>
<tree editable='bottom'> <tree editable='bottom'>
<field name="sequence" widget="handle" string="序号"/> <field name="sequence" widget="handle" string="序号"/>
<field name="route_workcenter_id" string="工序"/> <field name="route_workcenter_id" string="工序" options="{'no_create': True}"/>
<field name="routing_type" string="类型"/> <field name="routing_type" string="类型"/>
<field name="is_repeat" string="重复"/> <field name="is_repeat" string="重复"/>
<field name="workcenter_ids" string="工作中心" widget="many2many_tags"/> <field name="workcenter_ids" string="工作中心" widget="many2many_tags"/>
</tree> </tree>
</field> </field>
</group> </group>
<group> <group>
<field name='surface_technics_routing_tmpl_ids' style="white-space: pre-wrap;"> <field name='surface_technics_routing_tmpl_ids' style="white-space: pre-wrap;">
<tree editable='bottom'> <tree editable='bottom'>
<field name="sequence" widget="handle" string="序号"/> <field name="sequence" widget="handle" string="序号"/>
<field name="route_workcenter_id" string="工序"/> <field name="route_workcenter_id" string="工序" options="{'no_create': True}"/>
<field name="routing_type" string="类型"/> <field name="routing_type" string="类型"/>
<field name="is_repeat" string="重复"/> <field name="is_repeat" string="重复"/>
<field name="workcenter_ids" string="工作中心" widget="many2many_tags"/> <field name="workcenter_ids" string="工作中心" widget="many2many_tags"/>