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

Merge branch refs/heads/develop into refs/heads/hotfix/优化多次编程单下发

Browse Source
This commit is contained in:
杨金灵
2024-06-06 09:29:39 +08:00
parent 2eaec4fa58 e306d02ff2
commit 0b2b162d85
23 changed files with 910 additions and 596 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
jikimo_frontend/static/src/scss/custom_style.scss
View File

@@ -504,3 +504,26 @@ div:has(.o_required_modifier) > label::before {
background-color: #4A4F59; background-color: #4A4F59;
border-color: #4A4F59; border-color: #4A4F59;
} }
// 功能刀具组装单 弹窗样式
.o_horizontal_separator.mt-4.mb-3.text-uppercase.fw-bolder.small ~ div.col-lg-6 .o_inner_group.col-lg-6 {
width: 100%;
}
.o_horizontal_separator.mt-4.mb-3.text-uppercase.fw-bolder.small ~ div .o_inner_group .o_wrap_field.d-flex.d-sm-contents.flex-column{
display: flex!important;
flex-direction: row!important;
input {
border-bottom: 1px solid;
}
}
// 设置表格横向滚动
.o_list_renderer.o_renderer {
max-width: 100%;
overflow-x: auto;
}
// 设置表单页面label文本不换行
.o_form_view .o_group .o_wrap_label .o_form_label {
white-space: nowrap;
}

2
sf_base/static/src/scss/format_img.scss
View File

