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

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/Bug修复

Browse Source
This commit is contained in:
jinling.yang
2023-07-26 18:52:56 +08:00
parent 7ee652d021 459a9c3fbb
commit 21a69a1048
8 changed files with 7435 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sf_mrs_connect/models/sync_common.py
View File

@@ -1187,7 +1187,7 @@ class sfSyncFunctional_cutting_tool(models.Model):
"name": item['name'], "name": item['name'],
"code": item['code'], "code": item['code'],
# 功能刀具类型 # 功能刀具类型
"mrs_cutting_tool_type_id": self.env['sf.cutting.tool.type'].search( "mrs_cutting_tool_type_id": self.env['sf.functional.cutting.tool.model'].search(
[('code', '=', item['mrs_cutting_tool_type_id'])]).id, [('code', '=', item['mrs_cutting_tool_type_id'])]).id,
# # 刀具型号 # # 刀具型号
# "mrs_cutting_tool_model_id": self.env['sf.cutting.tool.model'].search( # "mrs_cutting_tool_model_id": self.env['sf.cutting.tool.model'].search(
@@ -1222,7 +1222,7 @@ class sfSyncFunctional_cutting_tool(models.Model):
"name": item['name'], "name": item['name'],
"code": item['code'], "code": item['code'],
# 功能刀具类型 # 功能刀具类型
"mrs_cutting_tool_type_id": self.env['sf.cutting.tool.type'].search( "mrs_cutting_tool_type_id": self.env['sf.functional.cutting.tool.model'].search(
[('code', '=', item['mrs_cutting_tool_type_id'])]).id, [('code', '=', item['mrs_cutting_tool_type_id'])]).id,
"mrs_cutting_tool_integral_model_ids": self._get_functional_tool_model_ids( "mrs_cutting_tool_integral_model_ids": self._get_functional_tool_model_ids(
item['mrs_cutting_tool_integral_model_ids']), item['mrs_cutting_tool_integral_model_ids']),
@@ -1279,7 +1279,7 @@ class sfSyncFunctional_cutting_tool(models.Model):
"name": item['name'], "name": item['name'],
"code": item['code'], "code": item['code'],
# 功能刀具类型 # 功能刀具类型
"mrs_cutting_tool_type_id": self.env['sf.cutting.tool.type'].search( "mrs_cutting_tool_type_id": self.env['sf.functional.cutting.tool.model'].search(
[('code', '=', item['mrs_cutting_tool_type_id'])]).id, [('code', '=', item['mrs_cutting_tool_type_id'])]).id,
"mrs_cutting_tool_integral_model_ids": self._get_functional_tool_model_ids( "mrs_cutting_tool_integral_model_ids": self._get_functional_tool_model_ids(
item['mrs_cutting_tool_integral_model_ids']), item['mrs_cutting_tool_integral_model_ids']),
@@ -1311,7 +1311,7 @@ class sfSyncFunctional_cutting_tool(models.Model):
"name": item['name'], "name": item['name'],
"code": item['code'], "code": item['code'],
# 功能刀具类型 # 功能刀具类型
"mrs_cutting_tool_type_id": self.env['sf.cutting.tool.type'].search( "mrs_cutting_tool_type_id": self.env['sf.functional.cutting.tool.model'].search(
[('code', '=', item['mrs_cutting_tool_type_id'])]).id, [('code', '=', item['mrs_cutting_tool_type_id'])]).id,
"mrs_cutting_tool_integral_model_ids": self._get_functional_tool_model_ids( "mrs_cutting_tool_integral_model_ids": self._get_functional_tool_model_ids(
item['mrs_cutting_tool_integral_model_ids']), item['mrs_cutting_tool_integral_model_ids']),

6319
sf_plan_management/i18n/zh_CN.po Normal file
View File

File diff suppressed because it is too large Load Diff

510
sf_tool_management/models/base.py
View File

