days
@@ -1188,7 +1188,7 @@
-
+
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/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_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..d1ac4e7f 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)]
@@ -350,30 +370,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')
diff --git a/sf_manufacturing/security/ir.model.access.csv b/sf_manufacturing/security/ir.model.access.csv
index 5f3f37d8..a9e92aaf 100644
--- a/sf_manufacturing/security/ir.model.access.csv
+++ b/sf_manufacturing/security/ir.model.access.csv
@@ -108,9 +108,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_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index ca04dd4d..308ba2f1 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -542,7 +542,7 @@
+