@@ -1,7 +1,7 @@
.o_data_row .w-100 { .o_data_row .w-100 {
width: 40px !important; width: 40px !important;
height: 40px !important; height: 40px !important;
display: block !important; //display: block !important;
} }
.o_list_renderer .o_list_table tbody > tr > td:not(.o_list_record_selector):not(.o_handle_cell):not(.o_list_button):not(.o_list_record_remove) { .o_list_renderer .o_list_table tbody > tr > td:not(.o_list_record_selector):not(.o_handle_cell):not(.o_list_button):not(.o_list_record_remove) {

2
sf_manufacturing/controllers/controllers.py
View File

@@ -215,7 +215,7 @@ class Manufacturing_Connect(http.Controller):
if workorder.state != 'progress': if workorder.state != 'progress':
res = {'Succeed': False, 'ErrorCode': 202, 'Error': '该工单未开始'} res = {'Succeed': False, 'ErrorCode': 202, 'Error': '该工单未开始'}
return json.JSONEncoder().encode(res) return json.JSONEncoder().encode(res)
workorder.button_finish() workorder.write({'date_finished': datetime.now()})
# workorder.process_state = '待解除装夹' # workorder.process_state = '待解除装夹'
# workorder.sudo().production_id.process_state = '待解除装夹' # workorder.sudo().production_id.process_state = '待解除装夹'

75
sf_manufacturing/models/mrp_production.py
View File

@@ -5,7 +5,7 @@ import re
import requests import requests
from itertools import groupby from itertools import groupby
from odoo import api, fields, models, _ from odoo import api, fields, models, _
from odoo.exceptions import UserError,ValidationError from odoo.exceptions import UserError, ValidationError
from odoo.addons.sf_base.commons.common import Common from odoo.addons.sf_base.commons.common import Common
from odoo.tools import float_compare, float_round, float_is_zero, format_datetime from odoo.tools import float_compare, float_round, float_is_zero, format_datetime
@@ -77,6 +77,7 @@ class MrpProduction(models.Model):
part_drawing = fields.Binary('零件图纸') part_drawing = fields.Binary('零件图纸')
manual_quotation = fields.Boolean('人工编程', default=False, readonly=True) manual_quotation = fields.Boolean('人工编程', default=False, readonly=True)
rework_production = fields.Many2one('mrp.production', string='返工的制造订单')
@api.depends( @api.depends(
'move_raw_ids.state', 'move_raw_ids.quantity_done', 'move_finished_ids.state', 'move_raw_ids.state', 'move_raw_ids.quantity_done', 'move_finished_ids.state',
@@ -154,8 +155,30 @@ class MrpProduction(models.Model):
for production in self: for production in self:
production.maintenance_count = len(production.request_ids) production.maintenance_count = len(production.request_ids)
# 制造订单报废:编程单更新
def updateCNC(self):
try:
res = {'production_no': self.name, 'programming_no': self.programming_no,
'order_no': self.origin}
logging.info('res=%s:' % res)
configsettings = self.env['res.config.settings'].get_values()
config_header = Common.get_headers(self, configsettings['token'], configsettings['sf_secret_key'])
url = '/api/intelligent_programming/update_intelligent_programmings'
config_url = configsettings['sf_url'] + url
res['token'] = configsettings['token']
ret = requests.post(config_url, json={}, data=res, headers=config_header)
ret = ret.json()
logging.info('updateCNC-ret:%s' % ret)
if ret['status'] == 1:
self.write({'work_state': '已编程'})
else:
raise UserError(ret['message'])
except Exception as e:
logging.info('updateCNC error:%s' % e)
raise UserError("更新程单失败,请联系管理员")
# cnc程序获取 # cnc程序获取
def fetchCNC(self, production_names): def fetchCNC(self, production_names, scrap_production):
cnc = self.env['mrp.production'].search([('id', '=', self.id)]) cnc = self.env['mrp.production'].search([('id', '=', self.id)])
quick_order = self.env['quick.easy.order'].search( quick_order = self.env['quick.easy.order'].search(
[('name', '=', cnc.product_id.default_code.rsplit('-', 1)[0])]) [('name', '=', cnc.product_id.default_code.rsplit('-', 1)[0])])
@@ -171,6 +194,8 @@ class MrpProduction(models.Model):
'production_no': production_names, 'production_no': production_names,
'machine_tool_code': '', 'machine_tool_code': '',
'product_name': cnc.product_id.name, 'product_name': cnc.product_id.name,
'remanufacture_type': '' if not scrap_production else scrap_production.workorder_ids.filtered(
lambda b: b.routing_type == "CNC加工").test_results,
'model_code': cnc.product_id.model_code, 'model_code': cnc.product_id.model_code,
'material_code': self.env['sf.production.materials'].search( 'material_code': self.env['sf.production.materials'].search(
[('id', '=', cnc.product_id.materials_id.id)]).materials_no, [('id', '=', cnc.product_id.materials_id.id)]).materials_no,
@@ -268,7 +293,7 @@ class MrpProduction(models.Model):
# 则根据设备找到工作中心；否则采用前面描述的工作中心分配机制； # 则根据设备找到工作中心；否则采用前面描述的工作中心分配机制；
# 其他规则限制： 默认只分配给工作中心状态为非故障的工作中心； # 其他规则限制： 默认只分配给工作中心状态为非故障的工作中心；
def _create_workorder3(self): def _create_workorder3(self, is_fetchcnc=False, scrap_production=False):
# 根据product_id对self进行分组 # 根据product_id对self进行分组
grouped_product_ids = {k: list(g) for k, g in groupby(self, key=lambda x: x.product_id.id)} grouped_product_ids = {k: list(g) for k, g in groupby(self, key=lambda x: x.product_id.id)}
# 初始化一个字典来存储每个product_id对应的生产订单名称列表 # 初始化一个字典来存储每个product_id对应的生产订单名称列表
@@ -311,11 +336,16 @@ class MrpProduction(models.Model):
production_programming = self.search( production_programming = self.search(
[('product_id.id', '=', production.product_id.id), ('origin', '=', production.origin)], [('product_id.id', '=', production.product_id.id), ('origin', '=', production.origin)],
limit=1, order='id asc') limit=1, order='id asc')
if not production_programming.programming_no: if not production_programming.programming_no or (is_fetchcnc is True and scrap_production):
production.fetchCNC(', '.join(product_id_to_production_names[production.product_id.id])) # 制造订单报废/返工也需重新编程
if (is_fetchcnc is True and scrap_production) or (
is_fetchcnc is False and scrap_production):
production.fetchCNC(', '.join(product_id_to_production_names[production.product_id.id]),
scrap_production)
else: else:
production.write({'programming_no': production_programming.programming_no, production.write({'programming_no': production_programming.programming_no,
'programming_state': '编程中'}) 'programming_state': '编程中'})
# # 根据加工面板的面数及对应的工序模板生成工单 # # 根据加工面板的面数及对应的工序模板生成工单
i = 0 i = 0
processing_panel_len = len(production.product_id.model_processing_panel.split(',')) processing_panel_len = len(production.product_id.model_processing_panel.split(','))
@@ -379,6 +409,12 @@ class MrpProduction(models.Model):
workorders_values.append( workorders_values.append(
self.env['mrp.workorder'].json_workorder_str('', production, route)) self.env['mrp.workorder'].json_workorder_str('', production, route))
production.workorder_ids = workorders_values production.workorder_ids = workorders_values
if production_programming.programming_state == '已编程':
logging.info("production_programming: %s" % production_programming.name)
production.workorder_ids.filtered(lambda t: t.routing_type == 'CNC加工').write({
'cnc_ids': production_programming.workorder_ids.filtered(
lambda
t1: t1.routing_type == 'CNC加工').cnc_ids})
for workorder in production.workorder_ids: for workorder in production.workorder_ids:
workorder.duration_expected = workorder._get_duration_expected() workorder.duration_expected = workorder._get_duration_expected()
@@ -406,20 +442,15 @@ class MrpProduction(models.Model):
# 工单排序 # 工单排序
def _reset_work_order_sequence1(self, k): def _reset_work_order_sequence1(self, k):
sequen = 0
for rec in self: for rec in self:
current_sequence = 10 cnc_workorder = rec.workorder_ids.filtered(lambda wo: wo.name == "CNC加工")
cnc_back_workorder = rec.workorder_ids.filtered(lambda wo: wo.name == "CNC加工(返工)")
for work in rec.workorder_ids: for work in rec.workorder_ids:
work.sequence = current_sequence if work.name == cnc_workorder.name and work.processing_panel == k:
current_sequence += 10 cnc_back_workorder.write({'sequence': work.sequence + 1})
if work.name == '后置三元质量检测' and work.processing_panel == k: print(cnc_back_workorder.sequence)
sequen = work.sequence elif work.routing_type not in ['装夹预调'] and work != cnc_back_workorder:
work.sequence += 1
for work in rec.workorder_ids:
if work.name == '后置三元质量检测(返工)' and work.processing_panel == k:
work.sequence = sequen + 2
if work.name == 'CNC加工(返工)' and work.processing_panel == k:
work.sequence = sequen + 1
# 在制造订单上新增工单 # 在制造订单上新增工单
def _create_workorder1(self, k): def _create_workorder1(self, k):
@@ -459,13 +490,7 @@ class MrpProduction(models.Model):
order='sequence asc' order='sequence asc'
) )
i += 1 i += 1
for route in routingworkcenter: for route in routingworkcenter:
# if route.routing_type == '后置三元质量检测':
# workorders_values.append(
# self.env['mrp.workorder'].json_workorder_str1(k, production, route)
# )
if route.routing_type == 'CNC加工': if route.routing_type == 'CNC加工':
workorders_values.append( workorders_values.append(
self.env['mrp.workorder'].json_workorder_str1(k, production, route)) self.env['mrp.workorder'].json_workorder_str1(k, production, route))
@@ -532,8 +557,8 @@ class MrpProduction(models.Model):
# work.button_finish() # work.button_finish()
# 创建工单并进行排序 # 创建工单并进行排序
def _create_workorder(self): def _create_workorder(self, is_fetchcnc=False, scrap_production=False):
self._create_workorder3() self._create_workorder3(is_fetchcnc=is_fetchcnc, scrap_production=scrap_production)
self._reset_work_order_sequence() self._reset_work_order_sequence()
return True return True

138
sf_manufacturing/models/mrp_workorder.py
View File

@@ -199,7 +199,12 @@ class ResMrpWorkOrder(models.Model):
production_line_state = fields.Selection(related='production_id.production_line_state', production_line_state = fields.Selection(related='production_id.production_line_state',
string='上/下产线', store=True) string='上/下产线', store=True)
detection_report = fields.Binary('检测报告', readonly=True) detection_report = fields.Binary('检测报告', readonly=True)
is_remanufacture = fields.Boolean(string='是否重新生成制造订单', default=True) is_remanufacture = fields.Boolean(string='重新生成制造订单', default=False)
is_fetchcnc = fields.Boolean(string='重新获取NC程序', default=False)
reason = fields.Selection(
[("programming", "编程"), ("clamping", "返工"), ("cutter", "刀具"), ("operate computer", "操机"),
("technology", "工艺"), ("customer redrawing", "客户改图"), ("other", "其他"), ], string="原因")
detailed_reason = fields.Text('详细原因')
@api.onchange('rfid_code') @api.onchange('rfid_code')
def _onchange(self): def _onchange(self):
@@ -672,18 +677,64 @@ class ResMrpWorkOrder(models.Model):
""" """
重新生成制造订单或者重新生成工单 重新生成制造订单或者重新生成工单
""" """
if self.test_results == '报废': if self.test_results in ['返工', '报废']:
values = self.env['mrp.production'].create_production1_values(self.production_id) values = self.env['mrp.production'].create_production1_values(self.production_id)
productions = self.env['mrp.production'].with_user(SUPERUSER_ID).sudo().with_company( productions = self.env['mrp.production'].with_user(SUPERUSER_ID).sudo().with_company(
self.production_id.company_id).create( self.production_id.company_id).create(
values) values)
self.env['stock.move'].sudo().create(productions._get_moves_raw_values()) # self.env['stock.move'].sudo().create(productions._get_moves_raw_values())
self.env['stock.move'].sudo().create(productions._get_moves_finished_values()) self.env['stock.move'].sudo().create(productions._get_moves_finished_values())
productions._create_workorder() productions._create_workorder(is_fetchcnc=self.is_fetchcnc, scrap_production=self.production_id)
productions.filtered(lambda p: (not p.orderpoint_id and p.move_raw_ids) or \ productions.filtered(lambda p: (not p.orderpoint_id and p.move_raw_ids) or \
( (
p.move_dest_ids.procure_method != 'make_to_order' and p.move_dest_ids.procure_method != 'make_to_order' and
not p.move_raw_ids and not p.workorder_ids)).action_confirm() not p.move_raw_ids and not p.workorder_ids)).action_confirm()
for production_item in productions:
process_parameter_workorder = self.env['mrp.workorder'].search(
[('surface_technics_parameters_id', '!=', False), ('production_id', '=', production_item.id),
('is_subcontract', '=', True)])
if process_parameter_workorder:
is_pick = False
consecutive_workorders = []
m = 0
sorted_workorders = sorted(process_parameter_workorder, key=lambda w: w.id)
for i in range(len(sorted_workorders) - 1):
if m == 0:
is_pick = False
if sorted_workorders[i].supplier_id.id == sorted_workorders[i + 1].supplier_id.id and \
sorted_workorders[i].is_subcontract == sorted_workorders[i + 1].is_subcontract and \
sorted_workorders[i].id == sorted_workorders[i + 1].id - 1:
if sorted_workorders[i] not in consecutive_workorders:
consecutive_workorders.append(sorted_workorders[i])
consecutive_workorders.append(sorted_workorders[i + 1])
m += 1
continue
else:
if m == len(consecutive_workorders) - 1 and m != 0:
self.env['stock.picking'].create_outcontract_picking(consecutive_workorders,
production_item)
if sorted_workorders[i] in consecutive_workorders:
is_pick = True
consecutive_workorders = []
m = 0
# 当前面的连续工序生成对应的外协出入库单再生成当前工序的外协出入库单
if is_pick is False:
self.env['stock.picking'].create_outcontract_picking(sorted_workorders[i],
production_item)
if m == len(consecutive_workorders) - 1 and m != 0:
self.env['stock.picking'].create_outcontract_picking(consecutive_workorders,
production_item)
if sorted_workorders[i] in consecutive_workorders:
is_pick = True
consecutive_workorders = []
m = 0
if m == len(consecutive_workorders) - 1 and m != 0:
self.env['stock.picking'].create_outcontract_picking(consecutive_workorders, production_item)
if is_pick is False and m == 0:
if len(sorted_workorders) == 1:
self.env['stock.picking'].create_outcontract_picking(sorted_workorders, production_item)
else:
self.env['stock.picking'].create_outcontract_picking(sorted_workorders[i], production_item)
for production in productions: for production in productions:
origin_production = production.move_dest_ids and production.move_dest_ids[ origin_production = production.move_dest_ids and production.move_dest_ids[
@@ -704,13 +755,36 @@ class ResMrpWorkOrder(models.Model):
'mail.message_origin_link', 'mail.message_origin_link',
values={'self': production, 'origin': origin_production}, values={'self': production, 'origin': origin_production},
subtype_id=self.env.ref('mail.mt_note').id) subtype_id=self.env.ref('mail.mt_note').id)
if self.test_results == '返工':
productions = self.production_id '''
# self.env['stock.move'].sudo().create(productions._get_moves_raw_values()) 创建生产计划
# self.env['stock.move'].sudo().create(productions._get_moves_finished_values()) '''
productions._create_workorder2(self.processing_panel) # 工单耗时
else: workorder_duration = 0
self.results = '合格' for workorder in productions.workorder_ids:
workorder_duration += workorder.duration_expected
sale_order = self.env['sale.order'].sudo().search([('name', '=', productions.origin)])
if sale_order:
sale_order.mrp_production_ids |= productions
# sale_order.write({'schedule_status': 'to schedule'})
self.env['sf.production.plan'].sudo().with_company(self.production_id.company_id).create({
'name': productions.name,
'order_deadline': sale_order.deadline_of_delivery,
'production_id': productions.id,
'date_planned_start': productions.date_planned_start,
'origin': productions.origin,
'product_qty': productions.product_qty,
'product_id': productions.product_id.id,
'state': 'draft',
})
# if self.test_results == '返工':
# productions = self.production_id
# # self.env['stock.move'].sudo().create(productions._get_moves_raw_values())
# # self.env['stock.move'].sudo().create(productions._get_moves_finished_values())
# productions._create_workorder2(self.processing_panel)
# else:
# self.results = '合格'
def json_workorder_str1(self, k, production, route): def json_workorder_str1(self, k, production, route):
workorders_values_str = [0, '', { workorders_values_str = [0, '', {
@@ -720,7 +794,6 @@ class ResMrpWorkOrder(models.Model):
'name': '%s(返工)' % route.route_workcenter_id.name, 'name': '%s(返工)' % route.route_workcenter_id.name,
'processing_panel': k, 'processing_panel': k,
'routing_type': route.routing_type, 'routing_type': route.routing_type,
'work_state': '' if not route.routing_type == '获取CNC加工程序' else '待发起',
'workcenter_id': self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids, 'workcenter_id': self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids,
route.routing_type, route.routing_type,
production.product_id), production.product_id),
@@ -728,10 +801,37 @@ class ResMrpWorkOrder(models.Model):
'date_planned_finished': datetime.now() + timedelta(days=1), 'date_planned_finished': datetime.now() + timedelta(days=1),
'duration_expected': 60, 'duration_expected': 60,
'duration': 0, 'duration': 0,
'manual_quotation': production.workorder_ids.filtered(
lambda t: t.routing_type == 'CNC加工').manual_quotation,
'rfid_code': production.workorder_ids.filtered(lambda t: t.routing_type == 'CNC加工').rfid_code,
'cnc_ids': production.workorder_ids.filtered(lambda t: t.routing_type == 'CNC加工').cnc_ids,
'cmm_ids': production.workorder_ids.filtered(lambda t: t.routing_type == 'CNC加工').cmm_ids,
}] }]
return workorders_values_str return workorders_values_str
# @api.depends('production_availability', 'blocked_by_workorder_ids', 'blocked_by_workorder_ids.state')
# def _compute_state(self):
# super(ResMrpWorkOrder, self)._compute_state()
# for item in self:
# print(item.name)
# print(item.state)
# print(item.is_remanufacture)
# scrap_workorder = self.env['mrp.workorder'].search(
# [('production_id', '=', item.production_id.id), ('routing_type', '=', 'CNC加工'),
# ('state', '=', 'done'), ('test_results', 'in', ['返工', '报废'])])
# print(scrap_workorder)
# # if item.routing_type == 'CNC加工' and item.state in ['done'] and item.test_results in ['返工', '报废']:
# if item.routing_type == '解除装夹':
# if scrap_workorder and item.state not in ['cancel']:
# item.state = 'cancel'
# elif item.routing_type == '表面工艺':
# if scrap_workorder:
# stock_move = self.env['stock.move'].search(
# [('origin', '=', item.production_id.name)])
# stock_move.write({'state': 'cancel'})
# item.picking_ids.write({'state': 'cancel'})
# item.state = 'cancel'
# 重写工单开始按钮方法 # 重写工单开始按钮方法
def button_start(self): def button_start(self):
if self.routing_type == '装夹预调': if self.routing_type == '装夹预调':
@@ -887,6 +987,7 @@ class ResMrpWorkOrder(models.Model):
raise UserError( raise UserError(
'请先在产品中配置表面工艺为%s相关的外协服务产品' % item.surface_technics_parameters_id.name) '请先在产品中配置表面工艺为%s相关的外协服务产品' % item.surface_technics_parameters_id.name)
tem_date_planned_finished = record.date_planned_finished tem_date_planned_finished = record.date_planned_finished
tem_date_finished = record.date_finished
logging.info('routing_type:%s' % record.routing_type) logging.info('routing_type:%s' % record.routing_type)
super().button_finish() super().button_finish()
logging.info('date_planned_finished:%s' % record.date_planned_finished) logging.info('date_planned_finished:%s' % record.date_planned_finished)
@@ -895,6 +996,15 @@ class ResMrpWorkOrder(models.Model):
record.write({ record.write({
'date_planned_finished': tem_date_planned_finished # 保持原值 'date_planned_finished': tem_date_planned_finished # 保持原值
}) })
if record.routing_type == 'CNC加工':
record.write({
'date_finished': tem_date_finished # 保持原值
})
if record.routing_type == 'CNC加工' and record.test_results in ['返工', '报废']:
record.production_id.action_cancel()
record.production_id.workorder_ids.write({'rfid_code': False, 'rfid_code_old': record.rfid_code})
if record.is_remanufacture is True:
record.recreateManufacturingOrWorkerOrder()
is_production_id = True is_production_id = True
for workorder in record.production_id.workorder_ids: for workorder in record.production_id.workorder_ids:
if workorder.state != 'done': if workorder.state != 'done':
@@ -1035,8 +1145,10 @@ class CNCprocessing(models.Model):
# 根据程序名和加工面匹配到ftp里对应的Nc程序名,可优化为根据cnc_processing.program_path进行匹配 # 根据程序名和加工面匹配到ftp里对应的Nc程序名,可优化为根据cnc_processing.program_path进行匹配
def get_cnc_processing_file(self, serverdir, cnc_processing, program_path): def get_cnc_processing_file(self, serverdir, cnc_processing, program_path):
logging.info('serverdir:%s' % serverdir) logging.info('serverdir:%s' % serverdir)
logging.info('cnc_processing:%s' % cnc_processing)
for root, dirs, files in os.walk(serverdir): for root, dirs, files in os.walk(serverdir):
for f in files: for f in files:
logging.info('splitext(f):%s' % os.path.splitext(f)[1])
if os.path.splitext(f)[1] == ".pdf": if os.path.splitext(f)[1] == ".pdf":
full_path = os.path.join(serverdir, root, f) full_path = os.path.join(serverdir, root, f)
cnc_processing.workorder_id.cnc_worksheet = base64.b64encode( cnc_processing.workorder_id.cnc_worksheet = base64.b64encode(

6
sf_manufacturing/models/stock.py
View File

@@ -207,7 +207,7 @@ class StockRule(models.Model):
''' '''
创建工单 创建工单
''' '''
productions._create_workorder() productions._create_workorder(is_fetchcnc=False, scrap_production=False)
productions.filtered(lambda p: (not p.orderpoint_id and p.move_raw_ids) or \ productions.filtered(lambda p: (not p.orderpoint_id and p.move_raw_ids) or \
( (
@@ -631,8 +631,8 @@ class ReStockMove(models.Model):
'reserved_uom_qty': 1.0, 'reserved_uom_qty': 1.0,
'lot_id': purchase.picking_ids.move_line_ids.lot_id.id, 'lot_id': purchase.picking_ids.move_line_ids.lot_id.id,
'company_id': self.company_id.id, 'company_id': self.company_id.id,
'workorder_id': '' if not sorted_workorders else sorted_workorders.id, # 'workorder_id': '' if not sorted_workorders else sorted_workorders.id,
'production_id': '' if not sorted_workorders else sorted_workorders.production_id.id, # 'production_id': '' if not sorted_workorders else sorted_workorders.production_id.id,
'state': 'assigned', 'state': 'assigned',
} }

2
sf_manufacturing/views/agv_setting_views.xml
View File

@@ -36,7 +36,7 @@
<tree editable="bottom"> <tree editable="bottom">
<field name="name" required="1"/> <field name="name" required="1"/>
<field name="type" readonly="1" string="任务类型"/> <field name="type" readonly="1" string="任务类型"/>
<field name="route_type" string="类型"/> <field name="route_type" string="类型" required="1"/>
<field name="start_site_id" required="1" options="{'no_create': True}" string="起点接驳站"/> <field name="start_site_id" required="1" options="{'no_create': True}" string="起点接驳站"/>
<field name="end_site_id" required="1" options="{'no_create': True}" string="终点接驳站"/> <field name="end_site_id" required="1" options="{'no_create': True}" string="终点接驳站"/>
<field name="destination_production_line_id" required="1" options="{'no_create': True}"/> <field name="destination_production_line_id" required="1" options="{'no_create': True}"/>

12
sf_manufacturing/views/mrp_workorder_view.xml
View File

@@ -80,7 +80,7 @@
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
<field name="view_ids" eval="[(5, 0, 0), <field name="view_ids" eval="[(5, 0, 0),
(0, 0, {'view_mode': 'tree', 'view_id': ref('mrp.mrp_production_workorder_tree_editable_view')}) ]"/> (0, 0, {'view_mode': 'tree', 'view_id': ref('mrp.mrp_production_workorder_tree_editable_view')}) ]"/>
<!-- (0, 0, {'view_mode': 'kanban', 'view_id': ref('mrp.workcenter_line_kanban')})--> <!-- (0, 0, {'view_mode': 'kanban', 'view_id': ref('mrp.workcenter_line_kanban')})-->
<!-- <field name="target">fullscreen</field>--> <!-- <field name="target">fullscreen</field>-->
<field name="target">current</field> <field name="target">current</field>
<field name="domain">[('state', '!=', 'cancel'),('schedule_state', '=', '已排')]</field> <field name="domain">[('state', '!=', 'cancel'),('schedule_state', '=', '已排')]</field>
@@ -214,7 +214,7 @@
attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/> attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
<field name="functional_fixture_type_id" <field name="functional_fixture_type_id"
attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/> attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
<field name="rfid_code" force_save="1" readonly="1" cache="True" <field name="rfid_code" cache="True"
attrs="{'invisible': [('rfid_code_old', '!=', False)]}"/> attrs="{'invisible': [('rfid_code_old', '!=', False)]}"/>
<field name="rfid_code_old" readonly="1" attrs="{'invisible': [('rfid_code_old', '=', False)]}"/> <field name="rfid_code_old" readonly="1" attrs="{'invisible': [('rfid_code_old', '=', False)]}"/>
</group> </group>
@@ -477,7 +477,12 @@
<page string="后置三元检测" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'> <page string="后置三元检测" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
<group> <group>
<field name="test_results" attrs='{"invisible":[("results","!=",False)]}'/> <field name="test_results" attrs='{"invisible":[("results","!=",False)]}'/>
<field name="is_remanufacture" attrs='{"invisible":[("test_results","=","合格")]}'/> <field name="is_remanufacture" attrs='{"invisible":[("test_results","!=","报废")]}'/>
<field name="is_fetchcnc"
attrs='{"invisible":["|",("test_results","=","合格"),("is_remanufacture","=",False)]}'/>
<field name="reason"
attrs='{"required":[("test_results","!=","合格")],"invisible":[("test_results","=","合格")]}'/>
<field name="detailed_reason" attrs='{"invisible":[("test_results","=","合格")]}'/>
<field name="results" readonly="1" attrs='{"invisible":[("results","!=","合格")]}'/> <field name="results" readonly="1" attrs='{"invisible":[("results","!=","合格")]}'/>
<field name="detection_report" attrs='{"invisible":[("results","!=",False)]}' <field name="detection_report" attrs='{"invisible":[("results","!=",False)]}'
widget="pdf_viewer"/> widget="pdf_viewer"/>
@@ -618,7 +623,6 @@
<field name="route_id" options="{'no_create': True}" <field name="route_id" options="{'no_create': True}"
domain="[('route_type','in',['上产线','下产线'])]"/> domain="[('route_type','in',['上产线','下产线'])]"/>
<field name="feeder_station_start_id" readonly="1" force_save="1"/> <field name="feeder_station_start_id" readonly="1" force_save="1"/>
<field name="feeder_station_start_id" readonly="1" force_save="1"/>
<field name="feeder_station_destination_id" readonly="1" force_save="1"/> <field name="feeder_station_destination_id" readonly="1" force_save="1"/>
<field name="is_cnc_program_down" readonly="1"/> <field name="is_cnc_program_down" readonly="1"/>
<!-- <field name="rfid_code"/>--> <!-- <field name="rfid_code"/>-->

5
sf_mrs_connect/models/ftp_operate.py
View File

@@ -32,6 +32,9 @@ class FtpController():
logging.error(f"Error checking file: {e}") logging.error(f"Error checking file: {e}")
return False return False
# # 检测字符串的编码 # # 检测字符串的编码
# def detect_encoding(self, s): # def detect_encoding(self, s):
# result = chardet.detect(s) # result = chardet.detect(s)
@@ -43,6 +46,8 @@ class FtpController():
os.makedirs(serverdir) os.makedirs(serverdir)
try: try:
logging.info("进入FTP目录 ") logging.info("进入FTP目录 ")
self.ftp.pwd()
logging.info('当前目录:%s' % self.ftp.pwd())
logging.info('目录:%s' % target_dir) logging.info('目录:%s' % target_dir)
target_dir1 = target_dir.split('/') target_dir1 = target_dir.split('/')
logging.info('目录1:%s' % target_dir1[1]) logging.info('目录1:%s' % target_dir1[1])

31
sf_tool_management/controllers/controllers.py
View File

@@ -67,3 +67,34 @@ class Manufacturing_Connect(http.Controller):
res = {'Succeed': False, 'ErrorCode': 202, 'Error': e} res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
logging.info('get_functional_tool_entity_Info error:%s' % e) logging.info('get_functional_tool_entity_Info error:%s' % e)
return json.JSONEncoder().encode(res) return json.JSONEncoder().encode(res)
@http.route('/AutoDeviceApi/PutToolParameter', type='http', auth='none', methods=['GET', 'POST'], csrf=False,
cors="*")
def put_tool_preset_parameter_port(self, **kw):
"""
刀具预调仪接口
:param kw:
:return:
"""
logging.info('put_tool_preset_parameter_port:%s' % kw)
res = {'Succeed': True, 'Datas': []}
try:
datas = request.httprequest.data
ret = str(datas, 'utf-8')
data_lists = ret.split(",")
data_list = [data.replace('+', '') for data in data_lists]
logging.info(data_list)
tool_assembly = request.env['sf.functional.tool.assembly'].sudo().search(
[('assembly_order_code', '=', data_list[0]), ('start_preset_bool', '=', True)])
if not tool_assembly:
return json.JSONEncoder().encode(
{'Succeed': False, 'ErrorCode': 201, 'code': data_list[0], 'Error': '没有找到正在组装的组装单！'})
tool_assembly.write({
'after_assembly_tool_loading_length': float(data_list[1] or "0"), # 高度(总长度)
'after_assembly_functional_tool_diameter': float(data_list[2] or "0"), # 直径
'after_assembly_knife_tip_r_angle': float(data_list[3] or "0") # R角
})
except Exception as e:
res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
logging.info('put_tool_preset_parameter_port error:%s' % e)
return json.JSONEncoder().encode(res)

4
sf_tool_management/data/tool_data.xml
View File

@@ -5,8 +5,8 @@
<field name="model_id" ref="model_sf_tool_datasync"/> <field name="model_id" ref="model_sf_tool_datasync"/>
<field name="state">code</field> <field name="state">code</field>
<field name="code">model._cron_tool_datasync_all()</field> <field name="code">model._cron_tool_datasync_all()</field>
<field name="interval_number">1</field> <field name="interval_number">12</field>
<field name="interval_type">days</field> <field name="interval_type">hours</field>
<field name="numbercall">-1</field> <field name="numbercall">-1</field>
</record> </record>
</odoo> </odoo>

1
sf_tool_management/models/__init__.py
View File

@@ -6,4 +6,5 @@ from . import mrp_workorder
from . import functional_tool_enroll from . import functional_tool_enroll
from . import fixture_material_search from . import fixture_material_search
from . import fixture_enroll from . import fixture_enroll
from . import temporary_data_processing_methods

67
sf_tool_management/models/base.py
View File

@@ -550,12 +550,13 @@ class FunctionalToolAssembly(models.Model):
chuck_name = fields.Char('') chuck_name = fields.Char('')
# ============================================== # ==============================================
# 组装功能刀具参数信息 # 组装功能刀具参数信息
start_preset_bool = fields.Boolean('开始预调', default=False)
barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True) barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True)
after_assembly_functional_tool_name = fields.Char(string='组装后功能刀具名称', readonly=True) after_assembly_functional_tool_name = fields.Char(string='组装后功能刀具名称', readonly=True)
after_assembly_functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', after_assembly_functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model',
string='组装后功能刀具类型', readonly=True) string='组装后功能刀具类型', readonly=True)
after_assembly_functional_tool_diameter = fields.Float(string='组装后功能刀具直径(mm)', readonly=True) after_assembly_functional_tool_diameter = fields.Float(string='组装后功能刀具直径(mm)', readonly=True, digits=(10, 3))
after_assembly_knife_tip_r_angle = fields.Float(string='组装后刀尖R角(mm)', readonly=True) after_assembly_knife_tip_r_angle = fields.Float(string='组装后刀尖R角(mm)', readonly=True, digits=(10, 3))
after_assembly_new_former = fields.Selection([('0', '新'), ('1', '旧')], string='组装后新/旧', readonly=True) after_assembly_new_former = fields.Selection([('0', '新'), ('1', '旧')], string='组装后新/旧', readonly=True)
cut_time = fields.Integer(string='已切削时间(min)', readonly=True) cut_time = fields.Integer(string='已切削时间(min)', readonly=True)
cut_length = fields.Float(string='已切削长度(mm)', readonly=True) cut_length = fields.Float(string='已切削长度(mm)', readonly=True)
@@ -567,8 +568,9 @@ class FunctionalToolAssembly(models.Model):
after_assembly_max_lifetime_value = fields.Integer(string='组装后最大寿命值(min)', readonly=True) after_assembly_max_lifetime_value = fields.Integer(string='组装后最大寿命值(min)', readonly=True)
after_assembly_alarm_value = fields.Integer(string='组装后报警值(min)', readonly=True) after_assembly_alarm_value = fields.Integer(string='组装后报警值(min)', readonly=True)
after_assembly_used_value = fields.Integer(string='组装后已使用值(min)', readonly=True) after_assembly_used_value = fields.Integer(string='组装后已使用值(min)', readonly=True)
after_assembly_tool_loading_length = fields.Float(string='组装后总长度(mm)', readonly=True) after_assembly_tool_loading_length = fields.Float(string='组装后总长度(mm)', readonly=True, digits=(10, 3))
after_assembly_functional_tool_length = fields.Float(string='组装后伸出长(mm)', readonly=True) after_assembly_handle_length = fields.Float(string='组装后刀柄长度(mm)',readonly=True, digits=(10, 3))
after_assembly_functional_tool_length = fields.Float(string='组装后伸出长(mm)', readonly=True, digits=(10, 3))
after_assembly_effective_length = fields.Float(string='组装后有效长(mm)', readonly=True) after_assembly_effective_length = fields.Float(string='组装后有效长(mm)', readonly=True)
L_D_number = fields.Float(string='L/D值(mm)', readonly=True) L_D_number = fields.Float(string='L/D值(mm)', readonly=True)
hiding_length = fields.Float(string='避空长(mm)', readonly=True) hiding_length = fields.Float(string='避空长(mm)', readonly=True)
@@ -586,29 +588,64 @@ class FunctionalToolAssembly(models.Model):
active = fields.Boolean(string='已归档', default=True) active = fields.Boolean(string='已归档', default=True)
def put_start_preset(self):
self.search([('start_preset_bool', '=', True)]).write({'start_preset_bool': False})
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',
'name': '功能刀具组装单',
'view_mode': 'form',
'target': 'new',
'context': {'default_name': self.name,
'default_assembly_order_code': self.assembly_order_code,
'default_production_line_name_id': self.production_line_name_id.id,
'default_machine_tool_name_id': self.machine_tool_name_id.id,
'default_cutter_spacing_code_id': self.cutter_spacing_code_id.id,
'default_functional_tool_name': self.functional_tool_name,
'default_functional_tool_type_id': self.functional_tool_type_id.id,
'default_tool_groups_id': self.tool_groups_id.id,
'default_functional_tool_diameter': self.functional_tool_diameter,
'default_knife_tip_r_angle': self.knife_tip_r_angle,
'default_tool_loading_length': self.tool_loading_length,
'default_functional_tool_length': self.functional_tool_length,
'default_effective_length': self.effective_length,
'default_whether_standard_knife': self.whether_standard_knife,
'default_coarse_middle_thin': self.coarse_middle_thin,
'default_new_former': self.new_former,
'default_use_tool_time': self.use_tool_time,
'default_reason_for_applying': self.reason_for_applying
}
}
def _get_code(self, loading_task_source): def _get_code(self, loading_task_source):
""" """
自动生成组装单编码 自动生成组装单编码
""" """
new_time = str(fields.Date.today()) new_time = str(fields.Date.today())
datetime = new_time[2:4] + new_time[5:7] + new_time[-2:] datetime = new_time[2:4] + new_time[5:7]
if loading_task_source == '0':
code = 'C' + datetime
elif loading_task_source == '1':
code = 'J' + datetime
elif loading_task_source == '2':
code = 'K' + datetime
else:
code = False
functional_tool_assembly = self.env['sf.functional.tool.assembly'].sudo().search( functional_tool_assembly = self.env['sf.functional.tool.assembly'].sudo().search(
[('loading_task_source', '=', loading_task_source), [('loading_task_source', '=', loading_task_source),
('assembly_order_code', 'ilike', datetime)], limit=1, order="id desc") ('assembly_order_code', 'ilike', code)], limit=1, order="id desc")
if not functional_tool_assembly: if not functional_tool_assembly:
num = "%03d" % 1 num = "%03d" % 1
else: else:
m = int(functional_tool_assembly.assembly_order_code[-3:]) + 1 m = int(functional_tool_assembly.assembly_order_code[-3:]) + 1
num = "%03d" % m num = "%03d" % m
if loading_task_source == '0': return code + str(num)
code = 'CAMZZD' + datetime + str(num)
elif loading_task_source == '1':
code = 'JTZZD' + datetime + str(num)
elif loading_task_source == '2':
code = 'MTSZZD' + datetime + str(num)
else:
code = False
return code
def get_functional_tool(self, val): def get_functional_tool(self, val):
functional_tools = self.env['sf.functional.tool.assembly'].search( functional_tools = self.env['sf.functional.tool.assembly'].search(

110
sf_tool_management/models/fixture_enroll.py
View File

@@ -1,6 +1,7 @@
import json import json
import base64 import base64
import requests import requests
import logging
from odoo import models, api from odoo import models, api
from odoo.addons.sf_base.commons.common import Common from odoo.addons.sf_base.commons.common import Common
from odoo.exceptions import UserError from odoo.exceptions import UserError
@@ -10,30 +11,36 @@ class StockLot(models.Model):
_inherit = 'stock.lot' _inherit = 'stock.lot'
_description = '夹具物料序列号注册' _description = '夹具物料序列号注册'
def enroll_fixture_material_stock(self): def sync_enroll_fixture_material_stock_all(self):
logging.info("调用 sync_enroll_fixture_material_stock_all 同步接口")
sf_sync_config = self.env['res.config.settings'].get_values() sf_sync_config = self.env['res.config.settings'].get_values()
token = sf_sync_config['token'] token = sf_sync_config['token']
sf_secret_key = sf_sync_config['sf_secret_key'] sf_secret_key = sf_sync_config['sf_secret_key']
headers = Common.get_headers(self, token, sf_secret_key) headers = Common.get_headers(self, token, sf_secret_key)
str_url = sf_sync_config['sf_url'] + "/api/fixture_material_stock/create" str_url = sf_sync_config['sf_url'] + "/api/fixture_material_stock/create"
objs_all = self.env['stock.lot'].search([('id', '=', self.id)]) product_ids = self.env['product.product'].sudo().search([('categ_type', '=', '夹具')]).ids
objs_all = self.env['stock.lot'].search([('rfid', '!=', False), ('product_id', 'in', product_ids)])
fixture_material_stock_list = [] fixture_material_stock_list = []
if objs_all: try:
for item in objs_all: if objs_all:
val = { for item in objs_all:
'name': item.name, val = {
'tool_material_status': item.tool_material_status, 'name': item.name,
'location': [] if not item.quant_ids else item.quant_ids[-1].location_id.name, 'tool_material_status': item.tool_material_status,
'fixture_material_search_id': item.fixture_material_search_id.id, 'location': [] if not item.quant_ids else item.quant_ids[-1].location_id.name,
} 'fixture_material_search_id': item.fixture_material_search_id.id,
fixture_material_stock_list.append(val) }
kw = json.dumps(fixture_material_stock_list, ensure_ascii=False) fixture_material_stock_list.append(val)
r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers) kw = json.dumps(fixture_material_stock_list, ensure_ascii=False)
ret = r.json() r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
if ret.get('code') == 200: ret = r.json()
return '夹具物料序列号注册成功' if ret.get('code') == 200:
else: logging.info("夹具物料序列号每日同步成功")
raise UserError("没有注册夹具物料序列号信息") return '夹具物料序列号注册成功'
else:
logging.info("没有注册夹具物料序列号信息")
except Exception as e:
logging.info("夹具物料序列号同步失败:%s" % e)
class FixtureMaterialSearch(models.Model): class FixtureMaterialSearch(models.Model):
@@ -42,41 +49,46 @@ class FixtureMaterialSearch(models.Model):
crea_url = "/api/fixture_material/create" crea_url = "/api/fixture_material/create"
def enroll_fixture_material(self): def sync_enroll_fixture_material_all(self):
logging.info("调用 sync_enroll_fixture_material_all 同步接口")
sf_sync_config = self.env['res.config.settings'].get_values() sf_sync_config = self.env['res.config.settings'].get_values()
token = sf_sync_config['token'] token = sf_sync_config['token']
sf_secret_key = sf_sync_config['sf_secret_key'] sf_secret_key = sf_sync_config['sf_secret_key']
headers = Common.get_headers(self, token, sf_secret_key) headers = Common.get_headers(self, token, sf_secret_key)
str_url = sf_sync_config['sf_url'] + self.crea_url str_url = sf_sync_config['sf_url'] + self.crea_url
objs_all = self.search([('id', '=', self.id)]) objs_all = self.search([])
fixture_material_list = [] fixture_material_list = []
if objs_all: try:
for obj in objs_all: if objs_all:
val = { for obj in objs_all:
'name': obj.name, val = {
'id': obj.id, 'name': obj.name,
'fixture_material_code': obj.fixture_material_id.code, 'id': obj.id,
'fixture_model_code': obj.fixture_model_id.code, 'fixture_material_code': obj.fixture_material_id.code,
'specification_name': obj.specification_fixture_id.name, 'fixture_model_code': obj.fixture_model_id.code,
'image': '' if not obj.image else base64.b64encode(obj.image).decode('utf-8'), 'specification_name': obj.specification_fixture_id.name,
'number': obj.number, 'image': '' if not obj.image else base64.b64encode(obj.image).decode('utf-8'),
'usable_num': obj.usable_num, 'number': obj.number,
'have_been_used_num': obj.have_been_used_num, 'usable_num': obj.usable_num,
'scrap_num': obj.scrap_num 'have_been_used_num': obj.have_been_used_num,
} 'scrap_num': obj.scrap_num
fixture_material_list.append(val) }
kw = json.dumps(fixture_material_list, ensure_ascii=False) fixture_material_list.append(val)
r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers) kw = json.dumps(fixture_material_list, ensure_ascii=False)
ret = r.json() r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
if ret.get('code') == 200: ret = r.json()
return '夹具物料注册成功' if ret.get('code') == 200:
else: logging.info("夹具物料每日同步成功")
raise UserError("没有注册夹具物料信息") return '夹具物料注册成功'
else:
logging.info("没有注册夹具物料信息")
except Exception as e:
logging.info("夹具物料同步失败:%s" % e)
@api.model_create_multi # @api.model_create_multi
def create(self, vals_list): # def create(self, vals_list):
records = super(FixtureMaterialSearch, self).create(vals_list) # records = super(FixtureMaterialSearch, self).create(vals_list)
for record in records: # for record in records:
if record: # if record:
record.enroll_fixture_material() # record.enroll_fixture_material()
return records # return records

