From a8211171b004b0d01bfb6e39bed3f357ae527ae3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= Date: Tue, 20 Aug 2024 16:18:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=A5=E6=97=A5=E3=80=81?= =?UTF-8?q?=E6=9C=88=E3=80=81=E5=B9=B4=E4=B8=BA=E6=97=A5=E6=9C=9F=E6=9C=9F?= =?UTF-8?q?=E9=97=B4=E7=9A=84=E5=BA=8F=E5=88=97=EF=BC=8C=E5=B7=A5=E4=BB=B6?= =?UTF-8?q?=E9=85=8D=E9=80=81=E5=8D=95=E7=8A=B6=E6=80=81=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=EF=BC=8C=E8=BF=94=E5=B7=A5=E6=97=B6=E4=B8=8D=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=B7=A5=E4=BB=B6=E9=85=8D=E9=80=81=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/models/__init__.py | 1 + sf_base/models/ir_sequence.py | 69 +++++++++++++++++++ sf_manufacturing/data/agv_scheduling_data.xml | 1 + sf_manufacturing/models/agv_scheduling.py | 21 ++++-- sf_manufacturing/models/mrp_workorder.py | 2 +- .../views/agv_scheduling_views.xml | 4 +- sf_manufacturing/wizard/rework_wizard.py | 6 +- 7 files changed, 93 insertions(+), 11 deletions(-) create mode 100644 sf_base/models/ir_sequence.py diff --git a/sf_base/models/__init__.py b/sf_base/models/__init__.py index f7d50427..82ed80c1 100644 --- a/sf_base/models/__init__.py +++ b/sf_base/models/__init__.py @@ -5,3 +5,4 @@ from . import fixture from . import functional_fixture from . import tool_other_features from . import basic_parameters_fixture +from . import ir_sequence diff --git a/sf_base/models/ir_sequence.py b/sf_base/models/ir_sequence.py new file mode 100644 index 00000000..5a39cb5e --- /dev/null +++ b/sf_base/models/ir_sequence.py @@ -0,0 +1,69 @@ +import calendar +from datetime import timedelta + +from odoo import models, fields + + +class IrSequence(models.Model): + _inherit = 'ir.sequence' + + date_range_period = fields.Selection( + [('day', '每日'), ('month', '每月'), ('year', '每年')], + string='日期期间', + ) + + def _next(self, sequence_date=None): + """ Returns the next number in the preferred sequence in all the ones given in self.""" + if not self.use_date_range: + return self._next_do() + # date mode + dt = sequence_date or self._context.get('ir_sequence_date', fields.Date.today()) + seq_date = self.env['ir.sequence.date_range'].search( + [('sequence_id', '=', self.id), ('date_from', '<=', dt), ('date_to', '>=', dt)], limit=1) + if not seq_date: + if self.date_range_period: + seq_date = self._create_date_range_seq_by_period(dt, self.date_range_period) + else: + seq_date = self._create_date_range_seq(dt) + return seq_date.with_context(ir_sequence_date_range=seq_date.date_from)._next() + + def _create_date_range_seq_by_period(self, date, period): + if period == 'year': + year = fields.Date.from_string(date).strftime('%Y') + date_from = '{}-01-01'.format(year) + date_to = '{}-12-31'.format(year) + if period == 'month': + # 计算当前月份的第一天和最后一天 + year = fields.Date.from_string(date).strftime('%Y') + month = fields.Date.from_string(date).strftime('%m') + date_from = fields.Date.from_string(date).strftime('%Y-%m-01') + date_to = '{}-{}-{}'.format(year, month, calendar.monthrange(int(year), int(month))[1]) + if period == 'day': + date_from = date + date_to = date + date_range = self.env['ir.sequence.date_range'].search( + [ + ('sequence_id', '=', self.id), + ('date_to', '>=', date_from), + ('date_to', '<=', date), + ('date_range_period', '=', period) + ], + order='date_to desc', limit=1) + if date_range: + date_from = date_range.date_to + timedelta(days=1) + seq_date_range = self.env['ir.sequence.date_range'].sudo().create({ + 'date_from': date_from, + 'date_to': date_to, + 'sequence_id': self.id, + 'date_range_period': period, + }) + return seq_date_range + + +class IrSequenceDateRange(models.Model): + _inherit = 'ir.sequence.date_range' + + date_range_period = fields.Selection( + [('day', '每日'), ('month', '每月'), ('year', '每年')], + string='日期期间', + ) diff --git a/sf_manufacturing/data/agv_scheduling_data.xml b/sf_manufacturing/data/agv_scheduling_data.xml index f9dc6362..44878ade 100644 --- a/sf_manufacturing/data/agv_scheduling_data.xml +++ b/sf_manufacturing/data/agv_scheduling_data.xml @@ -9,6 +9,7 @@ 1 standard True + day diff --git a/sf_manufacturing/models/agv_scheduling.py b/sf_manufacturing/models/agv_scheduling.py index 1ee9c36d..34cd1b15 100644 --- a/sf_manufacturing/models/agv_scheduling.py +++ b/sf_manufacturing/models/agv_scheduling.py @@ -23,7 +23,7 @@ class AgvScheduling(models.Model): return self.env['sf.agv.task.route'].fields_get(['route_type'])['route_type']['selection'] agv_route_type = fields.Selection(selection=_get_agv_route_type_selection, string='任务类型', required=True) - agv_route_name = fields.Char('任务路线名称') + agv_route_id = fields.Many2one('sf.agv.task.route', '任务路线') start_site_id = fields.Many2one('sf.agv.site', '起点接驳站', required=True) end_site_id = fields.Many2one('sf.agv.site', '终点接驳站', tracking=True) site_state = fields.Selection([ @@ -125,7 +125,7 @@ class AgvScheduling(models.Model): idle_route = None if len(agv_routes) == 1: idle_route = agv_routes[0] - vals.update({'end_site_id': idle_route.end_site_id.id, 'agv_route_name': idle_route.name}) + vals.update({'end_site_id': idle_route.end_site_id.id, 'agv_route_id': idle_route.id}) else: # 判断终点接驳站是否为空闲 idle_routes = agv_routes.filtered(lambda r: r.end_site_id.state == '空闲') @@ -133,7 +133,7 @@ class AgvScheduling(models.Model): # 将空闲的路线按照终点接驳站名称排序 idle_routes = sorted(idle_routes, key=lambda r: r.end_site_id.name) idle_route = idle_routes[0] - vals.update({'end_site_id': idle_route.end_site_id.id, 'agv_route_name': idle_route.name}) + vals.update({'end_site_id': idle_route.end_site_id.id, 'agv_route_id': idle_route.id}) try: scheduling = self.env['sf.agv.scheduling'].sudo().create(vals) # 触发空闲接驳站状态更新，触发新任务下发 @@ -231,7 +231,7 @@ class AgvScheduling(models.Model): rec.task_delivery_time = fields.Datetime.now() rec.site_state = '空闲' rec.end_site_id = agv_task_route.end_site_id.id - rec.agv_route_name = agv_task_route.name + rec.agv_route_id = agv_task_route.id # 更新接驳站状态 rec.env['sf.agv.site'].update_site_state({rec.end_site_id.name: '占用'}, False) @@ -240,7 +240,18 @@ class AgvScheduling(models.Model): if vals['state'] == '已取消': self.env['sf.workpiece.delivery'].search([('agv_scheduling_id', '=', self.id)]).write({'status': '待下发'}) elif vals['state'] == '已配送': - self.env['sf.workpiece.delivery'].search([('agv_scheduling_id', '=', self.id)]).write({'status': '已配送'}) + self.env['sf.workpiece.delivery'].search([('agv_scheduling_id', '=', self.id)]).write({ + 'status': '已配送', + 'feeder_station_destination_id': self.end_site_id, + 'route_id': self.agv_route_id.id, + 'task_completion_time': fields.Datetime.now() + }) + elif vals['state'] == '配送中': + self.env['sf.workpiece.delivery'].search([('agv_scheduling_id', '=', self.id)]).write({ + 'feeder_station_destination_id': self.end_site_id, + 'route_id': self.agv_route_id.id, + 'task_delivery_time': fields.Datetime.now() + }) return super().write(vals) diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index 847e1a37..bb1cfce3 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -1634,7 +1634,7 @@ class WorkPieceDelivery(models.Model): type = fields.Selection(selection=_get_agv_route_type_selection, string='类型') delivery_duration = fields.Float('配送时长', compute='_compute_delivery_duration') status = fields.Selection( - [('待下发', '待下发'), ('已下发', '已下发'), ('已配送', '已配送'), ('已取消', '已取消')], string='状态', + [('待下发', '待下发'), ('已下发', '待配送'), ('已配送', '已配送'), ('已取消', '已取消')], string='状态', default='待下发', tracking=True) is_cnc_program_down = fields.Boolean('程序是否下发', default=False, tracking=True) is_manual_work = fields.Boolean('人工操作', default=False) diff --git a/sf_manufacturing/views/agv_scheduling_views.xml b/sf_manufacturing/views/agv_scheduling_views.xml index ef932e54..c24cdf94 100644 --- a/sf_manufacturing/views/agv_scheduling_views.xml +++ b/sf_manufacturing/views/agv_scheduling_views.xml @@ -15,7 +15,7 @@ /> - + @@ -43,7 +43,7 @@ - + diff --git a/sf_manufacturing/wizard/rework_wizard.py b/sf_manufacturing/wizard/rework_wizard.py index 4525cb7f..53fd2965 100644 --- a/sf_manufacturing/wizard/rework_wizard.py +++ b/sf_manufacturing/wizard/rework_wizard.py @@ -71,9 +71,9 @@ class ReworkWizard(models.TransientModel): lambda ap: ap.processing_panel == panel.name and ap.state != 'rework') if panel_workorder: panel_workorder.write({'state': 'rework'}) - panel_workorder.filtered( - lambda wo: wo.routing_type == '装夹预调').workpiece_delivery_ids.filtered( - lambda wd: wd.status == '待下发').write({'status': '已取消'}) + # panel_workorder.filtered( + # lambda wo: wo.routing_type == '装夹预调').workpiece_delivery_ids.filtered( + # lambda wd: wd.status == '待下发').write({'status': '已取消'}) # workpiece = self.env['sf.workpiece.delivery'].search([('status', '=', '待下发'), ( # 'workorder_id', '=', # panel_workorder.filtered(lambda wd: wd.routing_type == '装夹预调').id)])