@@ -5,105 +5,283 @@ from odoo import fields, models, api
# class FunctionalCuttingToolEntity(models.Model): # class FunctionalCuttingToolEntity(models.Model):
# _name = 'sf.functional.cutting.tool.entity' # _name = 'sf.functional.cutting.tool.entity'
# _inherit = 'sf.functional.cutting.tool' # _inherit = 'sf.functional.cutting.tool'
# _inherits = {'sf.functional.cutting.tool': 'sf_functional_cutting_tool_entity_id'}
# _description = '功能刀具管理' # _description = '功能刀具管理'
class FunctionalCuttingToolEntity(models.Model): class FunctionalCuttingToolEntity(models.Model):
_name = 'sf.functional.cutting.tool.entity' _name = 'sf.functional.cutting.tool.entity'
_description = '功能刀具管理' _description = '功能刀具列表'
_inherits = {'sf.functional.cutting.tool': 'sf_functional_cutting_tool_entity_id'}
code = fields.Char('编码')
name = fields.Char('名称')
mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型')
mrs_cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', string='刀具型号')
# 整体式刀具型号
mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_functional_cutting_tool_entity_id',
string='整体式刀具型号', domain=
[('mrs_cutting_tool_material_name', '=', '整体式刀具')])
# 刀片型号
mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_cutting_tool_entity_id',
string='刀片型号', domain=
[('mrs_cutting_tool_material_name', '=', '刀片')])
# 刀杆型号
mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_functional_cutting_tool_entity_id',
string='刀杆型号', domain=
[('mrs_cutting_tool_material_name', '=', '刀杆')])
# 刀盘型号
mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_functional_cutting_tool_entity_id',
string='刀盘型号', domain=
[('mrs_cutting_tool_material_name', '=', '刀盘')])
# 刀柄型号
mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_functional_cutting_tool_entity_id',
string='刀柄型号', domain=
[('mrs_cutting_tool_material_name', '=', '刀柄')])
# 夹头型号
mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_functional_cutting_tool_entity_id',
string='夹头型号', domain=
[('mrs_cutting_tool_material_name', '=', '夹头')])
diameter = fields.Float('直径(mm)')
tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')],
string='刀具等级')
machining_accuracy = fields.Float('加工精度(mm)')
tool_length = fields.Float('装刀长')
blade_number = fields.Integer('刃数')
integral_blade_length = fields.Float('整体刃长(mm)')
effective_blade_length = fields.Float('有效刃长(mm)')
max_life = fields.Float('最大寿命值')
is_standard = fields.Boolean('是否标准刀')
applicable_range = fields.Char('适用范围')
image = fields.Binary('图片')
def _get_functional_tool_model_ids(self, functional_tool_model_code):
functional_tool_model_ids = []
for item in functional_tool_model_code:
functional_tool_model = self.env['sf.cutting.tool.model'].search([('code', '=', item)])
functional_tool_model_ids.append(functional_tool_model.id)
return [(6, 0, functional_tool_model_ids)]
class FunctionalToolWarning(models.Model):
_name = 'sf.functional.tool.warning'
_description = '功能刀具预警'
functional_cutting_tool_id = fields.Many2one('sf.functional.cutting.tool.entity', '功能刀具', readonly=True)
code = fields.Char('编码', readonly=True)
name = fields.Char('名称', invisible=True, readonly=True)
mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True)
# 整体式刀具型号
mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_functional_tool_warning_id',
string='整体式刀具型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '整体式刀具')])
# 刀片型号
mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_functional_tool_warning_id',
string='刀片型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '刀片')])
# 刀杆型号
mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_functional_tool_warning_id',
string='刀杆型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '刀杆')])
# 刀盘型号
mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_functional_tool_warning_id',
string='刀盘型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '刀盘')])
# 刀柄型号
mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_functional_tool_warning_id',
string='刀柄型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '刀柄')])
# 夹头型号
mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_functional_tool_warning_id',
string='夹头型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '夹头')])
diameter = fields.Float('直径(mm)', readonly=True)
tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')],
string='刀具等级', readonly=True)
machining_accuracy = fields.Float('加工精度(mm)', readonly=True)
tool_length = fields.Float('装刀长', readonly=True)
blade_number = fields.Integer('刃数', readonly=True)
integral_blade_length = fields.Float('整体刃长(mm)', readonly=True)
effective_blade_length = fields.Float('有效刃长(mm)', readonly=True)
max_life = fields.Float('最大寿命值', readonly=True)
is_standard = fields.Boolean('是否标准刀', readonly=True)
applicable_range = fields.Char('适用范围', readonly=True)
image = fields.Binary('图片', readonly=True)
# 新添加的关联到原模型的字段
sf_functional_cutting_tool_entity_id = fields.Many2one('sf.functional.cutting.tool', ondelete='cascade')
order = fields.Char(string='序')
functional_cutting_tool_id = fields.Char(string='功能刀具', invisible=True)
# 功能刀具预警 特有字段 # 功能刀具预警 特有字段
install_tool_time = fields.Char("装刀时间") install_tool_time = fields.Char("装刀时间", readonly=True)
outbound_time = fields.Char('出库时间') outbound_time = fields.Char('出库时间', readonly=True)
on_board_time = fields.Char('上机时间') on_board_time = fields.Char('上机时间', readonly=True)
machine_tool_code = fields.Char('机台号') machine_tool_code = fields.Char('机台号', readonly=True)
cutting_tool_code = fields.Char('刀位号') cutting_tool_code = fields.Char('刀位号', readonly=True)
idle_time = fields.Char('闲置时长') idle_time = fields.Char('闲置时长', readonly=True)
alarm_value = fields.Char('报警值') alarm_value = fields.Char('报警值', readonly=True)
used_value = fields.Char('已使用值') used_value = fields.Char('已使用值', readonly=True)
alarm_type = fields.Char('报警类型') alarm_type = fields.Char('报警类型', readonly=True)
alarm_time = fields.Char('报警时间') alarm_time = fields.Char('报警时间', readonly=True)
dispose_user = fields.Char('处理人') dispose_user = fields.Char('处理人', readonly=True)
dispose_time = fields.Char('处理时间') dispose_time = fields.Char('处理时间', readonly=True)
dispose_func = fields.Char('处理方法/措施') dispose_func = fields.Char('处理方法/措施', readonly=True)
remark = fields.Char('备注') remark = fields.Char('备注', readonly=True)
# 功能刀具出入库记录 特有字段 @api.onchange('functional_cutting_tool_id')
thickness = fields.Selection([('1', '粗'), ('2', '中'), ('3', '精')], string='粗/中/精') def onchange_functional_cutting_tool_id(self):
max_life_span = fields.Char(string='最大寿命值') print(self.functional_cutting_tool_id.name)
# alarm_value = fields.Char(string='报警值')
# used_value = fields.Char(string='已使用值')
current_state = fields.Char(string='当前状态') class RealTimeDistributionOfFunctionalTools(models.Model):
current_store_area = fields.Char(string='当前库区') _name = 'sf.real.time.distribution.of.functional.tools'
current_store_place = fields.Char(string='当前库位') _description = '功能刀具实时分布'
number = fields.Integer(string='数量')
reason_application = fields.Char(string='申请原因') functional_cutting_tool_id = fields.Many2one('sf.functional.cutting.tool.entity', '功能刀具', readonly=True)
applicant = fields.Char(string='申请人') code = fields.Char('编码', readonly=True)
return_staff = fields.Char(string='归还人') name = fields.Char('名称', invisible=True, readonly=True)
return_time = fields.Date(string='归还入库时间') mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True)
tool_state = fields.Char(string="刀具状态")
tool_install_staff = fields.Char(string='装刀人') # 整体式刀具型号
tool_install_time = fields.Datetime(string='装刀时间') mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model',
receive_equipment = fields.Char(string='领用机台') 'sf_real_time_distribution_of_functional_tools_id',
receive_staff = fields.Char(string='领用人') string='整体式刀具型号', readonly=True, domain=
receive_time = fields.Char(string='领用出库时间') [('mrs_cutting_tool_material_name', '=', '整体式刀具')])
# remark = fields.Text(string='备注/说明') # 刀片型号
mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_real_time_distribution_of_functional_tools_id',
string='刀片型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '刀片')])
# 刀杆型号
mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_real_time_distribution_of_functional_tools_id',
string='刀杆型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '刀杆')])
# 刀盘型号
mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_real_time_distribution_of_functional_tools_id',
string='刀盘型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '刀盘')])
# 刀柄型号
mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_real_time_distribution_of_functional_tools_id',
string='刀柄型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '刀柄')])
# 夹头型号
mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_real_time_distribution_of_functional_tools_id',
string='夹头型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '夹头')])
diameter = fields.Float('直径(mm)', readonly=True)
tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')],
string='刀具等级', readonly=True)
machining_accuracy = fields.Float('加工精度(mm)', readonly=True)
tool_length = fields.Float('装刀长', readonly=True)
blade_number = fields.Integer('刃数', readonly=True)
integral_blade_length = fields.Float('整体刃长(mm)', readonly=True)
effective_blade_length = fields.Float('有效刃长(mm)', readonly=True)
max_life = fields.Float('最大寿命值', readonly=True)
is_standard = fields.Boolean('是否标准刀', readonly=True)
applicable_range = fields.Char('适用范围', readonly=True)
image = fields.Binary('图片', readonly=True)
# 功能刀具实时分布 # 功能刀具实时分布
tool_stock_num = fields.Text(string='刀具房库存数量') tool_stock_num = fields.Char(string='刀具房库存数量', readonly=True)
side_shelf_num = fields.Text(string='线边货架货架数量') side_shelf_num = fields.Char(string='线边货架货架数量', readonly=True)
on_tool_stock_num = fields.Text(string='机内刀库库存数量') on_tool_stock_num = fields.Char(string='机内刀库库存数量', readonly=True)
tool_stock_total = fields.Text(string='合计') tool_stock_total = fields.Char(string='合计', readonly=True)
return_reuse_num_re = fields.Text(string='归还再用数量(精)') return_reuse_num_re = fields.Char(string='归还再用数量(精)', readonly=True)
return_reuse_num_co = fields.Text(string='归还再用数量(粗)') return_reuse_num_co = fields.Char(string='归还再用数量(粗)', readonly=True)
return_processing_num = fields.Text(string='归还需磨削数量') return_processing_num = fields.Char(string='归还需磨削数量', readonly=True)
return_total = fields.Text(string='合计') return_total = fields.Char(string='合计', readonly=True)
total = fields.Text(string='总计') total = fields.Char(string='总计', readonly=True)
remark = fields.Char(string='备注/说明', readonly=True)
# remark = fields.Char(string='备注/说明')
# @api.onchange('functional_cutting_tool_id') class InboundAndOutboundRecordsOfFunctionalTools(models.Model):
# def get_functional_cutting_tool_info(self): _name = 'sf.inbound.and.outbound.records.of.functional.tools'
# for item in self: _description = '功能刀具出入库记录'
# item.code = item.functional_cutting_tool_id.code,
# item.name = item.functional_cutting_tool_id.name,
# item.functional_model_number = item.functional_cutting_tool_id.functional_model_number,
# item.integral_model_number = item.functional_cutting_tool_id.integral_model_number,
# item.blade_model_number = item.functional_cutting_tool_id.blade_model_number,
# item.cutterbar_model_number = item.functional_cutting_tool_id.cutterbar_model_number,
# item.cutterpad_model_number = item.functional_cutting_tool_id.cutterpad_model_number,
# item.handle_model_number = item.functional_cutting_tool_id.handle_model_number,
# item.chuck_model_number = item.functional_cutting_tool_id.chuck_model_number,
# item.diameter = item.functional_cutting_tool_id.diameter,
# item.tool_grade = item.functional_cutting_tool_id.tool_grade,
# item.machining_accuracy = item.functional_cutting_tool_id.machining_accuracy,
# item.ctool_lengthode = item.functional_cutting_tool_id.tool_length,
# item.blade_number = item.functional_cutting_tool_id.blade_number,
# item.integral_blade_length = item.functional_cutting_tool_id.integral_blade_length,
# item.effective_blade_length = item.functional_cutting_tool_id.effective_blade_length,
# item.max_life = item.functional_cutting_tool_id.max_life,
# item.is_standard = item.functional_cutting_tool_id.is_standard,
# item.applicable_range = item.functional_cutting_tool_id.applicable_range,
@api.model functional_cutting_tool_id = fields.Many2one('sf.functional.cutting.tool.entity', '功能刀具', readonly=True)
def create(self, vals): code = fields.Char('编码', readonly=True)
name = fields.Char('名称', invisible=True, readonly=True)
mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True)
if not vals.get('order'): # 整体式刀具型号
vals['order'] = self._generate_code() mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model',
return super(FunctionalCuttingToolEntity, self).create(vals) 'sf_inbound_and_outbound_records_of_functional_tools_id',
string='整体式刀具型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '整体式刀具')])
# 刀片型号
mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_inbound_and_outbound_records_of_functional_tools_id',
string='刀片型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '刀片')])
# 刀杆型号
mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_inbound_and_outbound_records_of_functional_tools_id',
string='刀杆型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '刀杆')])
# 刀盘型号
mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_inbound_and_outbound_records_of_functional_tools_id',
string='刀盘型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '刀盘')])
# 刀柄型号
mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_inbound_and_outbound_records_of_functional_tools_id',
string='刀柄型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '刀柄')])
# 夹头型号
mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_inbound_and_outbound_records_of_functional_tools_id',
string='夹头型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '夹头')])
@api.model diameter = fields.Float('直径(mm)', readonly=True)
def _generate_code(self): tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')],
last_tool = self.search([], order='id desc', limit=1) string='刀具等级', readonly=True)
if last_tool: machining_accuracy = fields.Float('加工精度(mm)', readonly=True)
last_code = int(last_tool.code.split('-')[-1]) tool_length = fields.Float('装刀长', readonly=True)
new_code = '{:03d}'.format(last_code + 1) blade_number = fields.Integer('刃数', readonly=True)
else: integral_blade_length = fields.Float('整体刃长(mm)', readonly=True)
new_code = '001' effective_blade_length = fields.Float('有效刃长(mm)', readonly=True)
return new_code max_life = fields.Float('最大寿命值', readonly=True)
is_standard = fields.Boolean('是否标准刀', readonly=True)
applicable_range = fields.Char('适用范围', readonly=True)
image = fields.Binary('图片', readonly=True)
# 功能刀具出入库记录 特有字段
thickness = fields.Selection([('1', '粗'), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=True)
max_life_span = fields.Char(string='最大寿命值', readonly=True)
alarm_value = fields.Char(string='报警值', readonly=True)
used_value = fields.Char(string='已使用值', readonly=True)
current_state = fields.Char(string='当前状态', readonly=True)
current_store_area = fields.Char(string='当前库区', readonly=True)
current_store_place = fields.Char(string='当前库位', readonly=True)
number = fields.Integer(string='数量', readonly=True)
reason_application = fields.Char(string='申请原因', readonly=True)
applicant = fields.Char(string='申请人', readonly=True)
return_staff = fields.Char(string='归还人', readonly=True)
return_time = fields.Date(string='归还入库时间', readonly=True)
tool_state = fields.Char(string="刀具状态", readonly=True)
tool_install_staff = fields.Char(string='装刀人', readonly=True)
tool_install_time = fields.Datetime(string='装刀时间', readonly=True)
receive_equipment = fields.Char(string='领用机台', readonly=True)
receive_staff = fields.Char(string='领用人', readonly=True)
receive_time = fields.Char(string='领用出库时间', readonly=True)
remark = fields.Text(string='备注/说明', readonly=True)
class MachineTableToolChangingApply(models.Model): class MachineTableToolChangingApply(models.Model):
@@ -116,34 +294,34 @@ class MachineTableToolChangingApply(models.Model):
# string='换刀需求信息', # string='换刀需求信息',
# attrs="{'invisible': 1}") # attrs="{'invisible': 1}")
name = fields.Char(string='CNC机床') name = fields.Char(string='CNC机床', readonly="True")
# todo 机床类型和刀位号 为 Many2one # todo 机床类型和刀位号 为 Many2one
machine_table_type = fields.Char(string='机床类型') machine_table_type = fields.Char(string='机床类型', readonly="True")
machine_tool_code = fields.Char(string='机台号', attrs="{'invisible': 1}") machine_tool_code = fields.Char(string='机台号', attrs="{'invisible': 1}")
cutter_spacing_code = fields.Char(string='刀位号') cutter_spacing_code = fields.Char(string='刀位号', readonly="True")
functional_tool_code = fields.Char(string='功能刀具编码') functional_tool_code = fields.Char(string='功能刀具编码', readonly="True")
functional_tool_name = fields.Char(string='功能刀具名称') functional_tool_name = fields.Char(string='功能刀具名称', readonly="True")
# todo 功能刀具类型为 Many2one # todo 功能刀具类型为 Many2one
functional_tool_type = fields.Char(string='功能刀具类型') functional_tool_type = fields.Char(string='功能刀具类型', readonly="True")
diameter = fields.Char(string='直径') diameter = fields.Char(string='直径', readonly="True")
coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精') coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly="True")
hilt_name = fields.Char(string='刀柄名称') hilt_name = fields.Char(string='刀柄名称', readonly="True")
hilt_code = fields.Char(string='刀柄编号') hilt_code = fields.Char(string='刀柄编号', readonly="True")
max_lifetime_value = fields.Char(string='最大寿命值') max_lifetime_value = fields.Char(string='最大寿命值', readonly="True")
alarm_value = fields.Char(string='报警值') alarm_value = fields.Char(string='报警值', readonly="True")
used_value = fields.Char(string='已使用值') used_value = fields.Char(string='已使用值', readonly="True")
functional_tool_status = fields.Selection([('正常', '正常'), ('异常', '异常')], string='功能刀具状态', default='正常') functional_tool_status = fields.Selection([('正常', '正常'), ('异常', '异常')], string='功能刀具状态', default='正常', readonly="True")
replacement_tool_code = fields.Char(string='待换刀具编码') replacement_tool_code = fields.Char(string='待换刀具编码', readonly="True")
replacement_tool_name = fields.Char(string='待换刀具名称') replacement_tool_name = fields.Char(string='待换刀具名称', readonly="True")
replacement_tool_type = fields.Char(string='待换刀具类型') replacement_tool_type = fields.Char(string='待换刀具类型', readonly="True")
replacement_tool_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], replacement_tool_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')],
string='粗/中/精') string='粗/中/精', readonly="True")
new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧') new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', readonly="True")
applicant = fields.Char(string='申请人') applicant = fields.Char(string='申请人', readonly="True")
used_tool_time = fields.Datetime(string='用刀时间') used_tool_time = fields.Datetime(string='用刀时间', readonly="True")
reason_for_applying = fields.Char(string='申请原因') reason_for_applying = fields.Char(string='申请原因', readonly="True")
remark = fields.Char(string='备注说明') remark = fields.Char(string='备注说明', readonly="True")
status = fields.Selection([('0', '未操作'), ('1', '已换刀申请'), ('2', '已转移')], string='操作状态', default='0') status = fields.Selection([('0', '未操作'), ('1', '已换刀申请'), ('2', '已转移')], string='操作状态', default='0')
@@ -240,27 +418,28 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
_name = 'sf.cam.work.order.program.knife.plan' _name = 'sf.cam.work.order.program.knife.plan'
_description = 'CAM工单程序用刀计划' _description = 'CAM工单程序用刀计划'
name = fields.Char(string='工单任务编号') name = fields.Char(string='工单任务编号', readonly=True)
cam_procedure_code = fields.Char(string='CAM程序编号') cam_procedure_code = fields.Char(string='CAM程序编号', readonly=True)
cam_cutter_spacing_code = fields.Char(string='CAM刀位号') cam_cutter_spacing_code = fields.Char(string='CAM刀位号', readonly=True)
functional_tool_code = fields.Char(string='功能刀具编码') functional_tool_code = fields.Char(string='功能刀具编码', readonly=True)
functional_tool_name = fields.Char(string='功能刀具名称') functional_tool_name = fields.Char(string='功能刀具名称', readonly=True)
functional_tool_type = fields.Char(string='功能刀具类型') functional_tool_type = fields.Char(string='功能刀具类型', readonly=True)
machine_table_name = fields.Char(string='机床名称') machine_table_name = fields.Char(string='机床名称', readonly=True)
machine_tool_cutter_spacing_code = fields.Char(string='机床刀位号') machine_tool_cutter_spacing_code = fields.Char(string='机床刀位号', readonly=True)
diameter = fields.Char(string='直径（程式）') diameter = fields.Char(string='直径（程式）', readonly=True)
tool_loading_length = fields.Char(string='装刀长') tool_loading_length = fields.Char(string='装刀长', readonly=True)
clearance_length = fields.Char(string='避空长') clearance_length = fields.Char(string='避空长', readonly=True)
tool_included_angle = fields.Char(string='刀尖角（R角）') tool_included_angle = fields.Char(string='刀尖角（R角）', readonly=True)
L_D = fields.Char(string='L/D') L_D = fields.Char(string='L/D', readonly=True)
coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精') coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=True)
required_cutting_time = fields.Char(string='需要切割时间') required_cutting_time = fields.Char(string='需要切割时间', readonly=True)
whether_standard_tool = fields.Boolean(string='是否标准刀') whether_standard_tool = fields.Boolean(string='是否标准刀', readonly=True)
need_knife_time = fields.Datetime(string='需要用刀时间') need_knife_time = fields.Datetime(string='需要用刀时间', readonly=True)
plan_execute_status = fields.Selection([('0', '待下发'), ('1', '执行中'), ('2', '已完成')], string='计划执行状态', default='0') plan_execute_status = fields.Selection([('0', '待下发'), ('1', '执行中'), ('2', '已完成')],
applicant = fields.Char(string='申请人') string='计划执行状态', default='0', readonly=True)
reason_for_applying = fields.Char(string='申请原因') applicant = fields.Char(string='申请人', readonly=True)
remark = fields.Char(string='备注说明') reason_for_applying = fields.Char(string='申请原因', readonly=True)
remark = fields.Char(string='备注说明', readonly=True)
def automation_apply_for_tooling(self): def automation_apply_for_tooling(self):
""" """
@@ -309,44 +488,45 @@ class FunctionalToolAssembly(models.Model):
_description = '功能刀具组装' _description = '功能刀具组装'
_order = 'use_tool_time asc' _order = 'use_tool_time asc'
functional_tool_code = fields.Char(string='功能刀具编码') functional_tool_code = fields.Char(string='功能刀具编码', readonly=True)
name = fields.Char(string='功能刀具名称') name = fields.Char(string='功能刀具名称', readonly=True)
functional_tool_type = fields.Char(string='功能刀具类型') functional_tool_type = fields.Char(string='功能刀具类型', readonly=True)
functional_tool_diameter = fields.Char(string='功能刀具直径') functional_tool_diameter = fields.Char(string='功能刀具直径', readonly=True)
functional_tool_length = fields.Char(string='功能刀具伸出长') functional_tool_length = fields.Char(string='功能刀具伸出长', readonly=True)
functional_tool_cutting_type = fields.Char(string='功能刀具切削类型') functional_tool_cutting_type = fields.Char(string='功能刀具切削类型', readonly=True)
tool_name = fields.Char(string='刀具名称') tool_name = fields.Char(string='刀具名称', readonly=True)
tool_brand = fields.Char(string='品牌') tool_brand = fields.Char(string='品牌', readonly=True)
tool_type = fields.Char(string='型号') tool_type = fields.Char(string='型号', readonly=True)
knife_handle_name = fields.Char(string='刀柄名称') knife_handle_name = fields.Char(string='刀柄名称', readonly=True)
knife_handle_brand = fields.Char(string='品牌') knife_handle_brand = fields.Char(string='品牌', readonly=True)
knife_handle_type = fields.Char(string='型号') knife_handle_type = fields.Char(string='型号', readonly=True)
coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精') coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=True)
tool_loading_length = fields.Char(string='装刀长') tool_loading_length = fields.Char(string='装刀长', readonly=True)
new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧') new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', readonly=True)
reference_length = fields.Char(string='参考伸出长') reference_length = fields.Char(string='参考伸出长', readonly=True)
cut_time = fields.Char(string='已切削时间') cut_time = fields.Char(string='已切削时间', readonly=True)
cut_length = fields.Char(string='已切削长度') cut_length = fields.Char(string='已切削长度', readonly=True)
cut_number = fields.Char(string='已切削次数') cut_number = fields.Char(string='已切削次数', readonly=True)
loading_task_source = fields.Selection([('0', 'CAM装刀'), ('1', '机台换刀')], string='装刀任务来源') loading_task_source = fields.Selection([('0', 'CAM装刀'), ('1', '机台换刀')], string='装刀任务来源', readonly=True)
applicant = fields.Char(string='申请人') applicant = fields.Char(string='申请人', readonly=True)
reason_for_applying = fields.Char(string='申请原因') reason_for_applying = fields.Char(string='申请原因', readonly=True)
apply_time = fields.Datetime(string='申请时间', default=fields.Datetime.now()) apply_time = fields.Datetime(string='申请时间', default=fields.Datetime.now(), readonly=True)
assemble_status = fields.Selection([('0', '待组装'), ('1', '已组装'), ('2', '已出库')],string='组装状态', default='0') assemble_status = fields.Selection([('0', '待组装'), ('1', '已组装'), ('2', '已出库')],string='组装状态', default='0', readonly=True)
use_tool_time = fields.Datetime(string='用刀时间') use_tool_time = fields.Datetime(string='用刀时间', readonly=True)
production_line_name = fields.Char(string='产线名称') production_line_name = fields.Char(string='产线名称', readonly=True)
machine_tool_name = fields.Char(string='机床名称') machine_tool_name = fields.Char(string='机床名称', readonly=True)
machine_tool_code = fields.Char(string='机台号') machine_tool_code = fields.Char(string='机台号', readonly=True)
cutter_spacing_code = fields.Char(string='刀位号') cutter_spacing_code = fields.Char(string='刀位号', readonly=True)
tool_loading_person = fields.Char(string='装刀人')
tool_loading_time = fields.Datetime(string='装刀时间')
receive_person = fields.Char(string='领用人')
receive_time = fields.Datetime(string='领用出库时间')
remark = fields.Char(string='备注说明')
check_box_1 = fields.Boolean(string='复选框', default=False) tool_loading_person = fields.Char(string='装刀人', readonly=True)
tool_loading_time = fields.Datetime(string='装刀时间', readonly=True)
receive_person = fields.Char(string='领用人', readonly=True)
receive_time = fields.Datetime(string='领用出库时间', readonly=True)
remark = fields.Char(string='备注说明', readonly=True)
check_box_1 = fields.Boolean(string='复选框', default=False, readonly=True)
@api.onchange('assemble_status') @api.onchange('assemble_status')
def check_box(self): def check_box(self):

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