16
sf_tool_management/models/functional_tool.py
View File

@@ -25,12 +25,13 @@ class FunctionalCuttingToolEntity(models.Model):
sf_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', sf_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型',
group_expand='_read_group_mrs_cutting_tool_type_id', compute_sudo=True) group_expand='_read_group_mrs_cutting_tool_type_id', compute_sudo=True)
functional_tool_diameter = fields.Float(string='刀具直径(mm)', readonly=True) functional_tool_diameter = fields.Float(string='刀具直径(mm)', readonly=True, digits=(10, 3))
knife_tip_r_angle = fields.Float(string='刀尖R角(mm)', readonly=True) knife_tip_r_angle = fields.Float(string='刀尖R角(mm)', readonly=True, digits=(10, 3))
coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=True) coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=True)
new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', readonly=True) new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', readonly=True)
tool_loading_length = fields.Float(string='总长度(mm)', readonly=True) tool_loading_length = fields.Float(string='总长度(mm)', readonly=True, digits=(10, 3))
functional_tool_length = fields.Float(string='伸出长(mm)', readonly=True) handle_length = fields.Float(string='刀柄长度(mm)',readonly=True, digits=(10, 3))
functional_tool_length = fields.Float(string='伸出长(mm)', readonly=True, digits=(10, 3))
effective_length = fields.Float(string='有效长(mm)', readonly=True) effective_length = fields.Float(string='有效长(mm)', readonly=True)
tool_room_num = fields.Integer(string='刀具房数量', readonly=True) tool_room_num = fields.Integer(string='刀具房数量', readonly=True)
line_edge_knife_library_num = fields.Integer(string='线边刀库数量', readonly=True) line_edge_knife_library_num = fields.Integer(string='线边刀库数量', readonly=True)
@@ -51,13 +52,6 @@ class FunctionalCuttingToolEntity(models.Model):
safe_inventory_id = fields.Many2one('sf.real.time.distribution.of.functional.tools', safe_inventory_id = fields.Many2one('sf.real.time.distribution.of.functional.tools',
string='功能刀具安全库存', readonly=True) string='功能刀具安全库存', readonly=True)
def button_safe_inventory_id(self):
"""更新功能刀具关联的安全库存记录"""
tool_is = self.search([])
for item in tool_is:
item.safe_inventory_id = self.env['sf.real.time.distribution.of.functional.tools'].search(
[('functional_name_id', '=', item.tool_name_id.id)])[0]
@api.depends('barcode_id.quant_ids', 'functional_tool_status') @api.depends('barcode_id.quant_ids', 'functional_tool_status')
def _compute_current_location_id(self): def _compute_current_location_id(self):
for record in self: for record in self:

606
sf_tool_management/models/functional_tool_enroll.py
View File

@@ -33,23 +33,26 @@ def get_suitable_coolant_names(item):
class ToolDatasync(models.Model): class ToolDatasync(models.Model):
_name = 'sf.tool.datasync' _name = 'sf.tool.datasync'
_description = '定时同步所有刀具' _description = '定时同步所有刀具、夹具'
def _cron_tool_datasync_all(self): def _cron_tool_datasync_all(self):
try: try:
self.env['stock.lot'].sudo().sync_enroll_tool_material_stock_all() self.env['stock.lot'].sudo().sync_enroll_tool_material_stock_all()
logging.info("刀具物料序列号每日同步成功")
self.env['stock.lot'].sudo().sync_enroll_fixture_material_stock_all()
self.env['sf.tool.material.search'].sudo().sync_enroll_tool_material_all() self.env['sf.tool.material.search'].sudo().sync_enroll_tool_material_all()
logging.info("刀具物料每日同步成功")
self.env['sf.fixture.material.search'].sudo().sync_enroll_fixture_material_all()
self.env['sf.functional.cutting.tool.entity'].sudo().esync_enroll_functional_tool_entity_all() self.env['sf.functional.cutting.tool.entity'].sudo().esync_enroll_functional_tool_entity_all()
logging.info("功能刀具列表每日同步成功") logging.info("已全部同步完成！！！")
self.env['sf.functional.tool.warning'].sudo().sync_enroll_functional_tool_warning_all() # self.env['sf.functional.tool.warning'].sudo().sync_enroll_functional_tool_warning_all()
logging.info("功能刀具预警每日同步成功") # logging.info("功能刀具预警每日同步成功")
self.env['stock.move.line'].sudo().sync_enroll_functional_tool_move_all() # self.env['stock.move.line'].sudo().sync_enroll_functional_tool_move_all()
logging.info("功能刀具出入库记录每日同步成功") # logging.info("功能刀具出入库记录每日同步成功")
self.env[ # self.env['sf.real.time.distribution.of.functional.tools'].sudo().sync_enroll_functional_tool_real_time_distribution_all()
'sf.real.time.distribution.of.functional.tools'].sudo().sync_enroll_functional_tool_real_time_distribution_all() # logging.info("功能刀具安全库存每日同步成功")
logging.info("功能刀具安全库存每日同步成功")
except Exception as e: except Exception as e:
logging.info("捕获错误信息:%s" % e) logging.info("捕获错误信息:%s" % e)
raise ValidationError("数据错误导致同步失败,请联系管理员") raise ValidationError("数据错误导致同步失败,请联系管理员")
@@ -59,24 +62,25 @@ class StockLot(models.Model):
_inherit = 'stock.lot' _inherit = 'stock.lot'
_description = '刀具物料序列号注册' _description = '刀具物料序列号注册'
def enroll_tool_material_stock(self): # def enroll_tool_material_stock(self):
logging.info('调用刀具物料序列号注册接口: enroll_tool_material_stock()') # logging.info('调用刀具物料序列号注册接口: enroll_tool_material_stock()')
sf_sync_config = self.env['res.config.settings'].get_values() # sf_sync_config = self.env['res.config.settings'].get_values()
token = sf_sync_config['token'] # token = sf_sync_config['token']
sf_secret_key = sf_sync_config['sf_secret_key'] # sf_secret_key = sf_sync_config['sf_secret_key']
headers = Common.get_headers(self, token, sf_secret_key) # headers = Common.get_headers(self, token, sf_secret_key)
str_url = sf_sync_config['sf_url'] + "/api/tool_material_stock/create" # str_url = sf_sync_config['sf_url'] + "/api/tool_material_stock/create"
objs_all = self.env['stock.lot'].search([('id', '=', self.id), ('active', 'in', [True, False])]) # objs_all = self.env['stock.lot'].search([('id', '=', self.id), ('active', 'in', [True, False])])
self._get_sync_stock_lot(objs_all, str_url, token, headers) # self._get_sync_stock_lot(objs_all, str_url, token, headers)
def sync_enroll_tool_material_stock_all(self): def sync_enroll_tool_material_stock_all(self):
logging.info('调用刀具物料序列号注册接口: sync_enroll_tool_material_stock_all()') logging.info('调用 sync_enroll_tool_material_stock_all 同步接口')
sf_sync_config = self.env['res.config.settings'].get_values() sf_sync_config = self.env['res.config.settings'].get_values()
token = sf_sync_config['token'] token = sf_sync_config['token']
sf_secret_key = sf_sync_config['sf_secret_key'] sf_secret_key = sf_sync_config['sf_secret_key']
headers = Common.get_headers(self, token, sf_secret_key) headers = Common.get_headers(self, token, sf_secret_key)
str_url = sf_sync_config['sf_url'] + "/api/tool_material_stock/create" str_url = sf_sync_config['sf_url'] + "/api/tool_material_stock/create"
objs_all = self.env['stock.lot'].search([('rfid', '!=', False)]) product_ids = self.env['product.product'].sudo().search([('categ_type', '=', '刀具')]).ids
objs_all = self.env['stock.lot'].search([('rfid', '!=', False), ('product_id', 'in', product_ids)])
self._get_sync_stock_lot(objs_all, str_url, token, headers) self._get_sync_stock_lot(objs_all, str_url, token, headers)
def _get_sync_stock_lot(self, objs_all, str_url, token, headers): def _get_sync_stock_lot(self, objs_all, str_url, token, headers):
@@ -95,11 +99,12 @@ class StockLot(models.Model):
r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers) r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
ret = r.json() ret = r.json()
if ret.get('code') == 200: if ret.get('code') == 200:
return '刀具物料序列号注册成功' logging.info("刀具物料序列号每日同步成功")
return '刀具(夹具)物料序列号注册成功'
else: else:
logging.info("没有注册刀具物料序列号信息") logging.info("没有刀具物料序列号信息")
except Exception as e: except Exception as e:
logging.info("捕获错误信息:%s" % e) logging.info("刀具物料序列号同步失败:%s" % e)
class ToolMaterial(models.Model): class ToolMaterial(models.Model):
@@ -108,18 +113,18 @@ class ToolMaterial(models.Model):
crea_url = '/api/tool_material/create' crea_url = '/api/tool_material/create'
def enroll_tool_material(self): # def enroll_tool_material(self):
logging.info('调用刀具物料注册接口: enroll_tool_material()') # logging.info('调用刀具物料注册接口: enroll_tool_material()')
sf_sync_config = self.env['res.config.settings'].get_values() # sf_sync_config = self.env['res.config.settings'].get_values()
token = sf_sync_config['token'] # token = sf_sync_config['token']
sf_secret_key = sf_sync_config['sf_secret_key'] # sf_secret_key = sf_sync_config['sf_secret_key']
headers = Common.get_headers(self, token, sf_secret_key) # headers = Common.get_headers(self, token, sf_secret_key)
str_url = sf_sync_config['sf_url'] + self.crea_url # str_url = sf_sync_config['sf_url'] + self.crea_url
objs_all = self.search([('id', '=', self.id)]) # objs_all = self.search([('id', '=', self.id)])
self._get_sync_tool_material_search(objs_all, str_url, token, headers) # self._get_sync_tool_material_search(objs_all, str_url, token, headers)
def sync_enroll_tool_material_all(self): def sync_enroll_tool_material_all(self):
logging.info('调用刀具物料注册接口: sync_enroll_tool_material_all()') logging.info('调用 sync_enroll_tool_material_all 同步接口')
sf_sync_config = self.env['res.config.settings'].get_values() sf_sync_config = self.env['res.config.settings'].get_values()
token = sf_sync_config['token'] token = sf_sync_config['token']
sf_secret_key = sf_sync_config['sf_secret_key'] sf_secret_key = sf_sync_config['sf_secret_key']
@@ -150,19 +155,20 @@ class ToolMaterial(models.Model):
r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers) r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
ret = r.json() ret = r.json()
if ret.get('code') == 200: if ret.get('code') == 200:
logging.info("刀具物料每日同步成功")
return '刀具物料注册成功' return '刀具物料注册成功'
else: else:
logging.info('没有注册刀具物料信息') logging.info('没有注册刀具物料信息')
except Exception as e: except Exception as e:
logging.info("捕获错误信息:%s" % e) logging.info("刀具物料同步失败:%s" % e)
@api.model_create_multi # @api.model_create_multi
def create(self, vals_list): # def create(self, vals_list):
records = super(ToolMaterial, self).create(vals_list) # records = super(ToolMaterial, self).create(vals_list)
for record in records: # for record in records:
if record: # if record:
record.enroll_tool_material() # record.enroll_tool_material()
return records # return records
class FunctionalCuttingToolEntity(models.Model): class FunctionalCuttingToolEntity(models.Model):
@@ -172,18 +178,18 @@ class FunctionalCuttingToolEntity(models.Model):
crea_url = "/api/functional_tool_entity/create" crea_url = "/api/functional_tool_entity/create"
# 注册同步功能刀具列表 # 注册同步功能刀具列表
def enroll_functional_tool_entity(self): # def enroll_functional_tool_entity(self):
logging.info('调用功能刀具列表注册接口: enroll_functional_tool_entity()') # logging.info('调用功能刀具列表注册接口: enroll_functional_tool_entity()')
sf_sync_config = self.env['res.config.settings'].get_values() # sf_sync_config = self.env['res.config.settings'].get_values()
token = sf_sync_config['token'] # token = sf_sync_config['token']
sf_secret_key = sf_sync_config['sf_secret_key'] # sf_secret_key = sf_sync_config['sf_secret_key']
headers = Common.get_headers(self, token, sf_secret_key) # headers = Common.get_headers(self, token, sf_secret_key)
str_url = sf_sync_config['sf_url'] + self.crea_url # str_url = sf_sync_config['sf_url'] + self.crea_url
objs_all = self.env['sf.functional.cutting.tool.entity'].search([('id', '=', self.id)]) # objs_all = self.env['sf.functional.cutting.tool.entity'].search([('id', '=', self.id)])
self._get_sync_functional_cutting_tool_entity(objs_all, str_url, token, headers) # self._get_sync_functional_cutting_tool_entity(objs_all, str_url, token, headers)
def esync_enroll_functional_tool_entity_all(self): def esync_enroll_functional_tool_entity_all(self):
logging.info('调用功能刀具列表注册接口: esync_enroll_functional_tool_entity_all()') logging.info('调用 esync_enroll_functional_tool_entity_all 同步接口')
sf_sync_config = self.env['res.config.settings'].get_values() sf_sync_config = self.env['res.config.settings'].get_values()
token = sf_sync_config['token'] token = sf_sync_config['token']
sf_secret_key = sf_sync_config['sf_secret_key'] sf_secret_key = sf_sync_config['sf_secret_key']
@@ -210,6 +216,7 @@ class FunctionalCuttingToolEntity(models.Model):
'coarse_middle_thin': item.coarse_middle_thin, 'coarse_middle_thin': item.coarse_middle_thin,
'new_former': item.new_former, 'new_former': item.new_former,
'tool_loading_length': item.tool_loading_length, 'tool_loading_length': item.tool_loading_length,
'handle_length': item.handle_length,
'functional_tool_length': item.functional_tool_length, 'functional_tool_length': item.functional_tool_length,
'effective_length': item.effective_length, 'effective_length': item.effective_length,
'max_lifetime_value': item.max_lifetime_value, 'max_lifetime_value': item.max_lifetime_value,
@@ -242,256 +249,257 @@ class FunctionalCuttingToolEntity(models.Model):
r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers) r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
ret = r.json() ret = r.json()
if ret.get('code') == 200: if ret.get('code') == 200:
logging.info("功能刀具列表每日同步成功")
return "功能刀具注册成功" return "功能刀具注册成功"
else: else:
logging.info('没有注册功能刀具信息') logging.info('没有注册功能刀具信息')
except Exception as e: except Exception as e:
logging.info("捕获错误信息:%s" % e) logging.info("功能刀具同步失败:%s" % e)
@api.model_create_multi # @api.model_create_multi
def create(self, vals_list): # def create(self, vals_list):
records = super(FunctionalCuttingToolEntity, self).create(vals_list) # records = super(FunctionalCuttingToolEntity, self).create(vals_list)
for record in records: # for record in records:
if record: # if record:
record.enroll_functional_tool_entity() # record.enroll_functional_tool_entity()
return records # return records
def write(self, vals): # def write(self, vals):
res = super().write(vals) # res = super().write(vals)
if vals.get('current_location'): # if vals.get('current_location'):
self.enroll_functional_tool_entity() # self.enroll_functional_tool_entity()
return res # return res
#
class FunctionalToolWarning(models.Model): # class FunctionalToolWarning(models.Model):
_inherit = 'sf.functional.tool.warning' # _inherit = 'sf.functional.tool.warning'
_description = '功能刀具预警注册' # _description = '功能刀具预警注册'
#
crea_url = "/api/functional_tool_warning/create" # crea_url = "/api/functional_tool_warning/create"
#
# 注册同步功能刀具预警 # # 注册同步功能刀具预警
def enroll_functional_tool_warning(self): # def enroll_functional_tool_warning(self):
logging.info('调用功能刀具预警注册接口: enroll_functional_tool_warning()') # logging.info('调用功能刀具预警注册接口: enroll_functional_tool_warning()')
sf_sync_config = self.env['res.config.settings'].get_values() # sf_sync_config = self.env['res.config.settings'].get_values()
token = sf_sync_config['token'] # token = sf_sync_config['token']
sf_secret_key = sf_sync_config['sf_secret_key'] # sf_secret_key = sf_sync_config['sf_secret_key']
headers = Common.get_headers(self, token, sf_secret_key) # headers = Common.get_headers(self, token, sf_secret_key)
str_url = sf_sync_config['sf_url'] + self.crea_url # str_url = sf_sync_config['sf_url'] + self.crea_url
objs_all = self.env['sf.functional.tool.warning'].search([('id', '=', self.id)]) # objs_all = self.env['sf.functional.tool.warning'].search([('id', '=', self.id)])
self.get_sync_functional_tool_warning(objs_all, str_url, token, headers) # self.get_sync_functional_tool_warning(objs_all, str_url, token, headers)
#
def sync_enroll_functional_tool_warning_all(self): # def sync_enroll_functional_tool_warning_all(self):
logging.info('调用功能刀具预警注册接口: sync_enroll_functional_tool_warning_all()') # logging.info('调用功能刀具预警注册接口: sync_enroll_functional_tool_warning_all()')
sf_sync_config = self.env['res.config.settings'].get_values() # sf_sync_config = self.env['res.config.settings'].get_values()
token = sf_sync_config['token'] # token = sf_sync_config['token']
sf_secret_key = sf_sync_config['sf_secret_key'] # sf_secret_key = sf_sync_config['sf_secret_key']
headers = Common.get_headers(self, token, sf_secret_key) # headers = Common.get_headers(self, token, sf_secret_key)
str_url = sf_sync_config['sf_url'] + self.crea_url # str_url = sf_sync_config['sf_url'] + self.crea_url
objs_all = self.env['sf.functional.tool.warning'].search([]) # objs_all = self.env['sf.functional.tool.warning'].search([])
self.get_sync_functional_tool_warning(objs_all, str_url, token, headers) # self.get_sync_functional_tool_warning(objs_all, str_url, token, headers)
#
def get_sync_functional_tool_warning(self, objs_all, str_url, token, headers): # def get_sync_functional_tool_warning(self, objs_all, str_url, token, headers):
tool_warning_list = [] # tool_warning_list = []
try: # try:
if objs_all: # if objs_all:
for item in objs_all: # for item in objs_all:
val = { # val = {
'id': item.id, # 'id': item.id,
'name': item.name, # 'name': item.name,
'code': item.code, # 'code': item.code,
'rfid': item.rfid, # 'rfid': item.rfid,
'tool_groups_name': item.tool_groups_id.name, # 'tool_groups_name': item.tool_groups_id.name,
'production_line': item.production_line_id.name, # 'production_line': item.production_line_id.name,
'machine_tool_id': item.maintenance_equipment_id.code, # 'machine_tool_id': item.maintenance_equipment_id.code,
'machine_tool_code': item.machine_tool_code, # 'machine_tool_code': item.machine_tool_code,
'cutter_spacing_code': item.cutter_spacing_code_id.code, # 'cutter_spacing_code': item.cutter_spacing_code_id.code,
'functional_tool_name': item.name, # 'functional_tool_name': item.name,
'barcode': item.barcode_id.name, # 'barcode': item.barcode_id.name,
'mrs_cutting_tool_type_code': item.mrs_cutting_tool_type_id.code, # 'mrs_cutting_tool_type_code': item.mrs_cutting_tool_type_id.code,
'diameter': item.diameter, # 'diameter': item.diameter,
'knife_tip_r_angle': item.knife_tip_r_angle, # 'knife_tip_r_angle': item.knife_tip_r_angle,
'install_tool_time': item.install_tool_time.strftime('%Y-%m-%d %H:%M:%S'), # 'install_tool_time': item.install_tool_time.strftime('%Y-%m-%d %H:%M:%S'),
'on_board_time': item.on_board_time.strftime('%Y-%m-%d %H:%M:%S'), # 'on_board_time': item.on_board_time.strftime('%Y-%m-%d %H:%M:%S'),
'max_lifetime_value': item.max_lifetime_value, # 'max_lifetime_value': item.max_lifetime_value,
'alarm_value': item.alarm_value, # 'alarm_value': item.alarm_value,
'used_value': item.used_value, # 'used_value': item.used_value,
'functional_tool_status': item.functional_tool_status, # 'functional_tool_status': item.functional_tool_status,
'alarm_time': item.alarm_time.strftime('%Y-%m-%d %H:%M:%S'), # 'alarm_time': item.alarm_time.strftime('%Y-%m-%d %H:%M:%S'),
'dispose_user': item.dispose_user, # 'dispose_user': item.dispose_user,
'dispose_time': item.dispose_time, # 'dispose_time': item.dispose_time,
'dispose_func': item.dispose_func, # 'dispose_func': item.dispose_func,
} # }
tool_warning_list.append(val) # tool_warning_list.append(val)
kw = json.dumps(tool_warning_list, ensure_ascii=False) # kw = json.dumps(tool_warning_list, ensure_ascii=False)
r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers) # r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
ret = r.json() # ret = r.json()
if ret.get('code') == 200: # if ret.get('code') == 200:
return "功能刀具预警注册成功" # return "功能刀具预警注册成功"
else: # else:
logging.info('没有注册功能刀具预警信息') # logging.info('没有注册功能刀具预警信息')
except Exception as e: # except Exception as e:
logging.info("捕获错误信息:%s" % e) # logging.info("捕获错误信息:%s" % e)
#
@api.model_create_multi # @api.model_create_multi
def create(self, vals_list): # def create(self, vals_list):
records = super(FunctionalToolWarning, self).create(vals_list) # records = super(FunctionalToolWarning, self).create(vals_list)
for record in records: # for record in records:
if record: # if record:
record.enroll_functional_tool_warning() # record.enroll_functional_tool_warning()
return records # return records
#
#
class StockMoveLine(models.Model): # class StockMoveLine(models.Model):
_inherit = 'stock.move.line' # _inherit = 'stock.move.line'
_description = '功能刀具出入库记录注册' # _description = '功能刀具出入库记录注册'
#
crea_url = "/api/functional_tool_move/create" # crea_url = "/api/functional_tool_move/create"
#
# 注册同步功能刀具出入库记录 # # 注册同步功能刀具出入库记录
def enroll_functional_tool_move(self): # def enroll_functional_tool_move(self):
logging.info('调用功能刀具出入库记录注册接口: enroll_functional_tool_move()') # logging.info('调用功能刀具出入库记录注册接口: enroll_functional_tool_move()')
sf_sync_config = self.env['res.config.settings'].get_values() # sf_sync_config = self.env['res.config.settings'].get_values()
token = sf_sync_config['token'] # token = sf_sync_config['token']
sf_secret_key = sf_sync_config['sf_secret_key'] # sf_secret_key = sf_sync_config['sf_secret_key']
headers = Common.get_headers(self, token, sf_secret_key) # headers = Common.get_headers(self, token, sf_secret_key)
str_url = sf_sync_config['sf_url'] + self.crea_url # str_url = sf_sync_config['sf_url'] + self.crea_url
objs_all = self.env['stock.move.line'].search([('id', '=', self.id), ('functional_tool_name_id', '!=', False)]) # objs_all = self.env['stock.move.line'].search([('id', '=', self.id), ('functional_tool_name_id', '!=', False)])
self.get_sync_stock_move_line(objs_all, str_url, token, headers) # self.get_sync_stock_move_line(objs_all, str_url, token, headers)
#
def sync_enroll_functional_tool_move_all(self): # def sync_enroll_functional_tool_move_all(self):
logging.info('调用功能刀具出入库记录注册接口: sync_enroll_functional_tool_move_all()') # logging.info('调用功能刀具出入库记录注册接口: sync_enroll_functional_tool_move_all()')
sf_sync_config = self.env['res.config.settings'].get_values() # sf_sync_config = self.env['res.config.settings'].get_values()
token = sf_sync_config['token'] # token = sf_sync_config['token']
sf_secret_key = sf_sync_config['sf_secret_key'] # sf_secret_key = sf_sync_config['sf_secret_key']
headers = Common.get_headers(self, token, sf_secret_key) # headers = Common.get_headers(self, token, sf_secret_key)
str_url = sf_sync_config['sf_url'] + self.crea_url # str_url = sf_sync_config['sf_url'] + self.crea_url
objs_all = self.env['stock.move.line'].search([('functional_tool_name_id', '!=', False)]) # objs_all = self.env['stock.move.line'].search([('functional_tool_name_id', '!=', False)])
self.get_sync_stock_move_line(objs_all, str_url, token, headers) # self.get_sync_stock_move_line(objs_all, str_url, token, headers)
#
def get_sync_stock_move_line(self, objs_all, str_url, token, headers): # def get_sync_stock_move_line(self, objs_all, str_url, token, headers):
tool_stock_list = [] # tool_stock_list = []
try: # try:
if objs_all: # if objs_all:
for item in objs_all: # for item in objs_all:
val = { # val = {
'id': item.id, # 'id': item.id,
'name': item.functional_tool_name, # 'name': item.functional_tool_name,
'code': item.code, # 'code': item.code,
'rfid': item.rfid, # 'rfid': item.rfid,
'tool_groups_name': item.tool_groups_id.name, # 'tool_groups_name': item.tool_groups_id.name,
'reference': item.reference, # 'reference': item.reference,
'barcode': item.lot_id.name, # 'barcode': item.lot_id.name,
'functional_tool_type_code': item.functional_tool_type_id.code, # 'functional_tool_type_code': item.functional_tool_type_id.code,
'diameter': item.diameter, # 'diameter': item.diameter,
'knife_tip_r_angle': item.knife_tip_r_angle, # 'knife_tip_r_angle': item.knife_tip_r_angle,
'install_tool_time': item.install_tool_time.strftime('%Y-%m-%d %H:%M:%S'), # 'install_tool_time': item.install_tool_time.strftime('%Y-%m-%d %H:%M:%S'),
'location_id': item.location_id.name, # 'location_id': item.location_id.name,
'location_dest_name': item.location_dest_id.name, # 'location_dest_name': item.location_dest_id.name,
'date': item.date.strftime('%Y-%m-%d %H:%M:%S'), # 'date': item.date.strftime('%Y-%m-%d %H:%M:%S'),
'qty_done': item.qty_done, # 'qty_done': item.qty_done,
} # }
tool_stock_list.append(val) # tool_stock_list.append(val)
kw = json.dumps(tool_stock_list, ensure_ascii=False) # kw = json.dumps(tool_stock_list, ensure_ascii=False)
r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers) # r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
ret = r.json() # ret = r.json()
if ret.get('code') == 200: # if ret.get('code') == 200:
return "功能刀具出入库记录注册成功" # return "功能刀具出入库记录注册成功"
else: # else:
logging.info('没有注册功能刀具出入库记录信息') # logging.info('没有注册功能刀具出入库记录信息')
except Exception as e: # except Exception as e:
logging.info("捕获错误信息:%s" % e) # logging.info("捕获错误信息:%s" % e)
#
@api.model_create_multi # @api.model_create_multi
def create(self, vals_list): # def create(self, vals_list):
records = super(StockMoveLine, self).create(vals_list) # records = super(StockMoveLine, self).create(vals_list)
for record in records: # for record in records:
if record.functional_tool_name_id: # if record.functional_tool_name_id:
record.enroll_functional_tool_move() # record.enroll_functional_tool_move()
return records # return records
#
#
class RealTimeDistributionFunctionalTools(models.Model): # class RealTimeDistributionFunctionalTools(models.Model):
_inherit = 'sf.real.time.distribution.of.functional.tools' # _inherit = 'sf.real.time.distribution.of.functional.tools'
_description = '功能刀具安全库存注册' # _description = '功能刀具安全库存注册'
#
crea_url = "/api/functional_tool_distribution/create" # crea_url = "/api/functional_tool_distribution/create"
#
# 注册同步功能刀具预警 # # 注册同步功能刀具预警
def enroll_functional_tool_real_time_distribution(self): # def enroll_functional_tool_real_time_distribution(self):
logging.info('调用功能刀具安全库存注册接口: enroll_functional_tool_real_time_distribution()') # logging.info('调用功能刀具安全库存注册接口: enroll_functional_tool_real_time_distribution()')
sf_sync_config = self.env['res.config.settings'].get_values() # sf_sync_config = self.env['res.config.settings'].get_values()
token = sf_sync_config['token'] # token = sf_sync_config['token']
sf_secret_key = sf_sync_config['sf_secret_key'] # sf_secret_key = sf_sync_config['sf_secret_key']
headers = Common.get_headers(self, token, sf_secret_key) # headers = Common.get_headers(self, token, sf_secret_key)
str_url = sf_sync_config['sf_url'] + self.crea_url # str_url = sf_sync_config['sf_url'] + self.crea_url
objs_all = self.env['sf.real.time.distribution.of.functional.tools'].search([('id', '=', self.id)]) # objs_all = self.env['sf.real.time.distribution.of.functional.tools'].search([('id', '=', self.id)])
self.get_sync_real_time_distribution_functional_tools(objs_all, str_url, token, headers) # self.get_sync_real_time_distribution_functional_tools(objs_all, str_url, token, headers)
#
def sync_enroll_functional_tool_real_time_distribution_all(self): # def sync_enroll_functional_tool_real_time_distribution_all(self):
logging.info('调用功能刀具安全库存注册接口: sync_enroll_functional_tool_real_time_distribution_all()') # logging.info('调用功能刀具安全库存注册接口: sync_enroll_functional_tool_real_time_distribution_all()')
sf_sync_config = self.env['res.config.settings'].get_values() # sf_sync_config = self.env['res.config.settings'].get_values()
token = sf_sync_config['token'] # token = sf_sync_config['token']
sf_secret_key = sf_sync_config['sf_secret_key'] # sf_secret_key = sf_sync_config['sf_secret_key']
headers = Common.get_headers(self, token, sf_secret_key) # headers = Common.get_headers(self, token, sf_secret_key)
str_url = sf_sync_config['sf_url'] + self.crea_url # str_url = sf_sync_config['sf_url'] + self.crea_url
objs_all = self.env['sf.real.time.distribution.of.functional.tools'].search([]) # objs_all = self.env['sf.real.time.distribution.of.functional.tools'].search([])
self.get_sync_real_time_distribution_functional_tools(objs_all, str_url, token, headers) # self.get_sync_real_time_distribution_functional_tools(objs_all, str_url, token, headers)
#
def get_sync_real_time_distribution_functional_tools(self, objs_all, str_url, token, headers): # def get_sync_real_time_distribution_functional_tools(self, objs_all, str_url, token, headers):
tool_distribution_list = [] # tool_distribution_list = []
try: # try:
if objs_all: # if objs_all:
for item in objs_all: # for item in objs_all:
functional_tool_codes = [] # functional_tool_codes = []
for obj in item.sf_functional_tool_entity_ids: # for obj in item.sf_functional_tool_entity_ids:
functional_tool_codes.append(obj.code) # functional_tool_codes.append(obj.code)
val = { # val = {
'id': item.id, # 'id': item.id,
'name': item.name, # 'name': item.name,
'tool_groups_name': item.tool_groups_id.name, # 'tool_groups_name': item.tool_groups_id.name,
'cutting_tool_type_code': item.sf_cutting_tool_type_id.code, # 'cutting_tool_type_code': item.sf_cutting_tool_type_id.code,
'diameter': item.diameter, # 'diameter': item.diameter,
'knife_tip_r_angle': item.knife_tip_r_angle, # 'knife_tip_r_angle': item.knife_tip_r_angle,
'tool_stock_num': item.tool_stock_num, # 'tool_stock_num': item.tool_stock_num,
'side_shelf_num': item.side_shelf_num, # 'side_shelf_num': item.side_shelf_num,
'on_tool_stock_num': item.on_tool_stock_num, # 'on_tool_stock_num': item.on_tool_stock_num,
'tool_stock_total': item.tool_stock_total, # 'tool_stock_total': item.tool_stock_total,
'min_stock_num': item.min_stock_num, # 'min_stock_num': item.min_stock_num,
'max_stock_num': item.max_stock_num, # 'max_stock_num': item.max_stock_num,
'batch_replenishment_num': item.batch_replenishment_num, # 'batch_replenishment_num': item.batch_replenishment_num,
'unit': item.unit, # 'unit': item.unit,
'image': '' if not item.image else base64.b64encode(item.image).decode('utf-8'), # 'image': '' if not item.image else base64.b64encode(item.image).decode('utf-8'),
'functional_tool_codes': str(functional_tool_codes), # 'functional_tool_codes': str(functional_tool_codes),
'coarse_middle_thin': item.coarse_middle_thin, # 'coarse_middle_thin': item.coarse_middle_thin,
'whether_standard_knife': item.whether_standard_knife, # 'whether_standard_knife': item.whether_standard_knife,
'suitable_machining_method_names': get_suitable_machining_method_names(item), # 'suitable_machining_method_names': get_suitable_machining_method_names(item),
'blade_tip_characteristics_name': item.blade_tip_characteristics_id.name, # 'blade_tip_characteristics_name': item.blade_tip_characteristics_id.name,
'handle_type_name': item.handle_type_id.name, # 'handle_type_name': item.handle_type_id.name,
'cutting_direction_names': get_cutting_direction_names(item), # 'cutting_direction_names': get_cutting_direction_names(item),
'suitable_coolant_names': get_suitable_coolant_names(item), # 'suitable_coolant_names': get_suitable_coolant_names(item),
'active': item.active # 'active': item.active
} # }
tool_distribution_list.append(val) # tool_distribution_list.append(val)
kw = json.dumps(tool_distribution_list, ensure_ascii=False) # kw = json.dumps(tool_distribution_list, ensure_ascii=False)
r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers) # r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
ret = r.json() # ret = r.json()
if ret.get('code') == 200: # if ret.get('code') == 200:
return "功能刀具出入库记录注册成功" # return "功能刀具出入库记录注册成功"
else: # else:
logging.info('没有注册功能刀具出入库记录信息') # logging.info('没有注册功能刀具出入库记录信息')
except Exception as e: # except Exception as e:
logging.info("捕获错误信息:%s" % e) # logging.info("捕获错误信息:%s" % e)
#
@api.model_create_multi # @api.model_create_multi
def create(self, vals_list): # def create(self, vals_list):
records = super(RealTimeDistributionFunctionalTools, self).create(vals_list) # records = super(RealTimeDistributionFunctionalTools, self).create(vals_list)
for record in records: # for record in records:
if record: # if record:
record.enroll_functional_tool_real_time_distribution() # record.enroll_functional_tool_real_time_distribution()
return records # return records
#
def write(self, vals): # def write(self, vals):
res = super().write(vals) # res = super().write(vals)
if vals.get('sf_functional_tool_entity_ids') or vals.get('min_stock_num') or vals.get('max_stock_num'): # if vals.get('sf_functional_tool_entity_ids') or vals.get('min_stock_num') or vals.get('max_stock_num'):
self.enroll_functional_tool_real_time_distribution() # self.enroll_functional_tool_real_time_distribution()
return res # return res

