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

优化agv相关页面及对应接口

Browse Source
This commit is contained in:
jinling.yang
2024-04-22 22:30:05 +08:00
parent b526565ac4
commit 9a157125ba
20 changed files with 213 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sf_manufacturing/models/__init__.py
View File

@@ -8,3 +8,4 @@ from . import mrp_routing_workcenter
from . import stock
from . import res_user
from . import production_line_base
from . import agv_setting

35
sf_manufacturing/models/agv_setting.py Normal file
View File

@@ -0,0 +1,35 @@
# -*- coding: utf-8 -*-
from odoo import fields, models
class AgvSetting(models.Model):
_name = 'sf.agv.site'
_description = 'agv站点'
number = fields.Integer('序号')
name = fields.Char('位置编号')
owning_region = fields.Char('所属区域')
state = fields.Selection([
('占用', '占用'),
('空闲', '空闲')], string='状态')
divide_the_work = fields.Char('主要分工')
class AgvTaskRoute(models.Model):
_name = 'sf.agv.task.route'
_description = 'agv任务路线'
name = fields.Char('名称')
type = fields.Selection([
('F01', '搬运'), ], string='类型', default="F01")
start_site_id = fields.Many2one('sf.agv.site', '起点接驳站位置编号')
end_site_id = fields.Many2one('sf.agv.site', '终点接驳站位置编号')
destination_production_line_id = fields.Many2one('sf.production.line', '目的生产线')
priority = fields.Selection([
('0', '正常'),
('1', '低'),
('2', '中'),
('3', '高'),
('4', '紧急'),
], string='优先级', default='0')
active = fields.Boolean('有效', default=True)

67
sf_manufacturing/models/mrp_workorder.py
View File

@@ -397,8 +397,8 @@ class ResMrpWorkOrder(models.Model):
def button_workpiece_delivery(self):
if self.routing_type == '装夹预调':
for item in self.workpiece_delivery_ids:
if not item.feeder_station_start:
raise UserError('【工件配送】明细中请输入起点接驳站')
if not item.route_id:
raise UserError('【工件配送】明细中请选择【任务路线】')
# if not item.workpiece_code:
# raise UserError('请对【同运工件】进行扫描')
else:
@@ -1079,8 +1079,9 @@ class WorkPieceDelivery(models.Model):
store=True)
plan_start_processing_time = fields.Datetime('计划开始加工时间', readonly=True)
workpiece_code = fields.Char('同运工件编码')
feeder_station_start = fields.Char('起点接驳站')
feeder_station_destination = fields.Char('目的接驳站')
route_id = fields.Many2one('sf.agv.task.route', '任务路线')
feeder_station_start_id = fields.Many2one('sf.agv.site', '起点接驳站')
feeder_station_destination_id = fields.Many2one('sf.agv.site', '目的接驳站')
task_delivery_time = fields.Datetime('任务下发时间')
task_completion_time = fields.Datetime('任务完成时间')
delivery_duration = fields.Float('配送时长', compute='_compute_delivery_duration')
@@ -1092,41 +1093,49 @@ class WorkPieceDelivery(models.Model):
string='上/下产线', default='待上产线')
cnc_program_down_state = fields.Selection([('待下发', '待下发'), ('已下发', '已下发')],
string='CNC程序下发状态', default='待下发')
agv_task_code = fields.Char('agv任务单号')
@api.onchange('route_id')
def onchage_route(self):
if self.route_id:
self.feeder_station_start_id = self.route_id.start_site_id
self.feeder_station_destination_id = self.route_id.end_site_id
# 工件配送
def button_delivery(self):
if self.cnc_program_down_state == '待下发':
if self.status == '待下发':
return {
'name': _('确认'),
'type': 'ir.actions.act_window',
'view_mode': 'form',
'res_model': 'sf.workpiece.delivery.wizard',
'target': 'new',
'context': {
'default_delivery_id': self.id,
}}
if self.route_id:
if self.status == '待下发':
return {
'name': _('确认'),
'type': 'ir.actions.act_window',
'view_mode': 'form',
'res_model': 'sf.workpiece.delivery.wizard',
'target': 'new',
'context': {
'default_delivery_id': self.id,
}}
else:
raise UserError('状态为【待下发】的工件记录可进行配送')
else:
raise UserError('状态为【待下发】的工件记录可进行配送')
raise UserError('请选择任务路线再进行配送')
else:
raise UserError(_("该制造订单还未下发CNC程序单,无法进行工件配送"))
# 配送至avg小车
def _delivery_avg(self):
config = self.env['res.config.settings'].get_values()
site_production_line = False
if self.production_line_state == '待上产线':
site_production_line = [('production_line_status', '=', '已上产线')]
elif self.production_line_state == '已下产线':
site_production_line = [('production_line_status', '=', '已下产线')]
agv_site = self.env['res.agv.site'].search(site_production_line, order="number asc")
positionCode_Arr = []
if agv_site:
for item in agv_site:
positionCode_Arr.append({
'positionCode': item.content,
'code': item.type
})
if self.feeder_station_start_id:
positionCode_Arr.append({
'positionCode': self.feeder_station_start_id.name,
'code': '00'
})
if self.feeder_station_destination_id:
positionCode_Arr.append({
'positionCode': self.feeder_station_destination_id.name,
'code': '00'
})
res = {'reqCode': self.production_id.name, 'reqTime': '', 'clientCode': '', 'tokenCode': '',
'taskTyp': 'F01', 'ctnrTyp': '', 'ctnrCode': '', 'wbCode': config['wbcode'],
'positionCodePath': positionCode_Arr,
@@ -1137,14 +1146,14 @@ class WorkPieceDelivery(models.Model):
config['agv_rcs_url'] = 'http://172.16.10.114:8182/rcms/services/rest/hikRpcService/genAgvSchedulingTask'
logging.info('AGV请求路径:%s' % config['agv_rcs_url'])
logging.info('AGV-json:%s' % res)
headers = {'Content-Type': 'application/json'}
ret = requests.post((config['agv_rcs_url']), json=res, headers=headers)
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': '待配送'})
self.write(
{'task_delivery_time': fields.Datetime.now(), 'status': '待配送', 'agv_task_code': ret['data']})
else:
raise UserError(ret['message'])
except Exception as e:

4
sf_manufacturing/models/product_template.py
View File

@@ -7,8 +7,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
# from OCC.Extend.DataExchange import read_step_file
# from OCC.Extend.DataExchange import write_stl_file
class ResProductMo(models.Model):