对功能刀具预警、实时分布和出入库记录的代码进行了合并优化

This commit is contained in:
yuxianghui
2023-06-14 16:27:16 +08:00
parent 3236d477c0
commit 24fd92fa3b
12 changed files with 259 additions and 335 deletions

View File

@@ -1,4 +1,2 @@
from . import base
from . import functional_tool_real_time_distribution
from . import function_tool_entry_exit_records

View File

@@ -1,3 +1,76 @@
# -*- coding: utf-8 -*-
from odoo import fields, models, api
class FunctionalCuttingToolEntity(models.Model):
_name = 'sf.functional.cutting.tool.entity'
_inherit = 'sf.functional.cutting.tool'
_description = '功能刀具管理'
order = fields.Char(string='')
# 功能刀具预警 特有字段
install_tool_time = fields.Char("装刀时间")
outbound_time = fields.Char('出库时间')
on_board_time = fields.Char('上机时间')
machine_tool_code = fields.Char('机台号')
cutting_tool_code = fields.Char('刀位号')
idle_time = fields.Char('闲置时长')
alarm_value = fields.Char('报警值')
used_value = fields.Char('已使用值')
alarm_type = fields.Char('报警类型')
alarm_time = fields.Char('报警时间')
dispose_user = fields.Char('处理人')
dispose_time = fields.Char('处理时间')
dispose_func = fields.Char('处理方法/措施')
remark = fields.Char('备注')
# 功能刀具出入库记录 特有字段
thickness = fields.Selection([('1', ''), ('2', ''), ('3', '')], string='粗/中/细')
max_life_span = fields.Char(string='最大寿命值')
# alarm_value = fields.Char(string='报警值')
# used_value = fields.Char(string='已使用值')
current_state = fields.Char(string='当前状态')
current_store_area = fields.Char(string='当前库区')
current_store_place = fields.Char(string='当前库位')
number = fields.Integer(string='数量')
reason_application = fields.Char(string='申请原因')
applicant = fields.Char(string='申请人')
return_staff = fields.Char(string='归还人')
return_time = fields.Date(string='归还入库时间')
tool_state = fields.Char(string="刀具状态")
tool_install_staff = fields.Char(string='装刀人')
tool_install_time = fields.Datetime(string='装刀时间')
receive_equipment = fields.Char(string='领用机台')
receive_staff = fields.Char(string='领用人')
receive_time = fields.Char(string='领用出库时间')
# remark = fields.Text(string='备注/说明')
# 功能刀具实时分布
tool_stock_num = fields.Text(string='刀具房库存数量')
side_shelf_num = fields.Text(string='线边货架货架数量')
on_tool_stock_num = fields.Text(string='机内刀库库存数量')
tool_stock_total = fields.Text(string='合计')
return_reuse_num_re = fields.Text(string='归还再用数量(精)')
return_reuse_num_co = fields.Text(string='归还再用数量(粗)')
return_processing_num = fields.Text(string='归还需磨削数量')
return_total = fields.Text(string='合计')
total = fields.Text(string='总计')
# remark = fields.Text(string='备注/说明')
@api.model
def create(self, vals):
if not vals.get('order'):
vals['order'] = self._generate_code()
return super(FunctionalCuttingToolEntity, self).create(vals)
@api.model
def _generate_code(self):
last_tool = self.search([], order='id desc', limit=1)
if last_tool:
last_code = int(last_tool.code.split('-')[-1])
new_code = '{:03d}'.format(last_code + 1)
else:
new_code = '001'
return new_code

View File

@@ -1,47 +0,0 @@
from odoo import models,fields,api
class FunctionToolEntryExitRecords(models.Model):
_name = 'sf.function.tool.entry.exit.records'
_description = '功能刀具出入库记录'
_inherit = 'sf.functional.cutting.tool'
order = fields.Char(string='')
thickness = fields.Selection([('1', ''), ('2', ''), ('3', '')], string='粗/中/细')
max_life_span = fields.Char(string='最大寿命值')
alarm_value = fields.Char(string='报警值')
used_value = fields.Char(string='已使用值')
current_state = fields.Char(string='当前状态')
current_store_area = fields.Char(string='当前库区')
current_store_place = fields.Char(string='当前库位')
number = fields.Integer(string='数量')
reason_application = fields.Char(string='申请原因')
applicant = fields.Char(string='申请人')
return_staff = fields.Char(string='归还人')
return_time = fields.Date(string='归还入库时间')
tool_state = fields.Char(string="刀具状态")
tool_install_staff = fields.Char(string='装刀人')
tool_install_time = fields.Datetime(string='装刀时间')
receive_equipment = fields.Char(string='领用机台')
receive_staff = fields.Char(string='领用人')
receive_time = fields.Char(string='领用出库时间')
remark = fields.Text(string='备注/说明')
@api.model
def create(self, vals):
if not vals.get('order'):
vals['order'] = self._generate_code()
return super(FunctionToolEntryExitRecords, self).create(vals)
@api.model
def _generate_code(self):
last_tool = self.search([], order='id desc', limit=1)
if last_tool:
last_code = int(last_tool.code.split('-')[-1])
new_code = '{:03d}'.format(last_code + 1)
else:
new_code = '001'
return new_code

View File

@@ -1,38 +0,0 @@
from odoo import fields, models,api
class FunctionalToolRealTimeDistribution(models.Model):
_name = 'sf.functional.tool.real.time.distribution'
_description = "功能刀具实时分布"
_inherit = 'sf.functional.cutting.tool'
order = fields.Char(string='')
tool_stock_num = fields.Text(string='刀具房库存数量')
side_shelf_num = fields.Text(string='线边货架货架数量')
on_tool_stock_num = fields.Text(string='机内刀库库存数量')
tool_stock_total = fields.Text(string='合计')
return_reuse_num_re = fields.Text(string='归还再用数量(精)')
return_reuse_num_co = fields.Text(string='归还再用数量(粗)')
return_processing_num = fields.Text(string='归还需磨削数量')
return_total = fields.Text(string='合计')
total = fields.Text(string='总计')
remark = fields.Text(string='备注/说明')
@api.model
def create(self, vals):
if not vals.get('order'):
vals['order'] = self._generate_code()
return super(FunctionalToolRealTimeDistribution, self).create(vals)
@api.model
def _generate_code(self):
last_tool = self.search([], order='id desc', limit=1)
if last_tool:
last_code = int(last_tool.code.split('-')[-1])
new_code = '{:03d}'.format(last_code + 1)
else:
new_code = '001'
return new_code