12
sf_tool_management/models/maintenance_equipment.py
View File

@@ -128,12 +128,12 @@ class StockLot(models.Model):
record.tool_material_status = '报废' record.tool_material_status = '报废'
else: else:
record.tool_material_status = '未入库' record.tool_material_status = '未入库'
if record.tool_material_search_id: # if record.tool_material_search_id:
# 注册刀具物料状态到cloud平台 # # 注册刀具物料状态到cloud平台
record.enroll_tool_material_stock() # record.enroll_tool_material_stock()
elif record.fixture_material_search_id: # elif record.fixture_material_search_id:
# 注册夹具物料状态到cloud平台 # # 注册夹具物料状态到cloud平台
record.enroll_fixture_material_stock() # record.enroll_fixture_material_stock()
@api.model @api.model
def name_search(self, name='', args=None, operator='ilike', limit=100): def name_search(self, name='', args=None, operator='ilike', limit=100):

38
sf_tool_management/models/temporary_data_processing_methods.py Normal file
View File

@@ -0,0 +1,38 @@
from odoo import fields, models, api
class FunctionalCuttingToolEntity(models.Model):
_inherit = 'sf.functional.cutting.tool.entity'
def button_safe_inventory_id(self):
"""更新功能刀具关联的安全库存记录"""
tool_is = self.search([])
for item in tool_is:
item.safe_inventory_id = self.env['sf.real.time.distribution.of.functional.tools'].search(
[('functional_name_id', '=', item.tool_name_id.id)])[0]
class FunctionalToolAssembly(models.Model):
_inherit = 'sf.functional.tool.assembly'
def put_assembly_order_code(self):
assembly_list = self.search([('assemble_status', '=', '0')], order="id asc")
for item in assembly_list:
code = item.assembly_order_code[-9:-5]
if item.loading_task_source == '0':
code = 'C' + code
elif item.loading_task_source == '1':
code = 'J' + code
elif item.loading_task_source == '2':
code = 'K' + code
functional_tool_assembly = self.env['sf.functional.tool.assembly'].sudo().search(
[('loading_task_source', '=', item.loading_task_source),
('assembly_order_code', 'ilike', code)], limit=1, order="id desc")
if not functional_tool_assembly:
num = "%04d" % 1
else:
m = int(functional_tool_assembly.assembly_order_code[-3:]) + 1
num = "%04d" % m
item.assembly_order_code = "%s%s" % (code, num)