@@ -1,5 +1,9 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_sf_functional_cutting_tool_entity,sf.functional.cutting.tool.entity,model_sf_functional_cutting_tool_entity,base.group_user,1,1,1,1 access_sf_functional_cutting_tool_entity,sf.functional.cutting.tool.entity,model_sf_functional_cutting_tool_entity,base.group_user,1,1,1,1
access_sf.functional.tool.warning,sf.functional.tool.warning,model_sf_functional_tool_warning,base.group_user,1,0,1,0
access_sf.real.time.distribution.of.functional.tools,sf.real.time.distribution.of.functional.tools,model_sf_real_time_distribution_of_functional_tools,base.group_user,1,0,1,0
access_sf.inbound.and.outbound.records.of.functional.tools,sf.inbound.and.outbound.records.of.functional.tools,model_sf_inbound_and_outbound_records_of_functional_tools,base.group_user,1,0,1,0
access_sf_cam_work_order_program_knife_plan,sf.cam.work.order.program.knife.plan,model_sf_cam_work_order_program_knife_plan,base.group_user,1,1,1,1 access_sf_cam_work_order_program_knife_plan,sf.cam.work.order.program.knife.plan,model_sf_cam_work_order_program_knife_plan,base.group_user,1,1,1,1
access_sf_machine_table_tool_changing_apply,sf.machine.table.tool.changing.apply,model_sf_machine_table_tool_changing_apply,base.group_user,1,1,1,1 access_sf_machine_table_tool_changing_apply,sf.machine.table.tool.changing.apply,model_sf_machine_table_tool_changing_apply,base.group_user,1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_sf_functional_cutting_tool_entity sf.functional.cutting.tool.entity model_sf_functional_cutting_tool_entity base.group_user 1 1 1 1
3 access_sf.functional.tool.warning sf.functional.tool.warning model_sf_functional_tool_warning base.group_user 1 0 1 0
4 access_sf.real.time.distribution.of.functional.tools sf.real.time.distribution.of.functional.tools model_sf_real_time_distribution_of_functional_tools base.group_user 1 0 1 0
5 access_sf.inbound.and.outbound.records.of.functional.tools sf.inbound.and.outbound.records.of.functional.tools model_sf_inbound_and_outbound_records_of_functional_tools base.group_user 1 0 1 0
6 access_sf_cam_work_order_program_knife_plan sf.cam.work.order.program.knife.plan model_sf_cam_work_order_program_knife_plan base.group_user 1 1 1 1
7 access_sf_cam_work_order_program_knife_plan access_sf_machine_table_tool_changing_apply sf.cam.work.order.program.knife.plan sf.machine.table.tool.changing.apply model_sf_cam_work_order_program_knife_plan model_sf_machine_table_tool_changing_apply base.group_user 1 1 1 1
8 access_sf_machine_table_tool_changing_apply access_sf_tool_change_requirement_information sf.machine.table.tool.changing.apply sf.tool.change.requirement.information model_sf_machine_table_tool_changing_apply model_sf_tool_change_requirement_information base.group_user 1 1 1 1
9 access_sf_tool_change_requirement_information access_sf_tool_transfer_request_information sf.tool.change.requirement.information sf.tool.transfer.request.information model_sf_tool_change_requirement_information model_sf_tool_transfer_request_information base.group_user 1 1 1 1

