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

新增功能刀具组装的组装弹窗按键功能（功能已完成）、取消组装功能按键（功能已完成）、出库弹窗按键（已完成视图）

Browse Source
This commit is contained in:
yuxianghui
2023-06-27 17:31:49 +08:00
parent e880b020c6
commit d6f749fff5
5 changed files with 283 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
sf_tool_management/models/base.py
View File

@@ -157,9 +157,9 @@ class MachineTableToolChangingApply(models.Model):
'replacement_tool_type': self.functional_tool_type,
'replacement_tool_coarse_middle_thin': self.coarse_middle_thin,
'new_former': '0',
'applicant': '自动申请',
'applicant': None,
'used_tool_time': fields.Datetime.now(),
'reason_for_applying': '功能刀具状态异常',
'reason_for_applying': None,
'remark': None,
'status': '1'
})
@@ -263,6 +263,26 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
todo 自动申请装刀
:return:
"""
self.env['sf.functional.tool.assembly'].create({
'functional_tool_code': self.functional_tool_code,
'functional_tool_name': self.functional_tool_name,
'functional_tool_type': self.functional_tool_type,
'functional_tool_diameter': self.diameter,
'functional_tool_length': self.tool_loading_length,
'loading_task_source': '0',
'coarse_middle_thin': None,
'tool_loading_length': None,
'applicant': self.applicant,
'reason_for_applying': self.reason_for_applying,
'use_tool_time': self.need_knife_time,
'machine_tool_name': self.machine_table_name,
'machine_tool_code': self.cam_procedure_code,
'cutter_spacing_code': self.cam_cutter_spacing_code
})
# 将计划执行状态改为执行中
self.env['sf.cam.work.order.program.knife.plan'].search(
[('functional_tool_code', '=', self.functional_tool_code)]).write({'plan_execute_status': '1'})
def revocation(self):
"""
@@ -322,3 +342,28 @@ class FunctionalToolAssembly(models.Model):
receive_person = fields.Char(string='领用人')
receive_time = fields.Datetime(string='领用出库时间')
remark = fields.Char(string='备注说明')
def cancel_functional_tool_assembly(self):
"""
取消功能刀具组装
:return:
"""
self.env['sf.functional.tool.assembly'].search([
('machine_tool_name', '=', self.machine_tool_name),
('cutter_spacing_code', '=', self.cutter_spacing_code)
]).write({
'tool_name': None,
'tool_brand': None,
'tool_type': None,
'knife_handle_name': None,
'knife_handle_brand': None,
'knife_handle_type': None,
'coarse_middle_thin': None,
'tool_loading_length': None,
'new_former': None,
'reference_length': None,
'cut_time': None,
'cut_length': None,
'cut_number': None,
'assemble_status': '0'
})

2
sf_tool_management/security/ir.model.access.csv
View File

@@ -9,6 +9,8 @@ access_sf_tool_transfer_request_information,sf.tool.transfer.request.information
access_sf_apply_for_tooling,sf.apply.for.tooling,model_sf_apply_for_tooling,base.group_user,1,1,1,1
access_sf_functional_tool_assembly,sf.functional.tool.assembly,model_sf_functional_tool_assembly,base.group_user,1,1,1,1
access_sf_functional_tool_assembly_order,sf.functional.tool.assembly.order,model_sf_functional_tool_assembly_order,base.group_user,1,1,1,1
access_sf_delivery_of_cargo_from_storage,sf.delivery.of.cargo.from.storage,model_sf_delivery_of_cargo_from_storage,base.group_user,1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
9 access_sf_functional_tool_assembly_order sf.functional.tool.assembly.order model_sf_functional_tool_assembly_order base.group_user 1 1 1 1
10 access_sf_delivery_of_cargo_from_storage sf.delivery.of.cargo.from.storage model_sf_delivery_of_cargo_from_storage base.group_user 1 1 1 1
11
12
13
14
15
16

46
sf_tool_management/views/tool_base_views.xml
View File