2
sf_tool_management/models/tool_material_search.py
View File

@@ -46,7 +46,7 @@ class ToolMaterial(models.Model):
record.scrap_num = scrap_num record.scrap_num = scrap_num
record.number = usable_num + have_been_used_num + scrap_num record.number = usable_num + have_been_used_num + scrap_num
# 更新数据到cloud的动态数据 # 更新数据到cloud的动态数据
record.enroll_tool_material() # record.enroll_tool_material()
@api.model @api.model
def _read_group_cutting_tool_material_id(self, categories, domain, order): def _read_group_cutting_tool_material_id(self, categories, domain, order):

23
sf_tool_management/views/functional_tool_views.xml
View File

@@ -46,8 +46,8 @@
</header> </header>
<sheet> <sheet>
<div class="oe_button_box" name="button_box"> <div class="oe_button_box" name="button_box">
<button name="button_safe_inventory_id" string="更新功能刀具关联的安全库存记录" <!-- <button name="button_safe_inventory_id" string="更新功能刀具关联的安全库存记录"-->
type="object" class="btn-primary"/> <!-- type="object" class="btn-primary"/>-->
<button class="oe_stat_button" groups="sf_base.group_sf_mrp_user" <button class="oe_stat_button" groups="sf_base.group_sf_mrp_user"
name="open_functional_tool_warning" name="open_functional_tool_warning"
icon="fa-list-ul" icon="fa-list-ul"
@@ -155,24 +155,25 @@
<group> <group>
<field name="functional_tool_diameter"/> <field name="functional_tool_diameter"/>
<field name="knife_tip_r_angle"/> <field name="knife_tip_r_angle"/>
<field name="whether_standard_knife"/> <field name="tool_loading_length"/>
<field name="coarse_middle_thin"/> <field name="handle_length"/>
<field name="functional_tool_length"/>
<field name="max_lifetime_value"/> <field name="max_lifetime_value"/>
<field name="alarm_value"/> <field name="alarm_value"/>
<field name="used_value"/> <field name="used_value" invisible="1"/>
<field name="current_location_id" invisible="1"/> <field name="current_location_id" invisible="1"/>
<field name="current_location"/>
</group> </group>
<group> <group>
<field name="tool_loading_length"/> <field name="whether_standard_knife"/>
<field name="functional_tool_length"/> <field name="coarse_middle_thin"/>
<field name="effective_length"/> <field name="effective_length" invisible="1"/>
<field name="L_D_number"/> <field name="L_D_number" invisible="1"/>
<field name="hiding_length"/> <field name="hiding_length" invisible="1"/>
<field name="new_former"/> <field name="new_former"/>
<field name="cut_time" attrs="{'invisible': [('new_former','=','0')]}"/> <field name="cut_time" attrs="{'invisible': [('new_former','=','0')]}"/>
<field name="cut_length" attrs="{'invisible': [('new_former','=','0')]}"/> <field name="cut_length" attrs="{'invisible': [('new_former','=','0')]}"/>
<field name="cut_number" attrs="{'invisible': [('new_former','=','0')]}"/> <field name="cut_number" attrs="{'invisible': [('new_former','=','0')]}"/>
<field name="current_location" string="当前位置"/>
</group> </group>
</group> </group>
</page> </page>

