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

Accept Merge Request #213: (feature/sf刀具功能分支 -> develop)

Browse Source 
Merge Request: 优化了申请换刀功能的数据

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/213?initial=true
This commit is contained in:
禹翔辉
2023-06-29 14:15:57 +08:00
parent 3907901dc3 d5938bf407
commit b32722ca54
4 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_tool_management/__manifest__.py
View File

@@ -13,7 +13,7 @@
'website': 'https://www.sf.jikimo.com',
'depends': ['account', 'sf_base', 'mrp'],
'data': [
'security/group_security.xml',
#'security/group_security.xml',
'security/ir.model.access.csv',
# 'views/tool_base_views.xml',
# # 'views/menu_view.xml',

24
sf_tool_management/models/base.py
View File

@@ -148,7 +148,7 @@ class MachineTableToolChangingApply(models.Model):
:return:
"""
# 更新数据到机台换刀申请界面
# todo 换刀申请条件需补充完善
# todo 自动换刀申请条件需补充完善
if(self.functional_tool_status == '异常'):
self.env['sf.machine.table.tool.changing.apply'].search([
('CNC_machine_table', '=', self.CNC_machine_table)]).write({
@@ -187,12 +187,10 @@ class MachineTableToolChangingApply(models.Model):
:param vals:
:return:
"""
# todo 增加设置直径的值
# tool_changing_apply = self.env['sf.machine.table.tool.changing.apply'].search(
# [('CNC_machine_table', '=', vals.get('CNC_machine_table'))])
# for i in tool_changing_apply:
# print(i)
# vals['functional_tool_diameter'] = self.diameter
# 增加设置直径的值
tool_changing_apply = self.env['sf.machine.table.tool.changing.apply'].search(
[('CNC_machine_table', '=', vals['machine_tool_name'])])
vals['functional_tool_diameter'] = tool_changing_apply.diameter
self.env['sf.functional.tool.assembly'].create(vals)
@@ -342,7 +340,13 @@ class FunctionalToolAssembly(models.Model):
receive_time = fields.Datetime(string='领用出库时间')
remark = fields.Char(string='备注说明')
check_box = fields.Boolean(string='复选框', default=False, attrs="{'readonly': [('assemble_status', '!=', '1')]}")
check_box_1 = fields.Boolean(string='复选框', default=False)
@api.onchange('assemble_status')
def check_box(self):
if self.assemble_status != '1':
self.check_box_1 = False
def cancel_functional_tool_assembly(self):
"""
@@ -366,7 +370,9 @@ class FunctionalToolAssembly(models.Model):
'cut_time': None,
'cut_length': None,
'cut_number': None,
'assemble_status': '0'
'assemble_status': '0',
'tool_loading_person':None,
'tool_loading_time':None
})

2
sf_tool_management/views/tool_base_views.xml
View File

@@ -427,7 +427,7 @@
<button string="组装单打印" name="assemble_single_print" type="object" class="btn-primary"/>
<field name="check_box"/>
<field name="check_box_1" attrs="{'readonly': [('assemble_status', '!=', '1')]}"/>
<field name="assemble_status"/>
<field name="use_tool_time" />

7
sf_tool_management/wizard/wizard.py
View File

@@ -43,6 +43,7 @@ class ToolChangeRequirementInformation(models.TransientModel):
'remark': self.new_former,
'status': '1'
}
print('desc:', desc)
# 将数据更新到机台换刀申请界面
self.env['sf.machine.table.tool.changing.apply'].search(
[('CNC_machine_table', '=', desc.get('CNC_machine_table'))]).write(desc)
@@ -92,7 +93,7 @@ class ToolTransferRequestInformation(models.TransientModel):
def tool_transfer_apply(self):
"""
刀具转移申请信息确定按钮
todo 刀具转移申请信息确定按钮
:return:
"""
self.env['sf.machine.table.tool.changing.apply'].search(
@@ -245,5 +246,7 @@ class DeliveryOfCargoFromStorage(models.TransientModel):
('functional_tool_code', '=', val.functional_tool_code),
('functional_tool_name', '=', val.functional_tool_name)
]).write({
'assemble_status': '2'
'assemble_status': '2',
'receive_person': self.env.user.name,
'receive_time': fields.Datetime.now()
})