-->
+ options="{'horizontal': true}" />
+ attrs="{'required': [('equipment_type', '=', '机床')]}"/>
@@ -198,7 +197,7 @@
-
+
@@ -982,16 +981,16 @@
-
+
-
+
-
+
days
diff --git a/sf_manufacturing/controllers/__init__.py b/sf_manufacturing/controllers/__init__.py
index e046e49f..4d20cb33 100644
--- a/sf_manufacturing/controllers/__init__.py
+++ b/sf_manufacturing/controllers/__init__.py
@@ -1 +1,2 @@
from . import controllers
+from . import workpiece
diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py
index 9063f518..c548222a 100644
--- a/sf_manufacturing/controllers/controllers.py
+++ b/sf_manufacturing/controllers/controllers.py
@@ -210,7 +210,7 @@ class Manufacturing_Connect(http.Controller):
'state': 'finished'})
production_obj = request.env['mrp.production'].sudo().search([('name', '=', production_id)])
if production_obj:
- production_obj.sudo().schedule_state = '已完成'
+ production_obj.sudo().work_order_state = '已完成'
production_obj.write({'state': 'completed'})
request.env['sale.order'].sudo().search(
[('name', '=', production_obj.origin)]).write({'schedule_status': 'to deliver'})
diff --git a/sf_manufacturing/controllers/workpiece.py b/sf_manufacturing/controllers/workpiece.py
new file mode 100644
index 00000000..e2f60421
--- /dev/null
+++ b/sf_manufacturing/controllers/workpiece.py
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+import logging
+import json
+from odoo import http
+from odoo.http import request
+
+
+class Workpiece(http.Controller):
+
+ @http.route('/agvApi/backfeed', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
+ cors="*")
+ def backfeed(self, **kw):
+ """
+ agv小车反馈工单(工件)结果
+ :param kw:
+ :return:
+ """
+ logging.info('backfeed:%s' % kw)
+ try:
+ res = {'Succeed': True}
+ datas = request.httprequest.data
+ ret = json.loads(datas)
+ logging.info('backfeed-ret:%s' % ret)
+ if 'reqCode' in ret:
+ if 'method' in ret:
+ if ret['method'] == 'end':
+ workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search(
+ [('production_id.name', '=', ret['reqCode'])])
+ if workpiece_delivery:
+ workpiece_delivery.write({'status': '已配送', 'task_completion_time': ret['reqTime']})
+ else:
+ res = {'Succeed': False, 'ErrorCode': 203, 'Error': '该reqCode暂未查到对应的工件配送记录'}
+ else:
+ res = {'Succeed': False, 'ErrorCode': 204, 'Error': '未传method字段'}
+ else:
+ res = {'Succeed': False, 'ErrorCode': 201, 'Error': '未传reqCode字段'}
+ except Exception as e:
+ res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
+ logging.info('backfeed error:%s' % e)
+ return json.JSONEncoder().encode(res)
diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index d843c283..dff2763b 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -20,6 +20,8 @@ class MrpProduction(models.Model):
model_file = fields.Binary('模型文件', related='product_id.model_file')
schedule_state = fields.Selection([('未排', '未排'), ('已排', '已排'), ('已完成', '已完成')],
string='排程状态', default='未排')
+ work_order_state = fields.Selection([('未排', '未排'), ('已排', '已排'), ('已完成', '已完成')],
+ string='工单状态', default='未排')
# state = fields.Selection(selection_add=[
# ('pending_scheduling', '待排程'),
@@ -53,8 +55,7 @@ class MrpProduction(models.Model):
production_line_id = fields.Many2one('sf.production.line', string='生产线')
plan_start_processing_time = fields.Datetime('计划开始加工时间')
production_line_state = fields.Selection([('待上产线', '待上产线'), ('已上产线', '已上产线'), ('已下产线', '已下产线')],
- string='上/下产线', default='待上产线')
-
+ string='上/下产线', default='待上产线')
@api.depends(
'move_raw_ids.state', 'move_raw_ids.quantity_done', 'move_finished_ids.state',
@@ -94,9 +95,9 @@ class MrpProduction(models.Model):
production.state = 'pending_processing'
# elif production.state == 'progress' and production.schedule_state == '已完成':
# production.state = 'completed'
- elif production.state == 'pending_processing' and production.schedule_state == '已完成':
+ elif production.state == 'pending_processing' and production.work_order_state == '已完成':
production.state = 'completed'
- elif production.state == 'progress' and production.schedule_state == '已完成':
+ elif production.state == 'progress' and production.work_order_state == '已完成':
production.state = 'completed'
def action_check(self):
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 29395dda..dfb064cb 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -236,7 +236,16 @@ class ResMrpWorkOrder(models.Model):
# if not item.workpiece_code:
# raise UserError('请对【同运工件】进行扫描')
else:
- item.write({'task_delivery_time': fields.Datetime.now(), 'status': '待配送'})
+ if item.status == '待下发':
+ return {
+ 'name': _('确认'),
+ 'type': 'ir.actions.act_window',
+ 'view_mode': 'form',
+ 'res_model': 'sf.workpiece.delivery.wizard',
+ 'target': 'new',
+ 'context': {
+ 'default_workorder_id': self.id,
+ }}
# 拼接工单对象属性值
def json_workorder_str(self, k, production, route):
@@ -899,7 +908,25 @@ class WorkPieceDelivery(models.Model):
# 配送至avg小车
def _delivery_avg(self):
- self.write({'task_delivery_time': fields.Datetime.now(), 'status': '待配送'})
+ res = {'reqCode': self.production_id.name, 'reqTime': '', 'clientCode': '', 'tokenCode': '',
+ 'taskTyp': 'F01', 'ctnrTyp': '', 'ctnrCode': '', 'wbCode': '', 'positionCodePath': [], 'podCode': '',
+ 'podDir': '', 'materialLot': '', 'priority': '', 'taskCode': '', 'agvCode': '', 'materialLot': '',
+ 'data': ''}
+ config = self.env['res.config.settings'].get_values()
+ try:
+ logging.info('config-AGV请求路径:%s' % config['agv_rcms_url'])
+ logging.info('config-json:%s' % res)
+ ret = requests.post((config['agv_rcms_url']), json=res)
+ ret = ret.json()
+ logging.info('config-ret:%s' % ret)
+ if ret['code'] == 0:
+ if self.production_id.name == ret['reqCode']:
+ self.write({'task_delivery_time': fields.Datetime.now(), 'status': '待配送'})
+ else:
+ raise UserError(ret['message'])
+ except Exception as e:
+ logging.info('config-e:%s' % e)
+ raise UserError("工件配送请求agv失败")
@api.depends('production_id.production_line_id')
def _compute_production_line_id(self):
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index c8dadcb4..be0c09ae 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -6,6 +6,8 @@ import os
from odoo import models, fields, api, _
from odoo.exceptions import ValidationError
from odoo.modules import get_resource_path
+
+
from OCC.Extend.DataExchange import read_step_file
from OCC.Extend.DataExchange import write_stl_file
@@ -39,7 +41,8 @@ class ResProductMo(models.Model):
product_model_type_id = fields.Many2one('sf.model.type', string='产品模型类型')
embryo_model_type_id = fields.Many2one('sf.model.type', string='坯料模型类型')
materials_id = fields.Many2one('sf.production.materials', string='材料')
- materials_type_id = fields.Many2one('sf.materials.model', string='材料型号')
+ materials_type_id = fields.Many2one('sf.materials.model', string='材料型号',
+ domain="[('materials_id', '=', materials_id)]")
server_product_process_parameters_id = fields.Many2one('sf.production.process.parameter',
string='表面工艺参数(服务产品)')
model_process_parameters_ids = fields.Many2many('sf.production.process.parameter', 'process_parameter_rel',
@@ -68,7 +71,8 @@ class ResProductMo(models.Model):
cutting_tool_shank_length = fields.Float('柄部长度(mm)', digits=(6, 1))
cutting_tool_blade_length = fields.Float('刃部长度(mm)')
cutting_tool_blade_number = fields.Selection(
- [('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('6', '6'), ('7', '7'), ('8', '8')], '刃数(个)')
+ [('0', '0'), ('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('6', '6'), ('7', '7'), ('8', '8')],
+ string='刃数(个)', default='0')
# 整体式刀具新增字段
cutting_tool_neck_length = fields.Float('颈部长度(mm)', digits=(6, 1))
cutting_tool_neck_diameter = fields.Float('颈部直径(mm)', digits=(6, 1))
@@ -101,6 +105,10 @@ class ResProductMo(models.Model):
compaction_way_id = fields.Many2one('maintenance.equipment.image',
'压紧方式', domain=[('type', '=', '压紧方式')])
+ @api.onchange('cutting_tool_model_id')
+ def _onchange_cutting_tool_model_id(self):
+ self.specification_id = False
+
@api.onchange('cutting_tool_material_id')
def _onchange_cutting_tool_material_id(self):
for item in self:
@@ -190,20 +198,24 @@ class ResProductMo(models.Model):
self.cutting_tool_blade_number = self.specification_id.blade_number
self.cutting_tool_blade_type = self.cutting_tool_model_id.blade_type
self.cutting_tool_shank_diameter = self.specification_id.handle_diameter
+ self.cutting_tool_shank_length = self.specification_id.handle_length
+ self.cutting_tool_neck_length = self.specification_id.neck_length
+ self.cutting_tool_neck_diameter = self.specification_id.neck_diameter
self.cutting_tool_blade_tip_diameter = self.specification_id.blade_tip_diameter
self.cutting_tool_blade_tip_taper = self.specification_id.blade_tip_taper
self.cutting_tool_blade_helix_angle = self.specification_id.blade_helix_angle
+ self.cutting_tool_blade_tip_working_size = self.specification_id.blade_tip_working_size
self.cutting_tool_pitch = self.specification_id.pitch
self.cutting_tool_blade_width = self.specification_id.blade_width
self.cutting_tool_blade_depth = self.specification_id.blade_depth
- self.cutting_tool_cut_depth = self.specification_id.cutting_depth
+ self.cutting_tool_cut_depth_max = self.specification_id.cut_depth_max
self.cutting_speed_ids = self.cutting_tool_model_id.cutting_speed_ids
self.feed_per_tooth_ids = self.cutting_tool_model_id.feed_per_tooth_ids.filtered(
lambda r: int(r.blade_diameter) == int(self.specification_id.blade_diameter))
elif self.cutting_tool_type == '夹头':
self.cutting_tool_clamping_diameter_min = self.specification_id.min_clamping_diameter
- self.cutting_tool_clamping_diameter_min = self.specification_id.max_clamping_diameter
- self.cutting_tool_clamping_way = self.specification_id.clamping_mode
+ self.cutting_tool_clamping_diameter_max = self.specification_id.max_clamping_diameter
+ self.cutting_tool_taper = self.specification_id.taper
self.cutting_tool_top_diameter = self.specification_id.top_diameter
self.cutting_tool_outer_diameter = self.specification_id.outer_diameter
self.cutting_tool_inner_diameter = self.specification_id.inner_diameter
@@ -241,6 +253,7 @@ class ResProductMo(models.Model):
self.cutting_speed_ids = self.cutting_tool_model_id.cutting_speed_ids
self.feed_per_tooth_ids = self.cutting_tool_model_id.feed_per_tooth_ids
elif self.cutting_tool_type in ('刀盘', '刀杆'):
+ self.cutting_tool_blade_diameter = self.specification_id.blade_diameter
self.cutting_tool_total_length = self.specification_id.total_length
self.tool_length = self.specification_id.length
self.tool_thickness = self.specification_id.thickness
@@ -271,14 +284,19 @@ class ResProductMo(models.Model):
self.cutting_tool_cutter_head_diameter = self.specification_id.cutter_head_diameter
self.cutting_tool_interface_diameter = self.specification_id.interface_diameter
else:
+ self.cutting_tool_cutter_arbor_diameter = self.specification_id.cutter_arbor_diameter
self.cutting_tool_knife_head_height = self.specification_id.knife_head_height
self.cutting_tool_knife_head_width = self.specification_id.knife_head_width
self.cutting_tool_knife_head_length = self.specification_id.knife_head_length
self.cutting_tool_tool_shim = self.specification_id.tool_shim
self.cutting_tool_cotter_pin = self.specification_id.cotter_pin
self.cutting_tool_pressing_plate = self.specification_id.pressing_plate
+ self.cutting_tool_min_machining_aperture = self.specification_id.min_machining_aperture
+ self.cutting_tool_rear_angle = self.specification_id.relief_angle
elif self.cutting_tool_type == '刀柄':
self.cutting_tool_total_length = self.specification_id.total_length
+ self.cutting_tool_shank_diameter = self.specification_id.shank_diameter
+ self.cutting_tool_shank_length = self.specification_id.shank_length
self.cutting_tool_speed_max = self.specification_id.max_rotate_speed
self.cutting_tool_change_time = self.specification_id.tool_changing_time
self.cutting_tool_total_length = self.specification_id.total_length
@@ -295,6 +313,8 @@ class ResProductMo(models.Model):
self.cutting_tool_chuck_id = self.specification_id.chuck_id.id
self.cutting_tool_jump_accuracy = self.specification_id.diameter_slip_accuracy
self.cutting_tool_taper_shank_model = self.specification_id.taper_shank_model
+ self.cutting_tool_cooling_type = self.specification_id.cooling_model
+ self.cutting_tool_clamping_way = self.specification_id.clamping_mode
self.suitable_machining_method_ids = [(6, 0, [])] if not \
self.cutting_tool_model_id.suitable_machining_method_ids \
else [(6, 0, self.cutting_tool_model_id.suitable_machining_method_ids.ids)]
@@ -311,6 +331,7 @@ class ResProductMo(models.Model):
(6, 0, self.cutting_tool_model_id.suitable_coolant_ids.ids)]
self.compaction_way_id = self.cutting_tool_model_id.compaction_way_id.id
self.fit_blade_shape_id = self.cutting_tool_model_id.fit_blade_shape_id.id
+ self.image_1920 = self.cutting_tool_model_id.image
else:
self.cutting_tool_type_id = False
self.brand_id = False
@@ -350,30 +371,30 @@ class ResProductMo(models.Model):
self.cutting_speed_ids = False
self.feed_per_tooth_ids = False
- @api.constrains('fit_blade_shape_id', 'suitable_machining_method_ids', 'blade_tip_characteristics_id',
- 'handle_type_id', 'cutting_direction_ids', 'suitable_coolant_ids', 'compaction_way_id')
- def _check_cutting_tool_ability(self):
- if self.cutting_tool_type in ['整体式刀具', '刀片', '刀杆', '刀盘']:
- if self.cutting_tool_type in ['刀片', '刀杆', '刀盘']:
- if not self.fit_blade_shape_id:
- raise ValidationError("请选择适配刀片形状")
- if self.cutting_tool_type in ['刀杆', '刀盘']:
- if not self.compaction_way_id:
- raise ValidationError("请选择压紧方式")
- if self.cutting_tool_type == '刀片':
- if not self.suitable_coolant_ids:
- raise ValidationError("请选择适合冷却方式")
- elif self.cutting_tool_type == '整体式刀具':
- if not self.handle_type_id:
- raise ValidationError("请选择柄部类型")
- if not self.suitable_coolant_ids:
- raise ValidationError("请选择适合冷却方式")
- if not self.suitable_machining_method_ids:
- raise ValidationError("请选择适合加工方式")
- if not self.blade_tip_characteristics_id:
- raise ValidationError("请选择刀尖特征")
- if not self.cutting_direction_ids:
- raise ValidationError("请选择走刀方向")
+ # @api.constrains('fit_blade_shape_id', 'suitable_machining_method_ids', 'blade_tip_characteristics_id',
+ # 'handle_type_id', 'cutting_direction_ids', 'suitable_coolant_ids', 'compaction_way_id')
+ # def _check_cutting_tool_ability(self):
+ # if self.cutting_tool_type in ['整体式刀具', '刀片', '刀杆', '刀盘']:
+ # if self.cutting_tool_type in ['刀片', '刀杆', '刀盘']:
+ # if not self.fit_blade_shape_id:
+ # raise ValidationError("请选择适配刀片形状")
+ # if self.cutting_tool_type in ['刀杆', '刀盘']:
+ # if not self.compaction_way_id:
+ # raise ValidationError("请选择压紧方式")
+ # if self.cutting_tool_type == '刀片':
+ # if not self.suitable_coolant_ids:
+ # raise ValidationError("请选择适合冷却方式")
+ # elif self.cutting_tool_type == '整体式刀具':
+ # if not self.handle_type_id:
+ # raise ValidationError("请选择柄部类型")
+ # if not self.suitable_coolant_ids:
+ # raise ValidationError("请选择适合冷却方式")
+ # if not self.suitable_machining_method_ids:
+ # raise ValidationError("请选择适合加工方式")
+ # if not self.blade_tip_characteristics_id:
+ # raise ValidationError("请选择刀尖特征")
+ # if not self.cutting_direction_ids:
+ # raise ValidationError("请选择走刀方向")
cutting_speed_ids = fields.One2many('sf.cutting.speed', 'product_template_id', string='切削速度Vc')
feed_per_tooth_ids = fields.One2many('sf.feed.per.tooth', 'product_template_id', string='每齿走刀量fz')
@@ -658,11 +679,14 @@ class ResProductMo(models.Model):
# 外协和采购生成的坯料需要根据材料型号绑定供应商
if route_type == 'subcontract' or route_type == 'purchase':
no_bom_copy_product_id.purchase_ok = True
- no_bom_copy_product_id.seller_ids = [
- (0, 0, {'partner_id': supplier.partner_id.id, 'delay': 1.0})]
- if route_type == 'subcontract':
- partner = self.env['res.partner'].search([('id', '=', supplier.partner_id.id)])
- partner.is_subcontractor = True
+ if supplier:
+ no_bom_copy_product_id.seller_ids = [
+ (0, 0, {'partner_id': supplier.partner_id.id, 'delay': 1.0})]
+ if route_type == 'subcontract':
+ partner = self.env['res.partner'].search([('id', '=', supplier.partner_id.id)])
+ partner.is_subcontractor = True
+ else:
+ return -3
no_bom_copy_product_id.write(vals)
return no_bom_copy_product_id
diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index c9c2ebf2..3166441a 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -219,7 +219,8 @@ class StockRule(models.Model):
class ProductionLot(models.Model):
- _inherit = 'stock.lot'
+ _name = 'stock.lot'
+ _inherit = ['stock.lot', 'printing.utils']
@api.model
def generate_lot_names1(self, display_name, first_lot, count):
@@ -263,7 +264,7 @@ class ProductionLot(models.Model):
if not last_serial:
return "%s-%s%03d" % (product.cutting_tool_model_id.code[:-12], now, 1)
else:
- return "%s-%s%03d" % (product.cutting_tool_model_id.code[:-12], now, int(last_serial.name[-3:]) + 1)
+ return "%s-%s%03d" % (product.cutting_tool_model_id.code[:-12], now, int(last_serial.name[-3:]) + 2)
else:
raise ValidationError('该刀具物料产品的型号字段为空，请补充完整！！！')
@@ -307,36 +308,53 @@ class ProductionLot(models.Model):
record.qr_code_image = encoded_image
- def print_qr_code(self):
- self.ensure_one() # 确保这个方法只为一个记录调用
- # if not self.lot_id:
- # raise UserError("没有找到序列号。")
- # 假设_lot_qr_code方法已经生成了二维码并保存在字段中
+ def print_single_method(self):
+
+ self.ensure_one()
qr_code_data = self.qr_code_image
if not qr_code_data:
raise UserError("没有找到二维码数据。")
+ lot_name = self.name
+ # host = "192.168.50.110" # 可以根据实际情况修改
+ # port = 9100 # 可以根据实际情况修改
- # 生成下载链接或直接触发下载
- # 此处的实现依赖于你的具体需求，以下是触发下载的一种示例
- attachment = self.env['ir.attachment'].sudo().create({
- 'datas': self.qr_code_image,
- 'type': 'binary',
- 'description': '二维码图片',
- 'name': self.name + '.png',
- # 'res_id': invoice.id,
- # 'res_model': 'stock.picking',
- 'public': True,
- 'mimetype': 'application/x-png',
- # 'model_name': 'stock.picking',
- })
- # 返回附件的下载链接
- download_url = '/web/content/%s?download=true' % attachment.id
- base_url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
- return {
- 'type': 'ir.actions.act_url',
- 'url': str(base_url) + download_url,
- 'target': 'self',
- }
+ # 获取默认打印机配置
+ printer_config = self.env['printer.configuration'].search([('model', '=', self._name)], limit=1)
+ if not printer_config:
+ raise UserError('请先配置打印机')
+ host = printer_config.printer_id.ip_address
+ port = printer_config.printer_id.port
+ self.print_qr_code(lot_name, host, port)
+
+ # self.ensure_one() # 确保这个方法只为一个记录调用
+ # # if not self.lot_id:
+ # # raise UserError("没有找到序列号。")
+ # # 假设_lot_qr_code方法已经生成了二维码并保存在字段中
+ # qr_code_data = self.qr_code_image
+ # if not qr_code_data:
+ # raise UserError("没有找到二维码数据。")
+ #
+ # # 生成下载链接或直接触发下载
+ # # 此处的实现依赖于你的具体需求，以下是触发下载的一种示例
+ # attachment = self.env['ir.attachment'].sudo().create({
+ # 'datas': self.qr_code_image,
+ # 'type': 'binary',
+ # 'description': '二维码图片',
+ # 'name': self.name + '.png',
+ # # 'res_id': invoice.id,
+ # # 'res_model': 'stock.picking',
+ # 'public': True,
+ # 'mimetype': 'application/x-png',
+ # # 'model_name': 'stock.picking',
+ # })
+ # # 返回附件的下载链接
+ # download_url = '/web/content/%s?download=true' % attachment.id
+ # base_url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
+ # return {
+ # 'type': 'ir.actions.act_url',
+ # 'url': str(base_url) + download_url,
+ # 'target': 'self',
+ # }
class StockPicking(models.Model):
diff --git a/sf_manufacturing/security/ir.model.access.csv b/sf_manufacturing/security/ir.model.access.csv
index 5f3f37d8..8272af30 100644
--- a/sf_manufacturing/security/ir.model.access.csv
+++ b/sf_manufacturing/security/ir.model.access.csv
@@ -22,6 +22,8 @@ access_maintenance_equipment_tool_manager,maintenance_equipment_tool,model_maint
access_maintenance_equipment_tool_equipment_manager,maintenance_equipment_tool,model_maintenance_equipment_tool,sf_maintenance.sf_group_equipment_user,1,1,1,0
access_mrp_production_group_sf_mrp_user,mrp_production,model_mrp_production,sf_base.group_sf_mrp_user,1,0,0,0
access_mrp_production_manager,mrp_production,model_mrp_production,sf_base.group_sf_mrp_manager,1,1,1,0
+access_mrp_production_group_quality,mrp_production_group_quality,model_mrp_production,sf_base.group_quality,1,0,0,0
+access_mrp_production_group_quality_director,mrp_production_group_quality_director,model_mrp_production,sf_base.group_quality_director,1,0,0,0
access_mrp_workorder_group_sf_mrp_user,mrp_workorder,model_mrp_workorder,sf_base.group_sf_mrp_user,1,0,0,0
access_mrp_workorder_manager,mrp_workorder,model_mrp_workorder,sf_base.group_sf_mrp_manager,1,1,1,0
access_mrp_workcenter_group_sf_mrp_user,mrp_workcenter,model_mrp_workcenter,sf_base.group_sf_mrp_user,1,0,0,0
@@ -108,9 +110,9 @@ access_sf_production_line_group_plan_dispatch,sf.production.line,model_sf_produc
access_sf_production_line_group_plan_director,sf.production.line,model_sf_production_line,sf_base.group_plan_director,1,1,1,0
access_sf_production_line,sf.production.line,model_sf_production_line,sf_maintenance.sf_group_equipment_user,1,1,1,0
access_mrp_workcenter,mrp_workcenter,model_mrp_workcenter,sf_base.group_plan_dispatch,1,1,1,0
-access_mrp_bom,mrp.bom,mrp.model_mrp_bom,sf_base.group_plan_dispatch,1,1,1,0
+access_mrp_bom_group_plan_dispatch,mrp.bom,mrp.model_mrp_bom,sf_base.group_plan_dispatch,1,0,0,0
access_mrp_bom_line,mrp.bom.line,mrp.model_mrp_bom_line,sf_base.group_plan_dispatch,1,0,0,0
-access_mrp_unbuild,mrp.unbuild,mrp.model_mrp_unbuild,sf_base.group_plan_dispatch,1,1,1,0
+access_mrp_unbuild_group_plan_dispatch,mrp.unbuild,mrp.model_mrp_unbuild,sf_base.group_plan_dispatch,1,0,0,0
access_stock_scrap_group_plan_dispatch,stock.scrap,stock.model_stock_scrap,sf_base.group_plan_dispatch,1,0,0,0
access_sf_model_type,sf.model.type,model_sf_model_type,sf_base.group_plan_dispatch,1,1,1,0
diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index cca86f6e..0ae0d95f 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -68,6 +68,7 @@
+
@@ -235,6 +236,10 @@
attrs="{'invisible': [('state', '!=', 'done')]}" data-hotkey="shift+v"
groups="sf_base.group_sf_mrp_user"/>
+
+
+ {'invisible': [('schedule_state', '=', '未排')]}
+
@@ -245,30 +250,31 @@
+
@@ -282,24 +288,24 @@
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 6ac179c1..308ba2f1 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -104,21 +104,22 @@
+
+ attrs="{'invisible': ['|', '|','|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False), ('routing_type', '=', 'CNC加工')]}"/>
+ attrs="{'invisible': ['|', '|','|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False), ('routing_type', '=', 'CNC加工')]}"/>
+ attrs="{'invisible': ['|', '|','|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'),('user_permissions','=',False),('state','=','done'), ('routing_type', '=', 'CNC加工')]}"/>
+
-
\ No newline at end of file
diff --git a/sf_plan/models/custom_plan.py b/sf_plan/models/custom_plan.py
index d4402c98..5f0d254b 100644
--- a/sf_plan/models/custom_plan.py
+++ b/sf_plan/models/custom_plan.py
@@ -44,8 +44,9 @@ class sf_production_plan(models.Model):
production_id = fields.Many2one('mrp.production', '关联制造订单')
product_qty = fields.Float(string='数量', digits='Product Unit of Measure', required=True, default=0.0)
production_line_id = fields.Many2one('sf.production.line', string='生产线')
- date_planned_start = fields.Datetime(string='计划开始时间', required=True, index=True, copy=False,
- default=fields.Datetime.now)
+ # date_planned_start = fields.Datetime(string='计划开始时间', required=True, index=True, copy=False,
+ # default=fields.Datetime.now)
+ date_planned_start = fields.Datetime(string='计划开始时间')
date_planned_finished = fields.Datetime(string='计划结束时间')
# 排程设置selection(倒排，顺排，默认倒排）
schedule_setting = fields.Selection([
@@ -80,7 +81,7 @@ class sf_production_plan(models.Model):
def _compute_production_line_id(self):
for item in self:
item.sudo().production_id.production_line_id = item.production_line_id.id
- item.sudo().production_id.plan_start_processing_time = item.date_planned_start
+ # item.sudo().production_id.plan_start_processing_time = item.date_planned_start
# @api.onchange('state')
# def _onchange_state(self):
@@ -198,7 +199,9 @@ class sf_production_plan(models.Model):
for item in record.production_id.workorder_ids:
if item.name == 'CNC加工':
item.date_planned_finished = datetime.now() + timedelta(days=100)
- item.date_planned_start = record.date_planned_start
+ # item.date_planned_start = record.date_planned_start
+ item.date_planned_start = datetime.now()
+ record.sudo().production_id.plan_start_processing_time = item.date_planned_start
item.date_planned_finished = item.date_planned_start + timedelta(
minutes=record.env['mrp.routing.workcenter'].sudo().search(
[('name', '=', 'CNC加工')]).time_cycle)
@@ -291,6 +294,7 @@ class sf_production_plan(models.Model):
print('时间设置失败，请检查是否为工序分配工作中心，%s' % e)
def cancel_production_schedule(self):
+ self.date_planned_start = False
self.date_planned_finished = False
self.state = 'draft'
self.production_line_id = False
diff --git a/sf_plan/views/view.xml b/sf_plan/views/view.xml
index 4025d4bb..1e7ff0f6 100644
--- a/sf_plan/views/view.xml
+++ b/sf_plan/views/view.xml
@@ -10,7 +10,7 @@
+ class="treeHeaderBtn"/>
-
+
diff --git a/sf_quality/models/custom_quality.py b/sf_quality/models/custom_quality.py
index b6fed11a..f80dd92e 100644
--- a/sf_quality/models/custom_quality.py
+++ b/sf_quality/models/custom_quality.py
@@ -11,26 +11,3 @@ class SfQualityPoint(models.Model):
"('product', 'consu')), '|', ('company_id', '=', False), ('company_id', '=', company_id)]", help=
"Quality Point will apply to every selected Products.")
- check_state = fields.Selection([
- ('enable', '启用'),
- ('close', '关闭')
- ], string='审核状态', default='close')
-
- # 审核
- def action_check(self):
- self.check_state = 'enable'
- # picking_type_ids = fields.Many2many(
- # 'stock.picking.type', string='执行节点', required=True, check_company=True)
-
-
-class ResQualityAlertTeam(models.Model):
- _inherit = 'quality.alert.team'
-
- check_state = fields.Selection([
- ('enable', '启用'),
- ('close', '关闭')
- ], string='审核状态', default='close')
-
- # 审核
- def action_check(self):
- self.check_state = 'enable'
diff --git a/sf_quality/views/view.xml b/sf_quality/views/view.xml
index 1159a8d0..1edbca05 100644
--- a/sf_quality/views/view.xml
+++ b/sf_quality/views/view.xml
@@ -39,13 +39,6 @@
quality.point
-
-
-
-
@@ -67,26 +60,10 @@
custom_required
-
custom_required
-
-
- quality.alert.team.form.inherit.sf
- quality.alert.team
-
-
-
-
-
-
-
-
diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index 1ec6e2bd..4848ce7c 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -1,7 +1,12 @@
import datetime
import base64
from odoo import models, fields, api, _
-from odoo.exceptions import UserError
+from odoo.exceptions import UserError, ValidationError
+
+READONLY_FIELD_STATES = {
+ state: [('readonly', True)]
+ for state in {'sale', 'done', 'cancel'}
+}
class ReSaleOrder(models.Model):
@@ -39,6 +44,12 @@ class ReSaleOrder(models.Model):
domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]")
remark = fields.Text('备注')
+ validity_date = fields.Date(
+ string="Expiration",
+ compute='_compute_validity_date',
+ store=True, readonly=False, copy=False, precompute=True,
+ states=READONLY_FIELD_STATES, default=fields.Datetime.now)
+
# 业务平台分配工厂后在智能工厂先创建销售订单
def sale_order_create(self, company_id, delivery_name, delivery_telephone, delivery_address,
deadline_of_delivery, payments_way, pay_way):
@@ -99,7 +110,7 @@ class ReSaleOrder(models.Model):
def check_order_line(self):
for item in self:
if not item.order_line:
- raise UserError('请选择【订单行】中的【产品】')
+ raise ValidationError('请选择【订单行】中的【产品】')
for line in item.order_line:
if not line.product_template_id:
raise UserError('请对【订单行】中的【产品】进行选择')
diff --git a/sf_sale/security/ir.model.access.csv b/sf_sale/security/ir.model.access.csv
index 566a7c70..34cea19a 100644
--- a/sf_sale/security/ir.model.access.csv
+++ b/sf_sale/security/ir.model.access.csv
@@ -24,6 +24,9 @@ access_stock_picking_group_sale_salemanager,stock_picking_group_sale_salemanager
access_stock_picking_group_sale_director,stock_picking_group_sale_director,stock.model_stock_picking,sf_base.group_sale_director,1,0,0,0
access_stock_picking_group_purchase,stock_picking_group_purchase,stock.model_stock_picking,sf_base.group_purchase,1,1,1,0
access_stock_picking_group_purchase_director,stock_picking_group_purchase_director,stock.model_stock_picking,sf_base.group_purchase_director,1,1,1,0
+access_stock_picking_group_quality,stock_picking_group_quality,stock.model_stock_picking,sf_base.group_quality,1,0,0,0
+access_stock_picking_group_quality_director,stock_picking_group_quality_director,stock.model_stock_picking,sf_base.group_quality_director,1,0,0,0
+
access_account_move_group_sale_salemanager,account_move_group_sale_salemanager,account.model_account_move,sf_base.group_sale_salemanager,1,0,0,0
access_account_move_group_sale_director,account_move_group_sale_director,account.model_account_move,sf_base.group_sale_director,1,0,0,0
access_resource_resource_group_sale_director,resource_resource_group_sale_director,resource.model_resource_resource,sf_base.group_sale_director,1,1,1,0
diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml
index 7e929fe4..f92658fc 100644
--- a/sf_sale/views/purchase_order_view.xml
+++ b/sf_sale/views/purchase_order_view.xml
@@ -23,7 +23,8 @@
-
+
-
+
-
+
@@ -51,17 +58,20 @@
sf_base.group_purchase,sf_base.group_purchase_director
-
-
-
-
-
- sf_base.group_purchase,sf_base.group_purchase_director
-
-
- sf_base.group_purchase,sf_base.group_purchase_director
-
-
+
+
+
+
+
+ sf_base.group_purchase,sf_base.group_purchase_director
+
+
+ sf_base.group_purchase,sf_base.group_purchase_director
+
+
@@ -171,5 +181,16 @@
+
+
+ purchase.order.list.select.inherit.sf
+ purchase.order
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml
index de37ae7a..b7a1ef96 100644
--- a/sf_sale/views/sale_order_view.xml
+++ b/sf_sale/views/sale_order_view.xml
@@ -243,6 +243,10 @@
+
+
+
+
diff --git a/sf_tool_management/__manifest__.py b/sf_tool_management/__manifest__.py
index 3eee245a..a7750f69 100644
--- a/sf_tool_management/__manifest__.py
+++ b/sf_tool_management/__manifest__.py
@@ -20,6 +20,7 @@
'views/sf_maintenance_equipment.xml',
'views/menu_view.xml',
'views/tool_material_search.xml',
+ 'views/fixture_material_search_views.xml',
],
'demo': [
],
diff --git a/sf_tool_management/models/__init__.py b/sf_tool_management/models/__init__.py
index 98c06d41..f73f5e3d 100644
--- a/sf_tool_management/models/__init__.py
+++ b/sf_tool_management/models/__init__.py
@@ -2,4 +2,7 @@ from . import base
from . import tool_material_search
from . import maintenance_equipment
from . import mrp_workorder
+from . import functional_tool_enroll
+from . import fixture_material_search
+from . import fixture_enroll
diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index 649c757e..2c4b4364 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -14,9 +14,9 @@ class FunctionalCuttingToolEntity(models.Model):
_description = '功能刀具列表'
tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', related='functional_tool_name_id.tool_groups_id')
- code = fields.Char('编码', related='functional_tool_name_id.code')
+ code = fields.Char('编码')
rfid = fields.Char('rfid', readonly=True)
- name = fields.Char(related='functional_tool_name_id.name')
+ name = fields.Char('名称')
functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', string='功能刀具名称', readonly=True)
barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True)
sf_cutting_tool_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀具型号')
@@ -69,22 +69,15 @@ class FunctionalCuttingToolEntity(models.Model):
"""
for obj in self:
if obj.current_location_id:
+ obj.tool_room_num = 0
+ obj.line_edge_knife_library_num = 0
+ obj.machine_knife_library_num = 0
if obj.current_location in ['刀具房']:
obj.tool_room_num = 1
- obj.line_edge_knife_library_num = 0
- obj.machine_knife_library_num = 0
elif "线边刀库" in obj.current_location:
- obj.tool_room_num = 0
obj.line_edge_knife_library_num = 1
- obj.machine_knife_library_num = 0
elif "机内刀库" in obj.current_location:
- obj.tool_room_num = 0
- obj.line_edge_knife_library_num = 0
obj.machine_knife_library_num = 1
- else:
- obj.tool_room_num = 0
- obj.line_edge_knife_library_num = 0
- obj.machine_knife_library_num = 0
@api.model
def _read_group_mrs_cutting_tool_type_id(self, categories, domain, order):
@@ -136,7 +129,6 @@ class FunctionalCuttingToolEntity(models.Model):
@api.depends('cutting_tool_integral_model_id', 'cutting_tool_blade_model_id')
def _compute_maintenance_equipment_image(self):
for record in self:
- print('111')
if record.cutting_tool_integral_model_id:
print(record.cutting_tool_integral_model_id)
record.sudo().suitable_machining_method_ids = record.cutting_tool_integral_model_id.suitable_machining_method_ids.ids
@@ -194,36 +186,35 @@ class FunctionalCuttingToolEntity(models.Model):
stock_location_id = self.env['stock.location'].search([('name', '=', '制造前')])
# 创建功能刀具该批次/序列号 库存移动和移动历史
self.barcode_id.create_stock_quant(location_inventory_id, stock_location_id,
- self.functional_tool_name_id.id, '机床装刀')
+ self.functional_tool_name_id.id, '机床装刀', self.functional_tool_name_id)
+ # ==========刀具组接口==========
+ # def _register_functional_tool_groups(self, obj):
+ # create_url = '/AutoDeviceApi/ToolGroup'
+ # sf_sync_config = self.env['res.config.settings'].get_values()
+ # token = sf_sync_config['token']
+ # sf_secret_key = sf_sync_config['sf_secret_key']
+ # headers = Common.get_headers(obj, token, sf_secret_key)
+ # strurl = sf_sync_config['sf_url'] + create_url
+ # val = {
+ # 'ToolName': obj.name,
+ # 'GroupName': obj.tool_groups_id.name,
+ # 'ToolId': obj.code
+ # }
+ # kw = json.dumps(val, ensure_ascii=False)
+ # r = requests.post(strurl, json={}, data={'kw': kw, 'token': token}, headers=headers)
+ # ret = r.json()
+ # if r == 200:
+ # return "刀具组发送成功"
+ # else:
+ # raise ValidationError("刀具组发送失败")
-# ==========刀具组接口==========
-# def _register_functional_tool_groups(self, obj):
-# create_url = '/AutoDeviceApi/ToolGroup'
-# sf_sync_config = self.env['res.config.settings'].get_values()
-# token = sf_sync_config['token']
-# sf_secret_key = sf_sync_config['sf_secret_key']
-# headers = Common.get_headers(obj, token, sf_secret_key)
-# strurl = sf_sync_config['sf_url'] + create_url
-# val = {
-# 'ToolName': obj.name,
-# 'GroupName': obj.tool_groups_id.name,
-# 'ToolId': obj.code
-# }
-# kw = json.dumps(val, ensure_ascii=False)
-# r = requests.post(strurl, json={}, data={'kw': kw, 'token': token}, headers=headers)
-# ret = r.json()
-# if r == 200:
-# return "刀具组发送成功"
-# else:
-# raise ValidationError("刀具组发送失败")
-
-# @api.model_create_multi
-# def create(self, vals):
-# obj = super(FunctionalCuttingToolEntity, self).create(vals)
-# # 调用刀具组接口
-# self._register_functional_tool_groups(obj)
-# return obj
+ # @api.model_create_multi
+ # def create(self, vals):
+ # obj = super(FunctionalCuttingToolEntity, self).create(vals)
+ # # 调用刀具组接口
+ # self._register_functional_tool_groups(obj)
+ # return obj
class FunctionalToolWarning(models.Model):
@@ -239,7 +230,8 @@ class FunctionalToolWarning(models.Model):
group_expand='_read_group_machine_table_name_ids')
maintenance_equipment_id = fields.Many2one('maintenance.equipment', string='CNC机床')
machine_tool_code = fields.Char(string='机台号', related='maintenance_equipment_id.name')
- machine_table_type_id = fields.Many2one('maintenance.equipment.category', string='机床类型')
+ machine_table_type_id = fields.Many2one('maintenance.equipment.category', string='机床类型',
+ related='maintenance_equipment_id.category_id')
cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号',
domain="[('equipment_id', '=', maintenance_equipment_id)]")
# 功能刀具信息
@@ -298,14 +290,14 @@ class StockMoveLine(models.Model):
functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', string='功能刀具名称')
functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', store=True,
- group_expand='_read_group_functional_tool_type_id',
- related='functional_tool_name_id.functional_tool_type_id')
- diameter = fields.Integer(string='刀具直径(mm)', related='functional_tool_name_id.functional_tool_diameter')
- knife_tip_r_angle = fields.Float(string='刀尖R角(mm)', related='functional_tool_name_id.knife_tip_r_angle')
- install_tool_time = fields.Datetime("刀具组装时间", related='functional_tool_name_id.tool_loading_time')
- code = fields.Char('编码', related='functional_tool_name_id.code')
- rfid = fields.Char('rfid', related='functional_tool_name_id.rfid')
- tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', related='functional_tool_name_id.tool_groups_id')
+ group_expand='_read_group_functional_tool_type_id')
+ functional_tool_name = fields.Char('刀具名称')
+ diameter = fields.Integer(string='刀具直径(mm)')
+ knife_tip_r_angle = fields.Float(string='刀尖R角(mm)')
+ install_tool_time = fields.Datetime("刀具组装时间", default=fields.Datetime.now())
+ code = fields.Char('编码')
+ rfid = fields.Char('rfid')
+ tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组')
@api.model
def _read_group_functional_tool_type_id(self, categories, domain, order):
@@ -442,17 +434,17 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
计算刀具房数量、线边刀库数量、机内刀库数量
"""
if tool:
- tool.sudo().tool_stock_num = 0
- tool.sudo().side_shelf_num = 0
- tool.sudo().on_tool_stock_num = 0
+ tool.tool_stock_num = 0
+ tool.side_shelf_num = 0
+ tool.on_tool_stock_num = 0
if tool.sf_functional_cutting_tool_entity_ids:
for cutting_tool in tool.sf_functional_cutting_tool_entity_ids:
if cutting_tool.tool_room_num > 0:
- tool.sudo().tool_stock_num += 1
+ tool.tool_stock_num += 1
elif cutting_tool.line_edge_knife_library_num > 0:
- tool.sudo().side_shelf_num += 1
+ tool.side_shelf_num += 1
elif cutting_tool.machine_knife_library_num > 0:
- tool.sudo().on_tool_stock_num += 1
+ tool.on_tool_stock_num += 1
def create_or_edit_safety_stock(self, vals, sf_functional_cutting_tool_entity_ids):
"""
@@ -479,6 +471,14 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
records = super(RealTimeDistributionOfFunctionalTools, self).create(vals_list)
return records
+ def write(self, vals):
+ res = super().write(vals)
+ for item in self:
+ if item:
+ if vals.get('min_stock_num') or vals.get('max_stock_num'):
+ item.enroll_functional_tool_real_time_distribution()
+ return res
+
class MachineTableToolChangingApply(models.Model):
_name = 'sf.machine.table.tool.changing.apply'
diff --git a/sf_tool_management/models/fixture_enroll.py b/sf_tool_management/models/fixture_enroll.py
new file mode 100644
index 00000000..24e4e9f5
--- /dev/null
+++ b/sf_tool_management/models/fixture_enroll.py
@@ -0,0 +1,82 @@
+import json
+import base64
+import requests
+from odoo import models, api
+from odoo.addons.sf_base.commons.common import Common
+from odoo.exceptions import UserError
+
+
+class StockLot(models.Model):
+ _inherit = 'stock.lot'
+ _description = '夹具物料序列号注册'
+
+ def enroll_fixture_material_stock(self):
+ sf_sync_config = self.env['res.config.settings'].get_values()
+ token = sf_sync_config['token']
+ sf_secret_key = sf_sync_config['sf_secret_key']
+ headers = Common.get_headers(self, token, sf_secret_key)
+ str_url = sf_sync_config['sf_url'] + "/api/fixture_material_stock/create"
+ objs_all = self.env['stock.lot'].search([('id', '=', self.id)])
+ fixture_material_stock_list = []
+ if objs_all:
+ for item in objs_all:
+ val = {
+ 'name': item.name,
+ 'tool_material_status': item.tool_material_status,
+ '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)
+ r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
+ ret = r.json()
+ if ret.get('code') == 200:
+ return '夹具物料序列号注册成功'
+ else:
+ raise UserError("没有注册夹具物料序列号信息")
+
+
+class FixtureMaterialSearch(models.Model):
+ _inherit = 'sf.fixture.material.search'
+ _description = '夹具物料搜索注册'
+
+ crea_url = "/api/fixture_material/create"
+
+ def enroll_fixture_material(self):
+ sf_sync_config = self.env['res.config.settings'].get_values()
+ token = sf_sync_config['token']
+ sf_secret_key = sf_sync_config['sf_secret_key']
+ headers = Common.get_headers(self, token, sf_secret_key)
+ str_url = sf_sync_config['sf_url'] + self.crea_url
+ objs_all = self.search([('id', '=', self.id)])
+ fixture_material_list = []
+ if objs_all:
+ for obj in objs_all:
+ val = {
+ 'name': obj.name,
+ 'id': obj.id,
+ 'fixture_material_code': obj.fixture_material_id.code,
+ 'fixture_model_code': obj.fixture_model_id.code,
+ 'specification_name': obj.specification_fixture_id.name,
+ 'image': '' if not obj.image else base64.b64encode(obj.image).decode('utf-8'),
+ 'number': obj.number,
+ 'usable_num': obj.usable_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)
+ r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
+ ret = r.json()
+ if ret.get('code') == 200:
+ return '夹具物料注册成功'
+ else:
+ raise UserError("没有注册夹具物料信息")
+
+ @api.model_create_multi
+ def create(self, vals_list):
+ records = super(FixtureMaterialSearch, self).create(vals_list)
+ for record in records:
+ if record:
+ record.enroll_fixture_material()
+ return records
diff --git a/sf_tool_management/models/fixture_material_search.py b/sf_tool_management/models/fixture_material_search.py
new file mode 100644
index 00000000..ea1212a9
--- /dev/null
+++ b/sf_tool_management/models/fixture_material_search.py
@@ -0,0 +1,55 @@
+from odoo import models, fields, api, SUPERUSER_ID
+
+
+class FixtureMaterialSearch(models.Model):
+ _name = 'sf.fixture.material.search'
+ _description = '夹具物料搜索'
+
+ product_id = fields.Many2one('product.product', string='夹具物料产品')
+
+ name = fields.Char('名称', related='product_id.name')
+ code = fields.Char('编码')
+ fixture_material_id = fields.Many2one('sf.fixture.material', '夹具物料',
+ related='product_id.fixture_material_id',
+ store=True,
+ group_expand='_read_group_fixture_material_id')
+ fixture_material_name = fields.Char('物料名称', related='product_id.fixture_material_id.name')
+ fixture_model_id = fields.Many2one('sf.fixture.model', '夹具型号',
+ related='product_id.fixture_model_id')
+ specification_fixture_id = fields.Many2one('sf.fixture.materials.basic.parameters', '规格',
+ related='product_id.specification_fixture_id')
+ image = fields.Binary('图片', related='product_id.image_1920')
+ number = fields.Integer('总数量', compute='_compute_number')
+ usable_num = fields.Integer('可用数量', compute='_compute_number')
+ have_been_used_num = fields.Integer('在用数量', compute='_compute_number')
+ scrap_num = fields.Integer('报废数量', compute='_compute_number')
+
+ barcode_ids = fields.One2many('stock.lot', 'fixture_material_search_id', string='序列号', readonly=True)
+
+ @api.depends('barcode_ids')
+ def _compute_number(self):
+ for record in self:
+ usable_num = 0
+ have_been_used_num = 0
+ scrap_num = 0
+ if record.barcode_ids:
+ record.number = len(record.barcode_ids)
+ for barcode_id in record.barcode_ids:
+ if barcode_id.quant_ids:
+ if barcode_id.quant_ids[-1].location_id.name not in '夹具房':
+ have_been_used_num = have_been_used_num + 1
+ else:
+ usable_num = usable_num + 1
+ record.usable_num = usable_num
+ record.have_been_used_num = have_been_used_num
+ record.scrap_num = scrap_num
+ else:
+ record.number = 0
+ record.usable_num = 0
+ record.have_been_used_num = 0
+ record.scrap_num = 0
+
+ @api.model
+ def _read_group_fixture_material_id(self, categories, domain, order):
+ fixture_material_id = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)
+ return categories.browse(fixture_material_id)
diff --git a/sf_tool_management/models/functional_tool_enroll.py b/sf_tool_management/models/functional_tool_enroll.py
new file mode 100644
index 00000000..c1687cde
--- /dev/null
+++ b/sf_tool_management/models/functional_tool_enroll.py
@@ -0,0 +1,364 @@
+import json
+import base64
+import requests
+from odoo import models, api
+from odoo.addons.sf_base.commons.common import Common
+from odoo.exceptions import UserError
+
+
+def get_suitable_machining_method_names(item):
+ suitable_machining_method_names = []
+ for suitable_machining_method_id in item.suitable_machining_method_ids:
+ if suitable_machining_method_id:
+ suitable_machining_method_names.append(suitable_machining_method_id.name)
+ return suitable_machining_method_names
+
+
+def get_cutting_direction_names(item):
+ cutting_direction_names = []
+ for cutting_direction_id in item.cutting_direction_ids:
+ if cutting_direction_id:
+ cutting_direction_names.append(cutting_direction_id.name)
+ return cutting_direction_names
+
+
+def get_suitable_coolant_names(item):
+ suitable_coolant_names = []
+ for suitable_coolant_id in item.suitable_coolant_ids:
+ if suitable_coolant_id:
+ suitable_coolant_names.append(suitable_coolant_id.name)
+ return suitable_coolant_names
+
+
+class StockLot(models.Model):
+ _inherit = 'stock.lot'
+ _description = '刀具物料序列号注册'
+
+ def enroll_tool_material_stock(self):
+ sf_sync_config = self.env['res.config.settings'].get_values()
+ token = sf_sync_config['token']
+ sf_secret_key = sf_sync_config['sf_secret_key']
+ headers = Common.get_headers(self, token, sf_secret_key)
+ str_url = sf_sync_config['sf_url'] + "/api/tool_material_stock/create"
+ objs_all = self.env['stock.lot'].search([('id', '=', self.id)])
+ tool_material_stock_list = []
+ if objs_all:
+ for item in objs_all:
+ val = {
+ 'name': item.name,
+ 'tool_material_status': item.tool_material_status,
+ 'location': [] if not item.quant_ids else item.quant_ids[-1].location_id.name,
+ 'tool_material_search_id': item.tool_material_search_id.id,
+ }
+ tool_material_stock_list.append(val)
+ kw = json.dumps(tool_material_stock_list, ensure_ascii=False)
+ r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
+ ret = r.json()
+ if ret.get('code') == 200:
+ return '刀具物料序列号注册成功'
+ else:
+ raise UserError("没有注册刀具物料序列号信息")
+
+
+class ToolMaterial(models.Model):
+ _inherit = 'sf.tool.material.search'
+ _description = '刀具物料注册'
+
+ crea_url = '/api/tool_material/create'
+
+ def enroll_tool_material(self):
+ sf_sync_config = self.env['res.config.settings'].get_values()
+ token = sf_sync_config['token']
+ sf_secret_key = sf_sync_config['sf_secret_key']
+ headers = Common.get_headers(self, token, sf_secret_key)
+ str_url = sf_sync_config['sf_url'] + self.crea_url
+ objs_all = self.search([('id', '=', self.id)])
+ tool_material_list = []
+ if objs_all:
+ for item in objs_all:
+ val = {
+ 'name': item.name,
+ 'id': item.id,
+ 'cutting_tool_material_code': item.cutting_tool_material_id.code,
+ 'cutting_tool_standard_library_code': item.cutting_tool_standard_library_id.code,
+ 'specification_name': item.specification_id.name,
+ 'image': '' if not item.image else base64.b64encode(item.image).decode('utf-8'),
+ 'number': item.number,
+ 'usable_num': item.usable_num,
+ 'have_been_used_num': item.have_been_used_num,
+ 'scrap_num': item.scrap_num
+ }
+ tool_material_list.append(val)
+ kw = json.dumps(tool_material_list, ensure_ascii=False)
+ r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
+ ret = r.json()
+ if ret.get('code') == 200:
+ return '刀具物料注册成功'
+ else:
+ raise UserError("没有注册刀具物料信息")
+
+ @api.model_create_multi
+ def create(self, vals_list):
+ records = super(ToolMaterial, self).create(vals_list)
+ for record in records:
+ if record:
+ record.enroll_tool_material()
+ return records
+
+
+class FunctionalCuttingToolEntity(models.Model):
+ _inherit = 'sf.functional.cutting.tool.entity'
+ _description = '功能刀具列表注册'
+
+ crea_url = "/api/functional_tool_entity/create"
+
+ # 注册同步功能刀具列表
+ def enroll_functional_tool_entity(self):
+ sf_sync_config = self.env['res.config.settings'].get_values()
+ token = sf_sync_config['token']
+ sf_secret_key = sf_sync_config['sf_secret_key']
+ headers = Common.get_headers(self, token, sf_secret_key)
+ str_url = sf_sync_config['sf_url'] + self.crea_url
+ objs_all = self.env['sf.functional.cutting.tool.entity'].search([('id', '=', self.id)])
+ functional_tool_list = []
+ if objs_all:
+ for item in objs_all:
+ val = {
+ 'id': item.id,
+ 'code': item.code,
+ 'name': item.name,
+ 'rfid': item.rfid,
+ 'tool_groups_name': item.tool_groups_id.name,
+ 'barcode': item.barcode_id.name,
+ 'cutting_tool_type_code': item.sf_cutting_tool_type_id.code,
+ 'functional_tool_diameter': item.functional_tool_diameter,
+ 'knife_tip_r_angle': item.knife_tip_r_angle,
+ 'coarse_middle_thin': item.coarse_middle_thin,
+ 'new_former': item.new_former,
+ 'tool_loading_length': item.tool_loading_length,
+ 'functional_tool_length': item.functional_tool_length,
+ 'effective_length': item.effective_length,
+ 'max_lifetime_value': item.max_lifetime_value,
+ 'alarm_value': item.alarm_value,
+ 'used_value': item.used_value,
+ 'functional_tool_status': item.functional_tool_status,
+ 'current_location': item.current_location,
+ 'image': '' if not item.image else base64.b64encode(item.image).decode('utf-8'),
+ 'whether_standard_knife': item.whether_standard_knife,
+ 'L_D_number': item.L_D_number,
+ 'hiding_length': item.hiding_length,
+ 'cut_time': item.cut_time,
+ 'cut_length': item.cut_length,
+ 'cut_number': item.cut_number,
+ 'cutting_tool_integral_model_id': item.cutting_tool_integral_model_id.tool_material_id,
+ 'cutting_tool_blade_model_id': item.cutting_tool_blade_model_id.tool_material_id,
+ 'cutting_tool_cutterbar_model_id': item.cutting_tool_cutterbar_model_id.tool_material_id,
+ 'cutting_tool_cutterpad_model_id': item.cutting_tool_cutterpad_model_id.tool_material_id,
+ 'cutting_tool_cutterhandle_model_id': item.cutting_tool_cutterhandle_model_id.tool_material_id,
+ 'cutting_tool_cutterhead_model_id': item.cutting_tool_cutterhead_model_id.tool_material_id,
+ 'suitable_machining_method_names': get_suitable_machining_method_names(item),
+ 'blade_tip_characteristics_name': item.blade_tip_characteristics_id.name,
+ 'handle_type_name': item.handle_type_id.name,
+ 'cutting_direction_names': get_cutting_direction_names(item),
+ 'suitable_coolant_names': get_suitable_coolant_names(item),
+ 'active': item.active,
+ }
+ functional_tool_list.append(val)
+ kw = json.dumps(functional_tool_list, ensure_ascii=False)
+ r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
+ ret = r.json()
+ if ret.get('code') == 200:
+ return "功能刀具注册成功"
+ else:
+ raise UserError("没有注册功能刀具信息")
+
+ @api.model_create_multi
+ def create(self, vals_list):
+ records = super(FunctionalCuttingToolEntity, self).create(vals_list)
+ for record in records:
+ if record:
+ record.enroll_functional_tool_entity()
+ return records
+
+ def write(self, vals):
+ res = super().write(vals)
+ if vals.get('current_location'):
+ self.enroll_functional_tool_entity()
+ return res
+
+
+class FunctionalToolWarning(models.Model):
+ _inherit = 'sf.functional.tool.warning'
+ _description = '功能刀具预警注册'
+
+ crea_url = "/api/functional_tool_warning/create"
+
+ # 注册同步功能刀具预警
+ def enroll_functional_tool_warning(self):
+ sf_sync_config = self.env['res.config.settings'].get_values()
+ token = sf_sync_config['token']
+ sf_secret_key = sf_sync_config['sf_secret_key']
+ headers = Common.get_headers(self, token, sf_secret_key)
+ str_url = sf_sync_config['sf_url'] + self.crea_url
+ objs_all = self.env['sf.functional.tool.warning'].search([('id', '=', self.id)])
+ tool_warning_list = []
+ if objs_all:
+ for item in objs_all:
+ val = {
+ 'id': item.id,
+ 'name': item.name,
+ 'code': item.code,
+ 'rfid': item.rfid,
+ 'tool_groups_name': item.tool_groups_id.name,
+ 'production_line': item.production_line_id.name,
+ 'machine_tool_id': item.maintenance_equipment_id.code,
+ 'machine_tool_code': item.machine_tool_code,
+ 'cutter_spacing_code': item.cutter_spacing_code_id.code,
+ 'functional_tool_name': item.name,
+ 'barcode': item.barcode_id.name,
+ 'mrs_cutting_tool_type_code': item.mrs_cutting_tool_type_id.code,
+ 'diameter': item.diameter,
+ 'knife_tip_r_angle': item.knife_tip_r_angle,
+ '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'),
+ 'max_lifetime_value': item.max_lifetime_value,
+ 'alarm_value': item.alarm_value,
+ 'used_value': item.used_value,
+ 'functional_tool_status': item.functional_tool_status,
+ 'alarm_time': item.alarm_time.strftime('%Y-%m-%d %H:%M:%S'),
+ 'dispose_user': item.dispose_user,
+ 'dispose_time': item.dispose_time,
+ 'dispose_func': item.dispose_func,
+ }
+ tool_warning_list.append(val)
+ kw = json.dumps(tool_warning_list, ensure_ascii=False)
+ r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
+ ret = r.json()
+ if ret.get('code') == 200:
+ return "功能刀具预警注册成功"
+ else:
+ raise UserError("没有注册功能刀具预警信息")
+
+ @api.model_create_multi
+ def create(self, vals_list):
+ records = super(FunctionalToolWarning, self).create(vals_list)
+ for record in records:
+ if record:
+ record.enroll_functional_tool_warning()
+ return records
+
+
+class StockMoveLine(models.Model):
+ _inherit = 'stock.move.line'
+ _description = '功能刀具出入库记录注册'
+
+ crea_url = "/api/functional_tool_move/create"
+
+ # 注册同步功能刀具出入库记录
+ def enroll_functional_tool_move(self):
+ sf_sync_config = self.env['res.config.settings'].get_values()
+ token = sf_sync_config['token']
+ sf_secret_key = sf_sync_config['sf_secret_key']
+ headers = Common.get_headers(self, token, sf_secret_key)
+ 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)])
+ tool_stock_list = []
+ if objs_all:
+ for item in objs_all:
+ val = {
+ 'id': item.id,
+ 'name': item.functional_tool_name,
+ 'code': item.code,
+ 'rfid': item.rfid,
+ 'tool_groups_name': item.tool_groups_id.name,
+ 'reference': item.reference,
+ 'barcode': item.lot_id.name,
+ 'functional_tool_type_code': item.functional_tool_type_id.code,
+ 'diameter': item.diameter,
+ 'knife_tip_r_angle': item.knife_tip_r_angle,
+ 'install_tool_time': item.install_tool_time.strftime('%Y-%m-%d %H:%M:%S'),
+ 'location_id': item.location_id.name,
+ 'location_dest_name': item.location_dest_id.name,
+ 'date': item.date.strftime('%Y-%m-%d %H:%M:%S'),
+ 'qty_done': item.qty_done,
+ }
+ tool_stock_list.append(val)
+ kw = json.dumps(tool_stock_list, ensure_ascii=False)
+ r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
+ ret = r.json()
+ if ret.get('code') == 200:
+ return "功能刀具出入库记录注册成功"
+ else:
+ raise UserError("没有注册功能刀具出入库记录信息")
+
+ @api.model_create_multi
+ def create(self, vals_list):
+ records = super(StockMoveLine, self).create(vals_list)
+ for record in records:
+ if record.functional_tool_name_id:
+ record.enroll_functional_tool_move()
+ return records
+
+
+class RealTimeDistributionFunctionalTools(models.Model):
+ _inherit = 'sf.real.time.distribution.of.functional.tools'
+ _description = '功能刀具安全库存注册'
+
+ crea_url = "/api/functional_tool_distribution/create"
+
+ # 注册同步功能刀具预警
+ def enroll_functional_tool_real_time_distribution(self):
+ sf_sync_config = self.env['res.config.settings'].get_values()
+ token = sf_sync_config['token']
+ sf_secret_key = sf_sync_config['sf_secret_key']
+ headers = Common.get_headers(self, token, sf_secret_key)
+ 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)])
+ tool_distribution_list = []
+ if objs_all:
+ for item in objs_all:
+ functional_tool_codes = []
+ for obj in item.sf_functional_cutting_tool_entity_ids:
+ functional_tool_codes.append(obj.code)
+ val = {
+ 'id': item.id,
+ 'name': item.name,
+ 'tool_groups_name': item.tool_groups_id.name,
+ 'cutting_tool_type_code': item.sf_cutting_tool_type_id.code,
+ 'diameter': item.diameter,
+ 'knife_tip_r_angle': item.knife_tip_r_angle,
+ 'tool_stock_num': item.tool_stock_num,
+ 'side_shelf_num': item.side_shelf_num,
+ 'on_tool_stock_num': item.on_tool_stock_num,
+ 'tool_stock_total': item.tool_stock_total,
+ 'min_stock_num': item.min_stock_num,
+ 'max_stock_num': item.max_stock_num,
+ 'batch_replenishment_num': item.batch_replenishment_num,
+ 'unit': item.unit,
+ 'image': '' if not item.image else base64.b64encode(item.image).decode('utf-8'),
+ 'functional_tool_codes': str(functional_tool_codes),
+ 'coarse_middle_thin': item.coarse_middle_thin,
+ 'whether_standard_knife': item.whether_standard_knife,
+ 'suitable_machining_method_names': get_suitable_machining_method_names(item),
+ 'blade_tip_characteristics_name': item.blade_tip_characteristics_id.name,
+ 'handle_type_name': item.handle_type_id.name,
+ 'cutting_direction_names': get_cutting_direction_names(item),
+ 'suitable_coolant_names': get_suitable_coolant_names(item),
+ 'active': item.active
+ }
+ tool_distribution_list.append(val)
+ kw = json.dumps(tool_distribution_list, ensure_ascii=False)
+ r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
+ ret = r.json()
+ if ret.get('code') == 200:
+ return "功能刀具出入库记录注册成功"
+ else:
+ raise UserError("没有注册功能刀具出入库记录信息")
+
+ @api.model_create_multi
+ def create(self, vals_list):
+ records = super(RealTimeDistributionFunctionalTools, self).create(vals_list)
+ for record in records:
+ if record:
+ record.enroll_functional_tool_real_time_distribution()
+ return records
diff --git a/sf_tool_management/models/maintenance_equipment.py b/sf_tool_management/models/maintenance_equipment.py
index 467989b7..d39dc685 100644
--- a/sf_tool_management/models/maintenance_equipment.py
+++ b/sf_tool_management/models/maintenance_equipment.py
@@ -97,17 +97,29 @@ class StockLot(models.Model):
_inherit = 'stock.lot'
tool_material_search_id = fields.Many2one('sf.tool.material.search', string='刀具物料搜索')
- tool_material_status = fields.Selection([('可用', '可用'), ('在用', '在用'), ('报废', '报废')], string='状态',
- compute='_compute_tool_material_status')
+ fixture_material_search_id = fields.Many2one('sf.fixture.material.search', string='夹具物料搜索')
+ tool_material_status = fields.Selection(
+ [('未入库', '未入库'), ('可用', '可用'), ('在用', '在用'), ('报废', '报废')], string='状态',
+ compute='_compute_tool_material_status', store=True)
@api.depends('quant_ids')
def _compute_tool_material_status(self):
for record in self:
if record:
- if record.quant_ids[-1].location_id.name == '刀具组装位置':
- record.tool_material_status = '在用'
- else:
- record.tool_material_status = '可用'
+ if record.product_id.categ_id.name in ['刀具', '夹具']:
+ if record.quant_ids:
+ if record.quant_ids[-1].location_id.name in ['刀具房', '夹具房']:
+ record.tool_material_status = '可用'
+ elif record.quant_ids[-1].location_id.name == '刀具组装位置':
+ record.tool_material_status = '在用'
+ else:
+ record.tool_material_status = '未入库'
+ if record.tool_material_search_id:
+ # 注册刀具物料状态到cloud平台
+ record.enroll_tool_material_stock()
+ elif record.fixture_material_search_id:
+ # 注册夹具物料状态到cloud平台
+ record.enroll_fixture_material_stock()
@api.model
def name_search(self, name='', args=None, operator='ilike', limit=100):
@@ -136,23 +148,37 @@ class StockLot(models.Model):
for record in records:
if record.product_id.categ_id.name == '刀具':
tool_material_search = self.env['sf.tool.material.search'].sudo().search(
- [('cutting_tool_material_id', '=', record.product_id.cutting_tool_material_id.id),
- ('cutting_tool_standard_library_id', '=', record.product_id.cutting_tool_model_id.id),
- ('specification_id', '=', record.product_id.specification_id.id)])
+ [('id', '=', record.product_id.tool_material_id)])
if tool_material_search:
- record.tool_material_search_id = tool_material_search
+ record.tool_material_status = '未入库'
+ record.tool_material_search_id = tool_material_search.id
+ elif record.product_id.categ_id.name == '夹具':
+ fixture_material_search = self.env['sf.fixture.material.search'].sudo().search(
+ [('id', '=', record.product_id.fixture_material_search_id)])
+ if fixture_material_search:
+ record.tool_material_status = '未入库'
+ record.fixture_material_search_id = fixture_material_search.id
return records
class ProductProduct(models.Model):
_inherit = 'product.product'
+ tool_material_id = fields.Char('刀具物料搜索模型ID')
+ fixture_material_search_id = fields.Char('夹具物料搜索模型ID')
+
@api.model_create_multi
def create(self, vals_list):
records = super(ProductProduct, self).create(vals_list)
for record in records:
if record.categ_id.name == '刀具':
- self.env['sf.tool.material.search'].sudo().create({
+ tool_material = self.env['sf.tool.material.search'].sudo().create({
'product_id': record.id
})
+ record.tool_material_id = tool_material.id
+ elif record.categ_id.name == '夹具':
+ fixture_material = self.env['sf.fixture.material.search'].sudo().create({
+ 'product_id': record.id
+ })
+ record.fixture_material_search_id = fixture_material.id
return records
diff --git a/sf_tool_management/models/tool_material_search.py b/sf_tool_management/models/tool_material_search.py
index d62a4b5f..75fc02e0 100644
--- a/sf_tool_management/models/tool_material_search.py
+++ b/sf_tool_management/models/tool_material_search.py
@@ -2,308 +2,6 @@
from odoo import fields, models, api, SUPERUSER_ID
-# from odoo.exceptions import ValidationError
-
-
-# 刀具物料搜索（待删除）
-class SfToolMaterialSearch(models.Model):
- _name = 'sf.tool.material.search'
- _description = '刀具物料搜索'
-
- sequence = fields.Integer('序号')
- code = fields.Char('编码')
- name = fields.Char('名称', required=True)
- # 关联刀具类型
- mrs_cutting_tool_type_id = fields.Many2one(
- 'sf.cutting.tool.type', '刀具类型',
- domain="[('cutting_tool_material_id.name', '=', cutting_tool_material_name)]", required=True)
- # 关联刀具物料名称
- mrs_cutting_tool_material_name = fields.Char(related='mrs_cutting_tool_material_id.name', string='刀具物料名称',
- store=True)
- cutting_tool_type = fields.Char(related='mrs_cutting_tool_material_id.name', string='刀具物料类型', store=True)
- mrs_machine_brand_id = fields.Many2one('sf.machine.brand', '品牌', required=True,
- domain="[('tag_ids.name', 'ilike', '刀具')]")
- # 关联刀具型号
- # mrs_cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', '刀具型号')
-
- # 关联刀具物料模型
- mrs_cutting_tool_material_id = fields.Many2one('sf.cutting.tool.material', '刀具物料',
- group_expand='_read_group_mrs_cutting_tool_material_ids',
- required=True)
- cutting_tool_material_name = fields.Char(string='物料名称', invisible=True)
-
- @api.onchange('mrs_cutting_tool_material_id')
- def _onchange_mrs_cutting_tool_material_id(self):
- for record in self:
- if record:
- record.cutting_tool_material_name = record.mrs_cutting_tool_material_id.name
-
- @api.model
- def _read_group_mrs_cutting_tool_material_ids(self, categories, domain, order):
- mrs_cutting_tool_material_ids = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)
- return categories.browse(mrs_cutting_tool_material_ids)
-
- # 刀片特有字段
- blade_code = fields.Char('刀片编码', readonly=True)
- blade_length = fields.Float('刀片长度L(mm)')
- blade_width = fields.Float('刀片宽度D(mm)')
- blade_height = fields.Float('刀片高度T(mm)')
- blade_top_angle = fields.Float('刀片顶角(°)')
- blade_front_angle = fields.Float('刀片前角(°)')
- blade_rear_angle = fields.Float('刀片后角(°)')
- blade_main_included_angle = fields.Float('刀片主偏角(°)')
- blade_r_angle = fields.Float('刀片R角(°)')
- blade_hardness = fields.Integer('刀片加工硬度')
- blade_accuracy = fields.Char('刀片精度等级')
- blade_coating_material_id = fields.Char('刀片涂层材质')
- blade_radius = fields.Float('刀片刀尖半径(mm)')
- blade_nut = fields.Float('刀片配对螺母(mm)')
- mrs_cutting_tool_model_blade_cutter_bar_ids = fields.Many2many(
- 'sf.cutting_tool.standard.library',
- relation='sf_tool_material_search_blade_cutter_bar_rel',
- column1='model_id_1',
- column2='model_id_2',
- domain="[('cutting_tool_type', '=', '刀杆')]",
- string='适用刀杆型号',
- default=lambda self: [], # 使用空列表作为默认值
- )
- mrs_cutting_tool_model_blade_cutter_pad_ids = fields.Many2many(
- 'sf.cutting_tool.standard.library',
- relation='sf_tool_material_search_blade_cutter_pad_rel',
- column1='model_id_1',
- column2='model_id_2',
- domain="[('cutting_tool_type', '=', '刀盘')]",
- string='适用刀盘型号',
- default=lambda self: [], # 使用空列表作为默认值
- )
-
- # 整体式刀具特有字段
- integral_code = fields.Char('整体式刀具编码', readonly=True)
- integral_total_length = fields.Float('整体式刀具总长度(mm)', digits=(6, 1))
- integral_shank_length = fields.Float('整体式刀具柄部长度(mm)', digits=(6, 1))
- integral_blade_length = fields.Float('整体式刀具刃部长度(mm)', digits=(6, 1))
- integral_neck_length = fields.Float('整体式刀具颈部长度(mm)', digits=(6, 1))
- integral_shank_diameter = fields.Float('整体式刀具柄部直径(mm)', digits=(6, 1))
- integral_blade_diameter = fields.Float('整体式刀具刃部直径(mm)', digits=(6, 1))
- integral_neck_diameter = fields.Float('整体式刀具颈部直径(mm)', digits=(6, 1))
- integral_blade_number = fields.Integer('整体式刀具刃数(个)')
- integral_blade_tip_diameter = fields.Float('整体式刀具刀尖直径(mm)', digits=(6, 1))
- integral_blade_tip_taper = fields.Float('整体式刀具刀尖锥度(°)', digits=(6, 1))
- integral_blade_helix_angle = fields.Float('整体式刀具刃部螺旋角(°)', digits=(6, 1))
- integral_blade_type = fields.Char('整体式刀具刃部类型')
- integral_coarse_medium_fine = fields.Selection([('粗', '粗'), ('中', '中'), ('精', '精')], '整体式刀具粗/中/精')
- # integral_blade_material = fields.Selection([('碳素钢', '碳素钢'), ('硬质合金', '硬质合金')], '整体式刀具刀具材质')
- integral_hardness = fields.Integer('整体式刀具硬度(HRC)')
- integral_coating_material = fields.Char('整体式刀具涂层材质')
- integral_run_out_accuracy_max = fields.Float('整体式刀具端跳精度max', digits=(6, 1))
- integral_run_out_accuracy_min = fields.Float('整体式刀具端跳精度min', digits=(6, 1))
-
- suitable_machining_method_ids = fields.Many2many('maintenance.equipment.image',
- 'rel_machining_product_template_material_search', '适合加工方式',
- domain=[('type', '=', '加工能力')])
- blade_tip_characteristics_id = fields.Many2one('maintenance.equipment.image', '刀尖特征',
- domain=[('type', '=', '刀尖特征')])
- handle_type_id = fields.Many2one('maintenance.equipment.image', '柄部类型', domain=[('type', '=', '柄部类型')])
- cutting_direction_ids = fields.Many2many('maintenance.equipment.image',
- 'rel_cutting_product_template_material_search', '走刀方向',
- domain=[('type', '=', '走刀方向')])
- suitable_coolant_ids = fields.Many2many('maintenance.equipment.image',
- 'rel_coolants_product_template_material_search', '适合冷却方式',
- domain=[('type', '=', '冷却方式')])
-
- cutting_speed_ids = fields.Many2many('sf.cutting.speed', string='切削速度Vc')
- feed_per_tooth_ids = fields.Many2many('sf.feed.per.tooth', 'rel_feed_per_tooth_ids', '每齿走刀量fz')
-
- # @api.constrains('suitable_machining_method_ids')
- # def _check_suitable_machining_method_ids(self):
- # for record in self:
- # if len(record.suitable_machining_method_ids) == 0 and self.cutting_tool_type == '整体式刀具':
- # raise ValidationError("适合加工方式不能为空!")
- #
- # @api.constrains('blade_tip_characteristics_ids')
- # def _check_blade_tip_characteristics_ids(self):
- # for record in self:
- # if len(record.blade_tip_characteristics_ids) == 0 and self.cutting_tool_type == '整体式刀具':
- # raise ValidationError("刀尖特征不能为空!")
- # if len(record.blade_tip_characteristics_ids) > 1 and self.cutting_tool_type == '整体式刀具':
- # raise ValidationError("刀尖特征只能单选!")
- #
- # @api.constrains('handle_type_ids')
- # def _check_handle_type_ids(self):
- # for record in self:
- # if len(record.handle_type_ids) == 0 and self.cutting_tool_type == '整体式刀具':
- # raise ValidationError("柄部类型不能为空!")
- # if len(record.handle_type_ids) > 1 and self.cutting_tool_type == '整体式刀具':
- # raise ValidationError("柄部类型只能单选!")
- #
- # @api.constrains('cutting_direction_ids')
- # def _check_cutting_direction_ids(self):
- # for record in self:
- # if len(record.cutting_direction_ids) == 0 and self.cutting_tool_type == '整体式刀具':
- # raise ValidationError("走刀方向不能为空!")
- #
- # @api.constrains('suitable_coolant_ids')
- # def _check_suitable_coolant_ids(self):
- # for record in self:
- # if not record.suitable_coolant_ids and self.cutting_tool_type == '整体式刀具':
- # raise ValidationError("适合冷却液不能为空!")
- #
- # @api.constrains('integral_total_length')
- # def _check_integral_total_length(self):
- # if self.integral_total_length <= 0 and self.cutting_tool_type == '整体式刀具':
- # raise ValidationError("总长度不能为0")
- #
- # @api.constrains('integral_shank_length')
- # def _check_integral_shank_length(self):
- # if self.integral_shank_length <= 0 and self.cutting_tool_type == '整体式刀具':
- # raise ValidationError("柄部长度不能为0")
- #
- # @api.constrains('integral_blade_length')
- # def _check_integral_blade_length(self):
- # if self.integral_blade_length <= 0 and self.cutting_tool_type == '整体式刀具':
- # raise ValidationError("刃部长度不能为0")
- #
- # @api.constrains('integral_blade_number')
- # def _check_integral_blade_number(self):
- # if self.integral_blade_number <= 0 and self.cutting_tool_type == '整体式刀具':
- # raise ValidationError("刃数不能为0")
- #
- # @api.constrains('integral_shank_diameter')
- # def _check_integral_shank_diameter(self):
- # if self.integral_shank_diameter <= 0 and self.cutting_tool_type == '整体式刀具':
- # raise ValidationError("柄部直径不能为0")
- #
- # @api.constrains('integral_blade_diameter')
- # def _check_integral_blade_diameter(self):
- # if self.integral_blade_diameter <= 0 and self.cutting_tool_type == '整体式刀具':
- # raise ValidationError("刃部直径不能为0")
- #
- # @api.constrains('integral_run_out_accuracy_min')
- # def _check_integral_blade_diameter(self):
- # if self.integral_run_out_accuracy_min <= 0 and self.cutting_tool_type == '整体式刀具':
- # raise ValidationError("端跳精度最小(min)不能为0")
- #
- # @api.constrains('integral_run_out_accuracy_max')
- # def _check_integral_run_out_accuracy_max(self):
- # if self.integral_run_out_accuracy_max <= 0 and self.cutting_tool_type == '整体式刀具':
- # raise ValidationError("端跳精度最大(max)不能为0")
-
- # integral_front_angle = fields.Float('整体式刀具前角(°)')
- # integral_rear_angle = fields.Float('整体式刀具后角(°)')
- # integral_main_included_angle = fields.Float('整体式刀具主偏角(°)')
- # integral_accuracy = fields.Float('整体式刀具精度等级')
- # integral_hardness = fields.Float('整体式刀具加工硬度(HRC)')
- # integral_coating_material = fields.Char('整体式刀具涂层材质')
- # integral_nut = fields.Float('整体式刀具配对螺母(mm)')
- # integral_scope = fields.Char('整体式刀具适用范围')
-
- # 刀杆特有字段
- bar_code = fields.Char('刀杆编码', readonly=True)
- # bar_name = fields.Char('刀杆名称', required=True)
- bar_c_diameter = fields.Float('刀杆C柄径(mm)')
- bar_total_length = fields.Float('刀杆L总长(mm)')
- bar_blade_number = fields.Integer('刀杆刃数')
- bar_d_diameter = fields.Float('刀杆D刃径(mm)')
- mrs_cutting_tool_model_bar_blade_ids = fields.Many2many(
- 'sf.cutting_tool.standard.library',
- relation='sf_tool_material_search_bar_blade_rel',
- column1='model_id_1',
- column2='model_id_2',
- domain="[('cutting_tool_type', '=', '刀片')]",
- string='刀杆适用刀片型号'
- )
- bar_wrench = fields.Float('刀杆配对扳手(mm)')
- bar_screw = fields.Float('刀杆配备螺丝(mm)')
- bar_radius = fields.Float('刀杆刀尖圆角半径')
- bar_accuracy = fields.Char('刀杆精度等级')
- bar_hardness = fields.Integer('刀杆硬度(°)')
- bar_scope = fields.Char('刀杆适用范围')
-
- # 刀盘特有字段
- pad_code = fields.Char('刀盘编码', readonly=True)
- # pad_name = fields.Char('刀盘名称', required=True)
- pad_c_diameter = fields.Float('刀盘C柄径(mm)')
- pad_total_length = fields.Float('刀盘L总长(mm)')
- pad_blade_number = fields.Integer('刀盘刃数')
- pad_d_diameter = fields.Float('刀盘D刃径(mm)')
- mrs_cutting_tool_model_pad_blade_ids = fields.Many2many(
- 'sf.cutting_tool.standard.library',
- relation='sf_tool_material_search_pad_blade_rel',
- column1='model_id_1',
- column2='model_id_2',
- domain="[('cutting_tool_type', '=', '刀片')]",
- string='刀盘适用刀片型号'
- )
- pad_wrench = fields.Float('刀盘配对扳手(mm)')
- pad_screw = fields.Float('刀盘配备螺丝(mm)')
- pad_radius = fields.Float('刀盘刀尖圆角半径')
- pad_accuracy = fields.Char('刀盘精度等级')
- pad_hardness = fields.Integer('刀盘硬度(°)')
- pad_scope = fields.Char('刀盘适用范围')
-
- # 刀柄特有字段
- handle_code = fields.Char('刀柄编码', readonly=True)
- # 柄长L(mm)、法兰柄长L1(mm)、法兰直径D1(mm)
- handle_length = fields.Float('刀柄柄长L(mm)')
- handle_diameter = fields.Float('刀柄直径D(mm)')
- handle_flange_length = fields.Float('刀柄法兰柄长L1(mm)')
- handle_flange_diameter = fields.Float('刀柄法兰直径D1(mm)')
- # 夹持直径min、夹持直径max、径跳精度、最大转速n/min、3D模型图
- handle_clamping_diameter_min = fields.Float('刀柄夹持直径min')
- handle_clamping_diameter_max = fields.Float('刀柄夹持直径max')
- handle_jump_accuracy = fields.Float('刀柄径跳精度')
- handle_max_speed = fields.Float('刀柄最大转速n/min')
- handle_weight = fields.Float('刀柄重量(kg)')
- handle_body_accuracy = fields.Float('刀柄本体精度(mm)')
- handle_nut = fields.Float('刀柄配对螺母(mm)')
- mrs_cutting_tool_model_handle_chuck_model_ids = fields.Many2many(
- 'sf.cutting_tool.standard.library',
- relation='sf_tool_material_search_handle_chuck_rel',
- column1='model_id_1',
- column2='model_id_2',
- domain="[('cutting_tool_type', '=', '夹头')]",
- string='适用夹头型号'
- )
- handle_clamping_range = fields.Float('刀柄夹持范围(mm)')
- handle_detection_accuracy = fields.Float('刀柄检测精度')
- handle_detection_hardness = fields.Integer('刀柄检测硬度')
- handle_standard_speed = fields.Float('刀柄标准转速')
-
- # 夹头特有字段
- chuck_code = fields.Char('夹头编码', readonly=True)
- # chuck_name = fields.Char('夹头名称', required=True)
- chuck_accuracy = fields.Float('夹头精度(mm)')
- # 夹持直径min、夹持直径max、3D模型图
- chuck_clamping_diameter_min = fields.Float('夹头夹持直径min(mm)')
- chuck_clamping_diameter_max = fields.Float('夹头夹持直径max(mm)')
- chuck_diameter = fields.Float('夹头外径(mm)')
- chuck_inner_diameter = fields.Float('夹头内径(mm)')
- chuck_height = fields.Float('夹头高度(mm)')
- chuck_nut = fields.Float('夹头配对螺母(mm)')
- mrs_cutting_tool_model_chuck_handle_model_ids = fields.Many2many(
- 'sf.cutting_tool.standard.library',
- relation='sf_tool_material_search_chuck_handle_rel',
- column1='model_id_1',
- column2='model_id_2',
- domain="[('cutting_tool_type', '=', '刀柄')]",
- string='适用刀柄型号'
- )
- chuck_clamping_range = fields.Float('夹头夹持范围(mm)')
- chuck_feature = fields.Char('夹头特性')
- image = fields.Binary('夹头图片')
-
- # 数量、采购入库日期、采购批次、供应商、仓库名称、库区、库位、3D模型
- number = fields.Integer('数量')
- mrs_materials_model_id = fields.Many2one('sf.materials.model', '材料型号')
- purchase_date = fields.Date('采购入库日期')
- purchase_batch = fields.Char('采购批次')
- supplier = fields.Char('供应商')
- warehouse_name = fields.Char('仓库名称')
- warehouse_area = fields.Char('库区')
- warehouse_location = fields.Char('库位')
- three_d_model = fields.Many2one('ir.attachment', '3D模型')
-
-
class ToolMaterial(models.Model):
_name = 'sf.tool.material.search'
_description = '刀具物料搜索'
@@ -311,6 +9,7 @@ class ToolMaterial(models.Model):
product_id = fields.Many2one('product.product', string='刀具物料产品')
name = fields.Char('名称', related='product_id.name')
+ code = fields.Char('编码')
cutting_tool_material_id = fields.Many2one('sf.cutting.tool.material', '刀具物料',
related='product_id.cutting_tool_material_id',
store=True,
@@ -328,8 +27,6 @@ class ToolMaterial(models.Model):
barcode_ids = fields.One2many('stock.lot', 'tool_material_search_id', string='序列号', readonly=True)
- active = fields.Boolean(string='已归档', default=True)
-
@api.depends('barcode_ids')
def _compute_number(self):
for record in self:
diff --git a/sf_tool_management/security/ir.model.access.csv b/sf_tool_management/security/ir.model.access.csv
index 6df54c0b..35217493 100644
--- a/sf_tool_management/security/ir.model.access.csv
+++ b/sf_tool_management/security/ir.model.access.csv
@@ -13,6 +13,7 @@ access_sf_tool_transfer_request_information,sf.tool.transfer.request.information
access_sf_functional_tool_assembly,sf.functional.tool.assembly,model_sf_functional_tool_assembly,sf_base.group_sf_tool_user,1,1,1,0
access_sf_functional_tool_assembly_order,sf.functional.tool.assembly.order,model_sf_functional_tool_assembly_order,sf_base.group_sf_tool_user,1,1,1,0
access_sf_tool_material_search,sf.tool.material.search,model_sf_tool_material_search,sf_base.group_sf_tool_user,1,1,1,0
+access_sf_fixture_material_search,sf.fixture.material.search,model_sf_fixture_material_search,sf_base.group_sf_tool_user,1,1,1,0
access_sf_functional_cutting_tool_entity_group_plan_dispatch,sf.functional.cutting.tool.entity,model_sf_functional_cutting_tool_entity,sf_base.group_plan_dispatch,1,0,0,0
@@ -29,3 +30,4 @@ access_sf_tool_transfer_request_information_group_plan_dispatch,sf.tool.transfer
access_sf_functional_tool_assembly_group_plan_dispatch,sf.functional.tool.assembly,model_sf_functional_tool_assembly,sf_base.group_plan_dispatch,1,0,0,0
access_sf_functional_tool_assembly_order_group_plan_dispatch,sf.functional.tool.assembly.order,model_sf_functional_tool_assembly_order,sf_base.group_plan_dispatch,1,0,0,0
access_sf_tool_material_search_group_plan_dispatch,sf.tool.material.search,model_sf_tool_material_search,sf_base.group_plan_dispatch,1,0,0,0
+access_sf_fixture_material_search_group_plan_dispatch,sf.fixture.material.search,model_sf_fixture_material_search,sf_base.group_plan_dispatch,1,0,0,0
diff --git a/sf_tool_management/views/fixture_material_search_views.xml b/sf_tool_management/views/fixture_material_search_views.xml
new file mode 100644
index 00000000..f70eba36
--- /dev/null
+++ b/sf_tool_management/views/fixture_material_search_views.xml
@@ -0,0 +1,105 @@
+
+
+
+ sf.fixture.material.search.tree
+ sf.fixture.material.search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ sf.fixture.material.search.form
+ sf.fixture.material.search
+
+
+
+
+
+
+ sf.fixture.material.search.search
+ sf.fixture.material.search
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 夹具物料查询
+ ir.actions.act_window
+ sf.fixture.material.search
+ tree,form
+
+
+
+
\ No newline at end of file
diff --git a/sf_tool_management/views/menu_view.xml b/sf_tool_management/views/menu_view.xml
index c1fc939b..ea2e0fbd 100644
--- a/sf_tool_management/views/menu_view.xml
+++ b/sf_tool_management/views/menu_view.xml
@@ -10,8 +10,8 @@
@@ -34,7 +34,7 @@