90
sf_tool_management/views/tool_base_views.xml
View File

@@ -451,36 +451,9 @@
<field name="whether_standard_knife" invisible="True"/> <field name="whether_standard_knife" invisible="True"/>
<field name="reason_for_applying" invisible="True"/> <field name="reason_for_applying" invisible="True"/>
<field name="functional_tool_type_id" invisible="True"/> <field name="functional_tool_type_id" invisible="True"/>
<!-- <field name="functional_tool_cutting_type" invisible="True"/>--> <button string="组装" name="put_start_preset" type="object"
attrs="{'invisible': [('assemble_status', '!=', '0')]}"
<button string="组装"
name="%(sf_tool_management.sf_functional_tool_assembly_order_act)d"
type="action"
context="{'default_name':name,
'default_assembly_order_code':assembly_order_code,
'default_production_line_name_id':production_line_name_id,
'default_machine_tool_name_id':machine_tool_name_id,
'default_cutter_spacing_code_id':cutter_spacing_code_id,
'default_functional_tool_name':functional_tool_name,
'default_functional_tool_type_id':functional_tool_type_id,
'default_tool_groups_id': tool_groups_id,
'default_functional_tool_diameter':functional_tool_diameter,
'default_knife_tip_r_angle':knife_tip_r_angle,
'default_tool_loading_length':tool_loading_length,
'default_functional_tool_length':functional_tool_length,
'default_effective_length':effective_length,
'default_whether_standard_knife':whether_standard_knife,
'default_coarse_middle_thin':coarse_middle_thin,
'default_new_former':new_former,
'default_use_tool_time':use_tool_time,
'default_reason_for_applying':reason_for_applying,
}"
attrs="{'invisible': [('assemble_status', '!=', '0')]}" groups="sf_base.group_sf_mrp_user"
class="btn-primary"/> class="btn-primary"/>
<!-- <button string="组装单打印" name="assemble_single_print" type="object"-->
<!-- groups="sf_base.group_sf_mrp_user"-->
<!-- attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary"-->
<!-- confirm="是否确认打印组装单"/>-->
</tree> </tree>
</field> </field>
</record> </record>
@@ -491,35 +464,11 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form create="0" delete="0" edit="0"> <form create="0" delete="0" edit="0">
<header> <header>
<button string="组装" <!-- <button string="修改编码" name="put_assembly_order_code" type="object"-->
name="%(sf_tool_management.sf_functional_tool_assembly_order_act)d" <!-- class="btn-primary" confirm="是否确认修改编码"/>-->
type="action" groups="sf_base.group_sf_mrp_user" <button string="组装" name="put_start_preset" type="object"
context="{'default_name':name,
'default_assembly_order_code':assembly_order_code,
'default_production_line_name_id':production_line_name_id,
'default_machine_tool_name_id':machine_tool_name_id,
'default_cutter_spacing_code_id':cutter_spacing_code_id,
'default_functional_tool_name':functional_tool_name,
'default_functional_tool_type_id':functional_tool_type_id,
'default_tool_groups_id': tool_groups_id,
'default_functional_tool_diameter':functional_tool_diameter,
'default_knife_tip_r_angle':knife_tip_r_angle,
'default_tool_loading_length':tool_loading_length,
'default_functional_tool_length':functional_tool_length,
'default_effective_length':effective_length,
'default_whether_standard_knife':whether_standard_knife,
'default_coarse_middle_thin':coarse_middle_thin,
'default_new_former':new_former,
'default_use_tool_time':use_tool_time,
'default_reason_for_applying':reason_for_applying,
}"
attrs="{'invisible': [('assemble_status', '!=', '0')]}" attrs="{'invisible': [('assemble_status', '!=', '0')]}"
class="btn-primary"/> class="btn-primary"/>
<!-- <button string="组装单打印" name="assemble_single_print" type="object"-->
<!-- groups="sf_base.group_sf_mrp_user"-->
<!-- attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary"-->
<!-- confirm="是否确认打印组装单"/>-->
<field name="assemble_status" widget="statusbar" statusbar_visible="0,1"/> <field name="assemble_status" widget="statusbar" statusbar_visible="0,1"/>
</header> </header>
<sheet> <sheet>
@@ -544,7 +493,7 @@
</group> </group>
</group> </group>
<notebook> <notebook>
<page string="组装信息" attrs="{'invisible': [('assemble_status', '=' ,'0')]}"> <page string="组装信息" attrs="{'invisible': [('assemble_status', '=', '0')]}">
<group col="1"> <group col="1">
<group col="1"> <group col="1">
<group> <group>
@@ -557,9 +506,9 @@
<field name="after_assembly_functional_tool_type_id" <field name="after_assembly_functional_tool_type_id"
string="功能刀具类型"/> string="功能刀具类型"/>
<field name="tool_groups_id"/> <field name="tool_groups_id"/>
<field name="after_assembly_functional_tool_diameter" <field name="after_assembly_whether_standard_knife"
string="刀具直径(mm)"/> string="是否标准刀"/>
<field name="after_assembly_knife_tip_r_angle" string="刀尖R角(mm)"/> <field name="after_assembly_coarse_middle_thin" string="粗/中/精"/>
<field name="after_assembly_new_former" string="新/旧"/> <field name="after_assembly_new_former" string="新/旧"/>
<field name="cut_time" <field name="cut_time"
attrs="{'invisible': [('after_assembly_new_former', '=', '0')]}"/> attrs="{'invisible': [('after_assembly_new_former', '=', '0')]}"/>
@@ -569,19 +518,20 @@
attrs="{'invisible': [('after_assembly_new_former', '=', '0')]}"/> attrs="{'invisible': [('after_assembly_new_former', '=', '0')]}"/>
</group> </group>
<group> <group>
<field name="after_assembly_whether_standard_knife" <field name="after_assembly_functional_tool_diameter"
string="是否标准刀"/> string="刀具直径(mm)"/>
<field name="after_assembly_coarse_middle_thin" string="粗/中/精"/> <field name="after_assembly_knife_tip_r_angle" string="刀尖R角(mm)"/>
<field name="after_assembly_tool_loading_length" string="总长度(mm)"/>
<field name="after_assembly_handle_length" string="刀柄长度(mm)"/>
<field name="after_assembly_functional_tool_length"
string="伸出长(mm)"/>
<field name="after_assembly_max_lifetime_value" <field name="after_assembly_max_lifetime_value"
string="最大寿命值(min)"/> string="最大寿命值(min)"/>
<field name="after_assembly_alarm_value" string="报警值(min)"/> <field name="after_assembly_alarm_value" string="报警值(min)"/>
<field name="after_assembly_used_value" string="已使用值(min)"/> <field name="after_assembly_used_value" string="已使用值(min)" invisible="1"/>
<field name="after_assembly_tool_loading_length" string="总长度(mm)"/> <field name="after_assembly_effective_length" string="有效长(mm)" invisible="1"/>
<field name="after_assembly_functional_tool_length" <field name="L_D_number" invisible="1"/>
string="伸出长(mm)"/> <field name="hiding_length" invisible="1"/>
<field name="after_assembly_effective_length" string="有效长(mm)"/>
<field name="L_D_number"/>
<field name="hiding_length"/>
</group> </group>
</group> </group>
</group> </group>

147
sf_tool_management/wizard/wizard.py
View File