8
sf_tool_management/views/menu_view.xml
View File

@@ -17,18 +17,18 @@
<menuitem <menuitem
id="menu_sf_functional_cutting_tool_warning" id="menu_sf_functional_tool_warning"
parent="menu_sf_tool_manage" parent="menu_sf_tool_manage"
name="功能刀具预警" name="功能刀具预警"
sequence="5" sequence="5"
action="action_sf_functional_cutting_tool_warning" action="action_sf_functional_tool_warning"
/> />
<menuitem <menuitem
sequence="6" sequence="6"
name="功能刀具实时分布" name="功能刀具实时分布"
id="menu_sf_functional_tool_real_time_distribution" id="menu_sf_functional_tool_real_time_distribution"
action="sf_functional_tool_real_time_distribution_view_act" action="sf_real_time_distribution_of_functional_tools_view_act"
parent="menu_sf_tool_manage" parent="menu_sf_tool_manage"
/> />
@@ -36,7 +36,7 @@
sequence="10" sequence="10"
name="功能刀具出入库记录" name="功能刀具出入库记录"
id="menu_sf_function_tool_entry_exit_records" id="menu_sf_function_tool_entry_exit_records"
action="sf_function_tool_entry_exit_records_view_act" action="sf_inbound_and_outbound_records_of_functional_tools_view_act"
parent="menu_sf_tool_manage" parent="menu_sf_tool_manage"
/> />

