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

Accept Merge Request #1044: (feature/组装单弹窗优化 -> develop)

Browse Source 
Merge Request: 1、打开组装弹窗方法添加清除旧数据功能；2、组装弹窗界面，刷新按键名称改为获取测量值，添加是否获取测量值字段等，调整字段只读和界面布局；

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1044?initial=true
This commit is contained in:
禹翔辉
2024-05-23 15:24:38 +08:00
committed by Coding
parent f53eecbb57 147ac35239
commit b6a69debd8
3 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sf_tool_management/models/base.py
View File

@@ -578,7 +578,12 @@ class FunctionalToolAssembly(models.Model):
def put_start_preset(self):
self.search([('start_preset_bool', '=', True)]).write({'start_preset_bool': False})
self.write({'start_preset_bool': True})
self.write({
'after_assembly_tool_loading_length': 0,
'after_assembly_functional_tool_diameter': 0,
'after_assembly_knife_tip_r_angle': 0,
'start_preset_bool': True
})
return {
'type': 'ir.actions.act_window',
'res_model': 'sf.functional.tool.assembly.order',

15
sf_tool_management/wizard/wizard.py
View File

@@ -486,6 +486,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
hiding_length = fields.Float(string='避空长(mm)')
after_tool_groups_id = fields.Many2one('sf.tool.groups', string='组装后刀具组')
obtain_measurement_status = fields.Boolean('是否获取测量值', default=False)
@api.depends('after_assembly_tool_loading_length', 'after_assembly_handle_length')
def _compute_after_assembly_functional_tool_length(self):
for item in self:
@@ -502,11 +504,16 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
获取刀具预调仪数据
"""
tool = self.env['sf.functional.tool.assembly'].search([('assembly_order_code', '=', self.assembly_order_code)])
tool_loading_length = tool.after_assembly_tool_loading_length
diameter = tool.after_assembly_functional_tool_diameter
r_angle = tool.after_assembly_knife_tip_r_angle
if tool_loading_length == 0 and diameter == 0 and r_angle == 0:
raise ValidationError('没有获取到测量数据！')
self.write({
'after_assembly_tool_loading_length': tool.after_assembly_tool_loading_length, # 总长度
'after_assembly_functional_tool_diameter': tool.after_assembly_functional_tool_diameter, # 直径
'after_assembly_knife_tip_r_angle': tool.after_assembly_knife_tip_r_angle # R角
'after_assembly_tool_loading_length': tool_loading_length, # 总长度
'after_assembly_functional_tool_diameter': diameter, # 直径
'after_assembly_knife_tip_r_angle': r_angle, # R角
'obtain_measurement_status': True # 是否获取测量值
})
return {

17
sf_tool_management/wizard/wizard_view.xml
View File

@@ -341,18 +341,20 @@
<field name="rfid" class="custom_required"/>
</group>
<group>
<button name="get_tool_preset_parameter" string="刷新" type="object" class="btn-primary"/>
<field name="obtain_measurement_status" invisible="1"/>
<button name="get_tool_preset_parameter" string="获取测量值" type="object"
class="btn-primary"/>
</group>
</group>
<group>
<group>
<field name="after_name_id" string="功能刀具名称" placeholder="请选择功能刀具名称"
<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"/>
<field name="after_assembly_functional_tool_type_id" string="功能刀具类型"
<field name="after_assembly_functional_tool_type_id" string="功能刀具类型" readonly="1"
options="{'no_create': True, 'no_quick_create': True}"/>
<field name="after_tool_groups_id"
<field name="after_tool_groups_id" readonly="1"
options="{'no_create': True, 'no_quick_create': True}"/>
<field name="after_assembly_whether_standard_knife" string="是否标准刀"/>
<field name="after_assembly_coarse_middle_thin" string="粗/中/精"/>
@@ -366,11 +368,11 @@
</group>
<group>
<field name="after_assembly_functional_tool_diameter" string="刀具直径(mm)"
class="custom_required"/>
class="custom_required" readonly="1"/>
<field name="after_assembly_knife_tip_r_angle" string="刀尖R角(mm)"
class="custom_required"/>
class="custom_required" readonly="1"/>
<field name="after_assembly_tool_loading_length" string="总长度(mm)"
class="custom_required"/>
class="custom_required" readonly="1"/>
<field name="after_assembly_handle_length" string="刀柄长度(mm)"
class="custom_required"/>
<field name="after_assembly_functional_tool_length" string="伸出长(mm)"
@@ -390,6 +392,7 @@
</sheet>
<footer>
<button string="确定" name="functional_tool_assembly" type="object" class="btn-primary"
attrs="{'invisible': [('obtain_measurement_status', '=', False)]}"
confirm="是否确认申请组装"/>
<button string="取消" class="btn-secondary" special="cancel"/>
</footer>