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

1、增加是否使用刀具预调仪的配置；

Browse Source
This commit is contained in:
yuxianghui
2024-06-11 11:58:58 +08:00
parent ae953c7ad6
commit 14d823ab6e
4 changed files with 60 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sf_tool_management/wizard/wizard.py
View File

@@ -440,6 +440,15 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
compute='_compute_after_assembly_max_lifetime_value')
obtain_measurement_status = fields.Boolean('是否获取测量值', default=False)
enable_tool_presetter = fields.Boolean('是否启用刀具预调仪', default=lambda self: self.get_enable_tool_presetter())
def get_enable_tool_presetter(self):
"""
获取是否启用刀具预调仪数据
"""
sf_sync_config = self.env['res.config.settings'].get_values()
enable_tool_presetter = sf_sync_config['enable_tool_presetter']
return enable_tool_presetter
@api.depends('after_assembly_tool_loading_length', 'after_assembly_handle_length')
def _compute_after_assembly_functional_tool_length(self):

46
sf_tool_management/wizard/wizard_view.xml
View File

@@ -235,10 +235,12 @@
</div>
<group>
<group>
<field name="integral_freight_barcode_id" options="{'no_create': True}" placeholder="请选择" string="货位"/>
<field name="integral_freight_barcode_id" options="{'no_create': True}"
placeholder="请选择" string="货位"/>
</group>
<group>
<field name="integral_freight_lot_id" options="{'no_create': True}" placeholder="请选择" string="批次"/>
<field name="integral_freight_lot_id" options="{'no_create': True}"
placeholder="请选择" string="批次"/>
</group>
</group>
<group col="2">
@@ -258,10 +260,12 @@
</div>
<group>
<group>
<field name="blade_freight_barcode_id" options="{'no_create': True}" placeholder="请选择" string="货位"/>
<field name="blade_freight_barcode_id" options="{'no_create': True}"
placeholder="请选择" string="货位"/>
</group>
<group>
<field name="blade_freight_lot_id" options="{'no_create': True}" placeholder="请选择" string="批次"/>
<field name="blade_freight_lot_id" options="{'no_create': True}"
placeholder="请选择" string="批次"/>
</group>
</group>
<group col="2">
@@ -282,10 +286,12 @@
</div>
<group>
<group>
<field name="bar_freight_barcode_id" options="{'no_create': True}" placeholder="请选择" string="货位"/>
<field name="bar_freight_barcode_id" options="{'no_create': True}"
placeholder="请选择" string="货位"/>
</group>
<group>
<field name="bar_freight_lot_id" options="{'no_create': True}" placeholder="请选择" string="批次"/>
<field name="bar_freight_lot_id" options="{'no_create': True}" placeholder="请选择"
string="批次"/>
</group>
</group>
<group col="2">
@@ -306,10 +312,12 @@
</div>
<group>
<group>
<field name="pad_freight_barcode_id" options="{'no_create': True}" placeholder="请选择" string="货位"/>
<field name="pad_freight_barcode_id" options="{'no_create': True}"
placeholder="请选择" string="货位"/>
</group>
<group>
<field name="pad_freight_lot_id" options="{'no_create': True}" placeholder="请选择" string="批次"/>
<field name="pad_freight_lot_id" options="{'no_create': True}" placeholder="请选择"
string="批次"/>
</group>
</group>
<group col="2">
@@ -329,10 +337,12 @@
</div>
<group>
<group>
<field name="chuck_freight_barcode_id" options="{'no_create': True}" placeholder="请选择" string="货位"/>
<field name="chuck_freight_barcode_id" options="{'no_create': True}"
placeholder="请选择" string="货位"/>
</group>
<group>
<field name="chuck_freight_lot_id" options="{'no_create': True}" placeholder="请选择" string="批次"/>
<field name="chuck_freight_lot_id" options="{'no_create': True}"
placeholder="请选择" string="批次"/>
</group>
</group>
<group col="2">
@@ -358,12 +368,14 @@
<group>
<field name="obtain_measurement_status" invisible="1"/>
<button name="get_tool_preset_parameter" string="获取测量值" type="object"
attrs="{'invisible': [('enable_tool_presetter', '=', False)]}"
class="btn-primary"/>
</group>
</group>
<group>
<group>
<field name="after_name_id" string="功能刀具名称" placeholder="请选择功能刀具名称" readonly="1"
<field name="after_name_id" string="功能刀具名称" placeholder="请选择功能刀具名称"
readonly="1"
options="{'no_create': True, 'no_quick_create': True}"/>
<field name="after_assembly_functional_tool_name" string="功能刀具名称"
invisible="1"/>
@@ -382,12 +394,16 @@
attrs="{'invisible': [('after_assembly_new_former','=','0')]}"/>
</group>
<group>
<field name="enable_tool_presetter" invisible="1"/>
<field name="after_assembly_functional_tool_diameter" string="刀具直径(mm)"
class="custom_required" readonly="1"/>
attrs="{'readonly': [('enable_tool_presetter', '=', True)]}"
class="custom_required"/>
<field name="after_assembly_knife_tip_r_angle" string="刀尖R角(mm)"
class="custom_required" readonly="1"/>
attrs="{'readonly': [('enable_tool_presetter', '=', True)]}"
class="custom_required"/>
<field name="after_assembly_tool_loading_length" string="总长度(mm)"
class="custom_required" readonly="1"/>
attrs="{'readonly': [('enable_tool_presetter', '=', True)]}"
class="custom_required"/>
<field name="after_assembly_handle_length" string="刀柄长度(mm)"
class="custom_required"/>
<field name="after_assembly_functional_tool_length" string="伸出长(mm)"
@@ -407,7 +423,7 @@
</sheet>
<footer>
<button string="确定" name="functional_tool_assembly" type="object" class="btn-primary"
attrs="{'invisible': [('obtain_measurement_status', '=', False)]}"
attrs="{'invisible': [('obtain_measurement_status', '=', False),('enable_tool_presetter', '=', True)]}"
confirm="是否确认申请组装"/>
<button string="取消" class="btn-secondary" special="cancel"/>
</footer>