1084
sf_tool_management/views/tool_base_views.xml
View File

File diff suppressed because it is too large Load Diff

16
sf_tool_management/wizard/wizard_view.xml
View File

@@ -7,14 +7,12 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="换刀需求信息"> <form string="换刀需求信息">
<sheet> <sheet>
<group string="机床信息"> <group string="机床信息" col="3">
<group> <group>
<group> <field name="name"/>
<field name="name"/> </group>
</group> <group>
<group> <field name="machine_tool_code"/>
<field name="machine_tool_code"/>
</group>
</group> </group>
<group> <group>
<field name="cutter_spacing_code"/> <field name="cutter_spacing_code"/>
@@ -39,7 +37,9 @@
</group> </group>
</group> </group>
<group> <group>
<field name="reason_for_applying"/> <group>
<field name="reason_for_applying"/>
</group>
</group> </group>
</sheet> </sheet>
<footer> <footer>

20
sf_warehouse/views/view.xml
View File

@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<odoo> <odoo>
<data> <data>
<record id="view_location_tree2_sf_inherit" model="ir.ui.view"> <!-- <record id="view_location_tree2_sf_inherit" model="ir.ui.view"> -->
<field name="name">stock.location.tree.sf.inherit</field> <!-- <field name="name">stock.location.tree.sf.inherit</field> -->
<field name="model">stock.location</field> <!-- <field name="model">stock.location</field> -->
<field name="inherit_id" ref="stock.view_location_tree2"/> <!-- <field name="inherit_id" ref="stock.view_location_tree2"/> -->
<field name="arch" type="xml"> <!-- <field name="arch" type="xml"> -->
<xpath expr="//tree/field[@name='complete_name']" position="before"> <!-- <xpath expr="//tree/field[@name='complete_name']" position="before"> -->
<field name="barcode"/> <!-- <field name="barcode"/> -->
</xpath> <!-- </xpath> -->
</field> <!-- </field> -->
</record> <!-- </record> -->
<record id="view_location_form_sf_inherit" model="ir.ui.view"> <record id="view_location_form_sf_inherit" model="ir.ui.view">
<field name="name">stock.location.form.sf.inherit</field> <field name="name">stock.location.form.sf.inherit</field>