@@ -378,11 +378,47 @@
<field name="reason_for_applying"/>
<field name="apply_time"/>
<button string="组装" name=""/>
<button string="自动打印二维码" name=""/>
<button string="取消组装" name=""/>
<button string="出库" name=""/>
<button string="组装单打印" name=""/>
<button string="组装"
name="%(sf_tool_management.sf_functional_tool_assembly_order_act)d"
type="action"
context="{
'default_machine_tool_name': machine_tool_name,
'default_cutter_spacing_code': cutter_spacing_code,
'default_functional_tool_name': functional_tool_name,
'default_functional_tool_type': functional_tool_type,
'default_functional_tool_length': functional_tool_length,
'default_effective_length': None,
'default_functional_tool_diameter': functional_tool_diameter,
'default_tool_included_angle': None,
'default_functional_tool_cutting_type': functional_tool_cutting_type,
'default_required_cutting_time': None,
'default_whether_standard_tool': None}"
attrs="{'invisible': [('assemble_status', '!=', '0')]}"
class="btn-primary"/>
<button string="组装" name="" attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary"/>
<button string="取消组装" name="cancel_functional_tool_assembly" type="object" attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary"/>
<button string="取消组装" name="" attrs="{'invisible': [('assemble_status', '!=', '0')]}" class="btn-primary"/>
<button string="自动打印二维码" name="" class="btn-primary"/>
<button string="出库"
name="%(sf_tool_management.sf_delivery_of_cargo_from_storager_act)d"
type="action"
context="{
'default_functional_tool_code': functional_tool_code,
'default_machine_tool_name': machine_tool_name,
'default_functional_tool_type': functional_tool_type,
'default_production_line_name': production_line_name,
'default_machine_tool_code': machine_tool_code,
'default_receive_person': receive_person,
'default_receive_time': receive_time
}"
attrs="{'invisible': [('assemble_status', '!=', '1')]}" class="btn-primary"/>
<button string="出库" name="" attrs="{'invisible': [('assemble_status', '=', '1')]}" class="btn-primary"/>
<button string="组装单打印" name="" class="btn-primary"/>
<field name="assemble_status"/>
<field name="use_tool_time"/>

81
sf_tool_management/wizard/wizard.py
View File

@@ -155,10 +155,85 @@ class ApplyForTooling(models.TransientModel):
return {'type': 'ir.actions.act_window_close'}
class FunctionalToolAssemblyOrder(models.TransientModel):
_name = 'sf.functional.tool.assembly.order'
_description = '功能刀具组装单'
# 功能刀具申请信息
machine_tool_name = fields.Char(string='机床名称', readonly=True)
cutter_spacing_code = fields.Char(string='刀位号', readonly=True)
functional_tool_name = fields.Char(string='功能刀具名称', readonly=True)
functional_tool_type = fields.Char(string='功能刀具类型', readonly=True)
functional_tool_length = fields.Char(string='功能刀具伸出长', readonly=True)
effective_length = fields.Char(string='有效长', readonly=True)
functional_tool_diameter = fields.Char(string='功能刀具直径', readonly=True)
tool_included_angle = fields.Char(string='刀尖角（R角）', readonly=True)
functional_tool_cutting_type = fields.Char(string='功能刀具切削类型', readonly=True)
required_cutting_time = fields.Char(string='需要切割时间', readonly=True)
whether_standard_tool = fields.Boolean(string='是否标准刀', readonly=True)
# 功能刀具组装信息
tool_name = fields.Char(string='刀具名称')
tool_code = fields.Char(string='刀具编码')
tool_brand = fields.Char(string='品牌')
tool_type = fields.Char(string='型号')
knife_handle_name = fields.Char(string='刀柄名称')
knife_handle_code = fields.Char(string='刀柄编码')
knife_handle_brand = fields.Char(string='品牌')
knife_handle_type = fields.Char(string='型号')
coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精')
tool_loading_length = fields.Char(string='装刀长')
new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧')
reference_length = fields.Char(string='参考伸出长')
cut_time = fields.Char(string='已切削时间')
cut_length = fields.Char(string='已切削长度')
cut_number = fields.Char(string='已切削次数')
def functional_tool_assembly(self):
"""
功能刀具组装
:return:
"""
self.env['sf.functional.tool.assembly'].search([
('machine_tool_name', '=', self.machine_tool_name),
('cutter_spacing_code', '=', self.cutter_spacing_code)
]).write({
'tool_name': self.tool_name,
'tool_brand': self.tool_brand,
'tool_type': self.tool_type,
'knife_handle_name': self.knife_handle_name,
'knife_handle_brand': self.knife_handle_brand,
'knife_handle_type': self.knife_handle_type,
'coarse_middle_thin': self.coarse_middle_thin,
'tool_loading_length': self.tool_loading_length,
'new_former': self.new_former,
'reference_length': self.reference_length,
'cut_time': self.cut_time,
'cut_length': self.cut_length,
'cut_number': self.cut_number,
'assemble_status': '1',
'tool_loading_person': self.env.user.name,
'tool_loading_time': fields.Datetime.now()
})
# 关闭弹出窗口
return {'type': 'ir.actions.act_window_close'}
class DeliveryOfCargoFromStorage(models.TransientModel):
_name = 'sf.delivery.of.cargo.from.storage'
_description = '出库'
functional_tool_code = fields.Char(string='功能刀具编码')
functional_tool_name = fields.Char(string='功能刀具名称')
functional_tool_type = fields.Char(string='功能刀具类型')
production_line_name = fields.Char(string='产线名称')
machine_tool_code = fields.Char(string='机台号')
receive_person = fields.Char(string='领用人')
receive_time = fields.Datetime(string='领用出库时间')
def stock_removal(self):
"""
出库
:return:
"""