@@ -223,8 +223,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
image = fields.Binary('图片') image = fields.Binary('图片')
@api.onchange('functional_tool_name') @api.depends('functional_tool_name')
def _onchange_functional_tool_name(self): def _compute_functional_tool_name(self):
for item in self: for item in self:
if item.functional_tool_name: if item.functional_tool_name:
inventory = self.env['sf.tool.inventory'].sudo().search([('name', '=', item.functional_tool_name)]) inventory = self.env['sf.tool.inventory'].sudo().search([('name', '=', item.functional_tool_name)])
@@ -355,7 +355,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
# ================刀柄型号=============== # ================刀柄型号===============
handle_freight_rfid = fields.Char('刀柄Rfid', compute='_compute_rfid') handle_freight_rfid = fields.Char('刀柄Rfid', compute='_compute_rfid')
handle_code_id = fields.Many2one('stock.lot', '刀柄序列号', required=True, handle_code_id = fields.Many2one('stock.lot', '刀柄序列号',
domain=[('product_id.cutting_tool_material_id.name', '=', '刀柄'), domain=[('product_id.cutting_tool_material_id.name', '=', '刀柄'),
('tool_material_status', '=', '可用')]) ('tool_material_status', '=', '可用')])
handle_product_id = fields.Many2one('product.product', string='刀柄名称', compute='_compute_handle_product_id', handle_product_id = fields.Many2one('product.product', string='刀柄名称', compute='_compute_handle_product_id',
@@ -456,15 +456,17 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
item.handle_freight_rfid = None item.handle_freight_rfid = None
# 组装功能刀具参数信息 # 组装功能刀具参数信息
after_name_id = fields.Many2one('sf.tool.inventory', string='功能刀具名称', required=True) after_name_id = fields.Many2one('sf.tool.inventory', string='功能刀具名称', compute='_compute_functional_tool_name',
store=True)
barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号') barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号')
rfid = fields.Char('Rfid', compute='_compute_rfid') rfid = fields.Char('Rfid', compute='_compute_rfid')
code = fields.Char(string='功能刀具编码', compute='_compute_code') code = fields.Char(string='功能刀具编码', compute='_compute_code')
after_assembly_functional_tool_name = fields.Char(string='组装后功能刀具名称', compute='_compute_name', store=True) after_assembly_functional_tool_name = fields.Char(string='组装后功能刀具名称', compute='_compute_name', store=True)
after_assembly_functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', after_assembly_functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model',
string='组装后功能刀具类型') string='组装后功能刀具类型', store=True,
after_assembly_functional_tool_diameter = fields.Float(string='组装后功能刀具直径(mm)') compute='_compute_after_assembly_max_lifetime_value')
after_assembly_knife_tip_r_angle = fields.Float(string='组装后刀尖R角(mm)') after_assembly_functional_tool_diameter = fields.Float(string='组装后功能刀具直径(mm)', digits=(10, 3))
after_assembly_knife_tip_r_angle = fields.Float(string='组装后刀尖R角(mm)', digits=(10, 3))
after_assembly_new_former = fields.Selection([('0', '新'), ('1', '旧')], string='组装后新/旧', default='0') after_assembly_new_former = fields.Selection([('0', '新'), ('1', '旧')], string='组装后新/旧', default='0')
cut_time = fields.Integer(string='已切削时间(min)') cut_time = fields.Integer(string='已切削时间(min)')
cut_length = fields.Float(string='已切削长度(mm)') cut_length = fields.Float(string='已切削长度(mm)')
@@ -473,15 +475,66 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
after_assembly_whether_standard_knife = fields.Boolean(string='组装后是否标准刀', default=True) after_assembly_whether_standard_knife = fields.Boolean(string='组装后是否标准刀', default=True)
after_assembly_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], after_assembly_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')],
string='组装后粗/中/精', default='3') string='组装后粗/中/精', default='3')
after_assembly_max_lifetime_value = fields.Integer(string='组装后最大寿命值(min)') after_assembly_max_lifetime_value = fields.Integer(string='组装后最大寿命值(min)', store=True,
compute='_compute_after_assembly_max_lifetime_value')
after_assembly_alarm_value = fields.Integer(string='组装后报警值(min)') after_assembly_alarm_value = fields.Integer(string='组装后报警值(min)')
after_assembly_used_value = fields.Integer(string='组装后已使用值(min)') after_assembly_used_value = fields.Integer(string='组装后已使用值(min)')
after_assembly_tool_loading_length = fields.Float(string='组装后总长度(mm)') after_assembly_tool_loading_length = fields.Float(string='组装后总长度(mm)', digits=(10, 3))
after_assembly_functional_tool_length = fields.Float(string='组装后伸出长(mm)', required=True) after_assembly_handle_length = fields.Float(string='组装后刀柄长度(mm)', digits=(10, 3))
after_assembly_functional_tool_length = fields.Float(string='组装后伸出长(mm)', digits=(10, 3),
compute='_compute_after_assembly_functional_tool_length')
after_assembly_effective_length = fields.Float(string='组装后有效长(mm)') after_assembly_effective_length = fields.Float(string='组装后有效长(mm)')
L_D_number = fields.Float(string='L/D值(mm)', compute='_compute_l_d_number') L_D_number = fields.Float(string='L/D值(mm)', compute='_compute_l_d_number')
hiding_length = fields.Float(string='避空长(mm)') hiding_length = fields.Float(string='避空长(mm)')
after_tool_groups_id = fields.Many2one('sf.tool.groups', string='组装后刀具组') after_tool_groups_id = fields.Many2one('sf.tool.groups', string='组装后刀具组', store=True,
compute='_compute_after_assembly_max_lifetime_value')
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:
item.after_assembly_functional_tool_length = item.after_assembly_tool_loading_length - item.after_assembly_handle_length
@api.onchange('after_assembly_max_lifetime_value')
def _onchange_after_assembly_alarm_value(self):
for item in self:
if item.after_assembly_max_lifetime_value:
item.after_assembly_alarm_value = item.after_assembly_max_lifetime_value * 0.95
def get_tool_preset_parameter(self):
"""
获取刀具预调仪数据
"""
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_loading_length, # 总长度
'after_assembly_functional_tool_diameter': diameter, # 直径
'after_assembly_knife_tip_r_angle': r_angle, # R角
'obtain_measurement_status': True # 是否获取测量值
})
return {
'type': 'ir.actions.act_window',
'res_model': 'sf.functional.tool.assembly.order',
'view_mode': 'form',
'res_id': self.id,
'target': 'new',
'flags': {'form': {'action_buttons': True, 'options': {'mode': 'modal'}}}
}
@api.depends('after_name_id')
def _compute_after_assembly_max_lifetime_value(self):
for item in self:
if item.after_name_id:
item.after_assembly_max_lifetime_value = item.after_name_id.life_span
item.after_assembly_functional_tool_type_id = item.after_name_id.functional_cutting_tool_model_id.id
item.after_tool_groups_id = item.after_name_id.tool_groups_id.id
@api.onchange('after_name_id') @api.onchange('after_name_id')
def _onchange_number(self): def _onchange_number(self):
@@ -489,14 +542,12 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
if item.after_name_id: if item.after_name_id:
item.after_assembly_functional_tool_diameter = item.after_name_id.diameter item.after_assembly_functional_tool_diameter = item.after_name_id.diameter
item.after_assembly_knife_tip_r_angle = item.after_name_id.angle item.after_assembly_knife_tip_r_angle = item.after_name_id.angle
item.after_assembly_max_lifetime_value = item.after_name_id.life_span
item.after_assembly_tool_loading_length = item.after_name_id.tool_length item.after_assembly_tool_loading_length = item.after_name_id.tool_length
item.after_assembly_functional_tool_length = item.after_name_id.extension item.after_assembly_functional_tool_length = item.after_name_id.extension
item.hiding_length = item.after_name_id.blade_length item.hiding_length = item.after_name_id.blade_length
item.after_assembly_functional_tool_type_id = item.after_name_id.functional_cutting_tool_model_id.id
item.after_tool_groups_id = item.after_name_id.tool_groups_id.id
else: else:
item.after_assembly_functional_tool_type_id = item.functional_tool_type_id item.after_assembly_functional_tool_type_id = item.functional_tool_type_id.id
item.after_tool_groups_id = item.tool_groups_id.id item.after_tool_groups_id = item.tool_groups_id.id
# functional_tool_cutting_type = fields.Char(string='功能刀具切削类型', readonly=False) # functional_tool_cutting_type = fields.Char(string='功能刀具切削类型', readonly=False)
@@ -574,24 +625,6 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
else: else:
record.L_D_number = 0 record.L_D_number = 0
@api.constrains('after_assembly_tool_loading_length', 'after_assembly_functional_tool_length',
'after_assembly_max_lifetime_value', 'after_assembly_alarm_value',
'after_assembly_effective_length', 'hiding_length')
def _check_length_control(self):
for obj in self:
if obj.after_assembly_tool_loading_length == 0:
raise ValidationError('组装参数信息【总长度】不能为0！！！')
if obj.after_assembly_functional_tool_length == 0:
raise ValidationError('组装参数信息【伸出长】不能为0！！！')
if obj.after_assembly_max_lifetime_value == 0:
raise ValidationError('组装参数信息【最大寿命值】不能为0！！！')
if obj.after_assembly_alarm_value == 0:
raise ValidationError('组装参数信息【报警值】不能为0！！！')
if obj.after_assembly_effective_length == 0:
raise ValidationError('组装参数信息【有效长】不能为0！！！')
if obj.hiding_length == 0:
raise ValidationError('组装参数信息【避空长】不能为0！！！')
def functional_tool_assembly(self): def functional_tool_assembly(self):
""" """
功能刀具组装 功能刀具组装
@@ -659,16 +692,39 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
def materials_must_be_judged(self): def materials_must_be_judged(self):
""" """
功能刀具组装物料必填判断 功能刀具组装必填判断
""" """
# 物料必填校验
if not self.handle_code_id:
raise ValidationError('缺少【刀柄】物料信息！')
if not self.integral_product_id and not self.blade_product_id: if not self.integral_product_id and not self.blade_product_id:
raise ValidationError('【整体式刀具】和【刀片】必须填写一个！') raise ValidationError('【整体式刀具】和【刀片】必须填写一个！')
if self.blade_product_id: if self.blade_product_id:
if not self.bar_product_id and not self.pad_product_id: if not self.bar_product_id and not self.pad_product_id:
raise ValidationError('【刀盘】和【刀杆】必须填写一个！') raise ValidationError('【刀盘】和【刀杆】必须填写一个！')
# 组装参数必填校验
if self.after_assembly_functional_tool_length == 0:
raise ValidationError('组装参数信息【伸出长】不能为0！')
if self.after_assembly_max_lifetime_value == 0:
raise ValidationError('组装参数信息【最大寿命值】不能为0！')
if self.after_assembly_alarm_value == 0:
raise ValidationError('组装参数信息【报警值】不能为0！')
# if self.after_assembly_effective_length == 0:
# raise ValidationError('组装参数信息【有效长】不能为0！！！')
# if self.hiding_length == 0:
# raise ValidationError('组装参数信息【避空长】不能为0！！！')
if self.after_assembly_functional_tool_diameter == 0:
raise ValidationError('组装参数信息【刀具直径】不能为0！')
if self.after_assembly_tool_loading_length == 0:
raise ValidationError('组装参数信息【总长度】不能为0！！！')
if self.after_assembly_handle_length == 0:
raise ValidationError('组装参数信息【刀柄长度】不能为0！')
if self.after_assembly_tool_loading_length < self.after_assembly_handle_length:
raise ValidationError('组装参数信息【刀柄长度】不能大于【总长度】！')
def get_desc_1(self, stock_lot): def get_desc_1(self, stock_lot):
return { return {
'start_preset_bool': False,
'barcode_id': stock_lot.id, 'barcode_id': stock_lot.id,
'code': self.code, 'code': self.code,
'rfid': self.rfid, 'rfid': self.rfid,
@@ -694,6 +750,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
'after_assembly_alarm_value': self.after_assembly_alarm_value, 'after_assembly_alarm_value': self.after_assembly_alarm_value,
'after_assembly_used_value': self.after_assembly_used_value, 'after_assembly_used_value': self.after_assembly_used_value,
'after_assembly_tool_loading_length': self.after_assembly_tool_loading_length, 'after_assembly_tool_loading_length': self.after_assembly_tool_loading_length,
'after_assembly_handle_length': self.after_assembly_handle_length,
'after_assembly_functional_tool_length': self.after_assembly_functional_tool_length, 'after_assembly_functional_tool_length': self.after_assembly_functional_tool_length,
'after_assembly_effective_length': self.after_assembly_effective_length, 'after_assembly_effective_length': self.after_assembly_effective_length,
'L_D_number': self.L_D_number, 'L_D_number': self.L_D_number,
@@ -726,6 +783,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
'coarse_middle_thin': self.after_assembly_coarse_middle_thin, 'coarse_middle_thin': self.after_assembly_coarse_middle_thin,
'new_former': self.after_assembly_new_former, 'new_former': self.after_assembly_new_former,
'tool_loading_length': self.after_assembly_tool_loading_length, 'tool_loading_length': self.after_assembly_tool_loading_length,
'handle_length': self.after_assembly_handle_length,
'functional_tool_length': self.after_assembly_functional_tool_length, 'functional_tool_length': self.after_assembly_functional_tool_length,
'effective_length': self.after_assembly_effective_length, 'effective_length': self.after_assembly_effective_length,
@@ -918,14 +976,13 @@ class StockLot(models.Model):
}) })
return stock_move_id, stock_move_line_id return stock_move_id, stock_move_line_id
# class StockQuant(models.Model):
class StockQuant(models.Model): # _inherit = 'stock.quant'
_inherit = 'stock.quant' #
# @api.model_create_multi
@api.model_create_multi # def create(self, vals_list):
def create(self, vals_list): # records = super(StockQuant, self).create(vals_list)
records = super(StockQuant, self).create(vals_list) # for record in records:
for record in records: # if record.lot_id.product_id.categ_id.name == '刀具':
if record.lot_id.product_id.categ_id.name == '刀具': # record.lot_id.enroll_tool_material_stock()
record.lot_id.enroll_tool_material_stock() # return records
return records

94
sf_tool_management/wizard/wizard_view.xml
View File

@@ -166,11 +166,12 @@
<sheet> <sheet>
<div class="oe_title"> <div class="oe_title">
<h1> <h1>
<field name="production_line_name_id"/> <field name="assembly_order_code"/>
</h1> </h1>
</div> </div>
<group> <group>
<group> <group>
<field name="production_line_name_id"/>
<field name="machine_tool_name_id"/> <field name="machine_tool_name_id"/>
<field name="cutter_spacing_code_id"/> <field name="cutter_spacing_code_id"/>
</group> </group>
@@ -178,24 +179,26 @@
<field name="image" nolabel="1" widget="image"/> <field name="image" nolabel="1" widget="image"/>
</group> </group>
</group> </group>
<group string="功能刀具申请信息"> <group string="功能刀具申请信息" col="1">
<group> <group>
<field name="functional_tool_name"/> <group>
<field name="functional_tool_type_id"/> <field name="functional_tool_name"/>
<field name="tool_groups_id"/> <field name="functional_tool_type_id"/>
<field name="functional_tool_diameter" string="刀具直径(mm)"/> <field name="tool_groups_id"/>
<field name="knife_tip_r_angle"/> <field name="functional_tool_diameter" string="刀具直径(mm)"/>
<field name="tool_loading_length"/> <field name="knife_tip_r_angle"/>
<field name="functional_tool_length"/> <field name="tool_loading_length"/>
<field name="effective_length"/> <field name="functional_tool_length"/>
</group> <field name="effective_length"/>
<group> </group>
<field name="whether_standard_knife"/> <group>
<field name="coarse_middle_thin"/> <field name="whether_standard_knife"/>
<field name="new_former"/> <field name="coarse_middle_thin"/>
<field name="use_tool_time"/> <field name="new_former"/>
<field name="reason_for_applying"/> <field name="use_tool_time"/>
<!-- <field name="functional_tool_cutting_type"/>--> <field name="reason_for_applying"/>
<!-- <field name="functional_tool_cutting_type"/>-->
</group>
</group> </group>
</group> </group>
<group string="组装物料信息" col="1"> <group string="组装物料信息" col="1">
@@ -330,53 +333,66 @@
</group> </group>
</group> </group>
<group string="组装参数信息"> <group string="组装参数信息" col="1">
<group> <group>
<group> <group>
<field name="barcode_id" invisible="True"/> <field name="barcode_id" invisible="True"/>
<field name="code" readonly="True"/> <field name="code" readonly="True"/>
<field name="rfid" class="custom_required"/> <field name="rfid" class="custom_required"/>
<field name="after_name_id" string="功能刀具名称" placeholder="请选择功能刀具名称" </group>
<group>
<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="请选择功能刀具名称" readonly="1"
options="{'no_create': True, 'no_quick_create': True}"/> options="{'no_create': True, 'no_quick_create': True}"/>
<field name="after_assembly_functional_tool_name" string="功能刀具名称" invisible="1"/> <field name="after_assembly_functional_tool_name" string="功能刀具名称"
<field name="after_assembly_functional_tool_type_id" string="功能刀具类型" invisible="1"/>
<field name="after_assembly_functional_tool_type_id" string="功能刀具类型" readonly="1"
options="{'no_create': True, 'no_quick_create': True}"/> 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}"/> options="{'no_create': True, 'no_quick_create': True}"/>
<field name="after_assembly_functional_tool_diameter" string="刀具直径(mm)" <field name="after_assembly_whether_standard_knife" string="是否标准刀"/>
class="custom_required"/> <field name="after_assembly_coarse_middle_thin" string="粗/中/精"/>
<field name="after_assembly_knife_tip_r_angle" string="刀尖R角(mm)"
class="custom_required"/>
<field name="after_assembly_new_former" string="新/旧"/> <field name="after_assembly_new_former" string="新/旧"/>
<field name="cut_time" attrs="{'invisible': [('after_assembly_new_former','=','0')]}"/> <field name="cut_time"
attrs="{'invisible': [('after_assembly_new_former','=','0')]}"/>
<field name="cut_length" <field name="cut_length"
attrs="{'invisible': [('after_assembly_new_former','=','0')]}"/> attrs="{'invisible': [('after_assembly_new_former','=','0')]}"/>
<field name="cut_number" <field name="cut_number"
attrs="{'invisible': [('after_assembly_new_former','=','0')]}"/> attrs="{'invisible': [('after_assembly_new_former','=','0')]}"/>
</group> </group>
</group>
<group>
<group> <group>
<field name="after_assembly_whether_standard_knife" string="是否标准刀"/> <field name="after_assembly_functional_tool_diameter" string="刀具直径(mm)"
<field name="after_assembly_coarse_middle_thin" string="粗/中/精"/> class="custom_required" readonly="1"/>
<field name="after_assembly_max_lifetime_value" string="最大寿命值(min)" <field name="after_assembly_knife_tip_r_angle" string="刀尖R角(mm)"
class="custom_required"/> class="custom_required" readonly="1"/>
<field name="after_assembly_alarm_value" string="报警值(min)" class="custom_required"/>
<field name="after_assembly_used_value" string="已使用值(min)"/>
<field name="after_assembly_tool_loading_length" string="总长度(mm)" <field name="after_assembly_tool_loading_length" string="总长度(mm)"
class="custom_required" readonly="1"/>
<field name="after_assembly_handle_length" string="刀柄长度(mm)"
class="custom_required"/> class="custom_required"/>
<field name="after_assembly_functional_tool_length" string="伸出长(mm)" <field name="after_assembly_functional_tool_length" string="伸出长(mm)"
class="custom_required"/> class="custom_required"/>
<field name="after_assembly_effective_length" string="有效长(mm)" <field name="after_assembly_max_lifetime_value" string="最大寿命值(min)"
class="custom_required"/> class="custom_required"/>
<field name="hiding_length" class="custom_required"/> <field name="after_assembly_alarm_value" string="报警值(min)"
<field name="L_D_number"/> class="custom_required"/>
<field name="after_assembly_used_value" string="已使用值(min)" invisible="1"/>
<field name="after_assembly_effective_length" string="有效长(mm)" invisible="1"
class="custom_required"/>
<field name="hiding_length" class="custom_required" invisible="1"/>
<field name="L_D_number" invisible="1"/>
</group> </group>
</group> </group>
</group> </group>
</sheet> </sheet>
<footer> <footer>
<button string="确定" name="functional_tool_assembly" type="object" class="btn-primary" <button string="确定" name="functional_tool_assembly" type="object" class="btn-primary"
attrs="{'invisible': [('obtain_measurement_status', '=', False)]}"
confirm="是否确认申请组装"/> confirm="是否确认申请组装"/>
<button string="取消" class="btn-secondary" special="cancel"/> <button string="取消" class="btn-secondary" special="cancel"/>
</footer> </footer>