115
sf_tool_management/wizard/wizard_view.xml
View File

@@ -177,4 +177,119 @@
<field name="view_id" ref="sf_apply_for_tooling_form"/>
<field name="target">new</field>
</record>
<!--================================================功能刀具组装单================================================-->
<record id="sf_functional_tool_assembly_order_form" model="ir.ui.view">
<field name="name">功能刀具组装单</field>
<field name="model">sf.functional.tool.assembly.order</field>
<field name="arch" type="xml">
<form string="功能刀具组装单">
<sheet>
<group string="功能刀具申请信息">
<group>
<group>
<field name="machine_tool_name"/>
</group>
<group>
<field name="cutter_spacing_code"/>
</group>
</group><group>
<group>
<field name="functional_tool_name"/>
</group>
<group>
<field name="functional_tool_type"/>
</group>
</group>
</group>
<group>
<group>
<field name="functional_tool_length"/>
<field name="effective_length"/>
<field name="functional_tool_cutting_type"/>
<field name="required_cutting_time"/>
</group>
<group>
<field name="functional_tool_diameter"/>
<field name="tool_included_angle"/>
<field name="whether_standard_tool"/>
</group>
</group>
<group string="功能刀具组装信息">
<group>
<group>
<field name="tool_name"/>
<field name="knife_handle_name"/>
<field name="tool_loading_length"/>
</group>
<group>
<field name="tool_code"/>
<field name="knife_handle_code"/>
<field name="coarse_middle_thin"/>
</group>
</group>
<group>
<group>
<field name="tool_brand"/>
<field name="knife_handle_brand"/>
<field name="new_former"/>
</group>
<group>
<field name="tool_type"/>
<field name="knife_handle_type"/>
<field name="reference_length"/>
</group>
</group>
</group>
<group>
<field name="cut_time"/>
<field name="cut_length"/>
<field name="cut_number"/>
</group>
</sheet>
<footer>
<button string="确定" name="functional_tool_assembly" type="object" class="btn-primary" confirm="是否确认申请组装"/>
<button string="取消" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
</record>
<record id="sf_functional_tool_assembly_order_act" model="ir.actions.act_window">
<field name="name">功能刀具组装单</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.functional.tool.assembly.order</field>
<field name="view_mode">form</field>
<field name="view_id" ref="sf_functional_tool_assembly_order_form"/>
<field name="target">new</field>
</record>
<!--================================================出库================================================-->
<record id="sf_delivery_of_cargo_from_storager_tree" model="ir.ui.view">
<field name="name">出库</field>
<field name="model">sf.delivery.of.cargo.from.storage</field>
<field name="arch" type="xml">
<tree>
<field name="functional_tool_code" string="编码"/>
<field name="functional_tool_name" string="名称"/>
<field name="functional_tool_type" string="类型"/>
<field name="production_line_name" string="生产线"/>
<field name="machine_tool_code" string="机台"/>
<field name="receive_person"/>
<field name="receive_time" string="出库时间"/>
</tree>
</field>
</record>
<record id="sf_delivery_of_cargo_from_storager_act" model="ir.actions.act_window">
<field name="name">出库</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.delivery.of.cargo.from.storage</field>
<field name="view_mode">tree</field>
<field name="view_id" ref="sf_delivery_of_cargo_from_storager_tree"/>
<field name="target">new</field>
</record>
</odoo>