From f2482b5128b2274bc36c4fa28eec741b1949e48a Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Tue, 22 Oct 2024 13:45:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=88=80=E5=85=B7=E4=BA=A7=E7=94=9F=E5=BA=93=E5=AD=98=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E6=97=B6=EF=BC=8C=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E6=B2=A1=E6=9C=89=E5=AE=9E=E6=97=B6=E5=8F=91?= =?UTF-8?q?=E7=94=9F=E5=8F=98=E6=9B=B4=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_tool_management/models/functional_tool.py | 4 +++- sf_tool_management/models/stock.py | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/sf_tool_management/models/functional_tool.py b/sf_tool_management/models/functional_tool.py index e8523cd3..78a652f4 100644 --- a/sf_tool_management/models/functional_tool.py +++ b/sf_tool_management/models/functional_tool.py @@ -51,6 +51,8 @@ class FunctionalCuttingToolEntity(models.Model): string='位置', compute='_compute_current_location_id', store=True) image = fields.Binary('图片', readonly=True) + stock_num = fields.Integer('库存变更次数', default=0) + safe_inventory_id = fields.Many2one('sf.real.time.distribution.of.functional.tools', string='功能刀具安全库存', readonly=True) @@ -71,7 +73,7 @@ class FunctionalCuttingToolEntity(models.Model): }) @api.depends('barcode_id.quant_ids', 'barcode_id.quant_ids.location_id', 'functional_tool_status', - 'current_shelf_location_id') + 'current_shelf_location_id', 'stock_num') def _compute_current_location_id(self): for record in self: if record.functional_tool_status == '已拆除': diff --git a/sf_tool_management/models/stock.py b/sf_tool_management/models/stock.py index 9f0d9f82..92198239 100644 --- a/sf_tool_management/models/stock.py +++ b/sf_tool_management/models/stock.py @@ -53,6 +53,13 @@ class StockMoveLine(models.Model): [('barcode_id', '=', line_id.lot_id.id), ('functional_tool_status', '=', '正常')]).cnc_function_tool_use_verify() + for move_line in move_lines: + if move_line.lot_id: + tool_id = self.env['sf.functional.cutting.tool.entity'].sudo().search( + [('barcode_id', '=', move_line.lot_id.id), + ('functional_tool_status', '=', '正常')]) + tool_id.stock_num += tool_id.stock_num + class StockPicking(models.Model): _inherit = 'stock.picking' From 98923c1797fbcc47eaa0f78caed76ef419ffa223 Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Tue, 22 Oct 2024 17:52:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1=E3=80=81=E8=AE=BE=E5=A4=87=E7=BB=B4?= =?UTF-8?q?=E4=BF=9D=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_maintenance/models/sf_maintenance.py | 61 +++++++++- .../models/sf_maintenance_requests.py | 2 + sf_maintenance/security/ir.model.access.csv | 2 +- sf_maintenance/views/maintenance_views.xml | 115 +++++++++++------- 4 files changed, 130 insertions(+), 50 deletions(-) diff --git a/sf_maintenance/models/sf_maintenance.py b/sf_maintenance/models/sf_maintenance.py index d5bfa6b4..95e38d02 100644 --- a/sf_maintenance/models/sf_maintenance.py +++ b/sf_maintenance/models/sf_maintenance.py @@ -1,11 +1,12 @@ # -*- coding: utf-8 -*- import json import base64 +import logging from datetime import timedelta import requests from odoo.addons.sf_base.commons.common import Common from odoo import api, fields, models, _ -from odoo.exceptions import UserError +from odoo.exceptions import UserError, ValidationError class SfMaintenanceEquipmentCategory(models.Model): @@ -122,6 +123,10 @@ class SfMaintenanceEquipment(models.Model): 'sf_maintenance_equipment_ids', string='设备维保标准') eq_maintenance_id = fields.Many2one('equipment.maintenance.standards', string='设备保养标准', domain="[('maintenance_type','=','保养')]") + + initial_action_date = fields.Date(string='初始保养日期') + next_action_date = fields.Date(string='下次预防保养') + initial_overhaul_date = fields.Date(string='初始维修日期') overhaul_date = fields.Date(string='下次预防检修') overhaul_period = fields.Integer(string='预防检修频次') overhaul_duration = fields.Float(string='检修时长') @@ -129,6 +134,52 @@ class SfMaintenanceEquipment(models.Model): overhaul_id = fields.Many2one('equipment.maintenance.standards', string='设备检修标准', domain="[('maintenance_type','=','检修')]") + def confirm_maintenance(self): + """ + 确认保养/检修 + """ + context = self.env.context + initial_date = None + next_date = None + if context['type'] == '保养': + if not self.initial_action_date: + raise ValidationError('初始保养日期不能为空!!') + elif self.initial_action_date < fields.Date.today(): + raise ValidationError('初始保养日期不能小于当前日期!!') + else: + initial_date = self.initial_action_date + next_date = self.next_action_date + elif context['type'] == '检修': + if not self.initial_overhaul_date: + raise ValidationError('初始检修日期不能为空!!') + elif self.initial_overhaul_date < fields.Date.today(): + raise ValidationError('初始检修日期不能小于当前日期!!') + else: + initial_date = self.initial_overhaul_date + next_date = self.overhaul_date + + request_id = self.env['maintenance.request'].search([('stage_id.done', '=', False), + ('equipment_id', '=', self.id), + ('maintenance_type', '=', 'preventive'), + ('request_date', '=', next_date), + ('sf_maintenance_type', '=', context['type'])]) + if not request_id: + if context['type'] == '保养': + self._create_new_request(initial_date) + elif context['type'] == '检修': + self._create_new_request1(initial_date) + return { + 'type': 'ir.actions.client', + 'tag': 'display_notification', + 'params': { + 'title': f'创建{context["type"]}计划', + 'message': f'{context["type"]}维保计划创建成功', + 'type': 'success' + } + } + else: + pass + @api.onchange('eq_maintenance_id', 'overhaul_id') def _compute_equipment_maintenance_standards_ids(self): for record in self: @@ -624,7 +675,7 @@ class SfMaintenanceEquipment(models.Model): if next_date < date_now: next_date = date_now else: - next_date = equipment.effective_date + timedelta(days=equipment.period) + next_date = equipment.initial_action_date + timedelta(days=equipment.period) equipment.next_action_date = next_date else: self.next_action_date = False @@ -668,7 +719,7 @@ class SfMaintenanceEquipment(models.Model): if next_date < date_now: next_date = date_now else: - next_date = equipment.effective_date + timedelta(days=equipment.overhaul_period) + next_date = equipment.initial_overhaul_date + timedelta(days=equipment.overhaul_period) equipment.overhaul_date = next_date else: self.overhaul_date = False @@ -678,7 +729,7 @@ class SfMaintenanceEquipment(models.Model): self.ensure_one() return { 'name': _('Preventive Maintenance - %s', self.name), - 'request_date': date, + 'request_date': fields.Date.today(), 'schedule_date': date, 'category_id': self.category_id.id, 'equipment_id': self.id, @@ -698,7 +749,7 @@ class SfMaintenanceEquipment(models.Model): self.ensure_one() return { 'name': _('Preventive Maintenance - %s', self.name), - 'request_date': date, + 'request_date': fields.Date.today(), 'schedule_date': date, 'category_id': self.category_id.id, 'equipment_id': self.id, diff --git a/sf_maintenance/models/sf_maintenance_requests.py b/sf_maintenance/models/sf_maintenance_requests.py index 8686926b..397c8c90 100644 --- a/sf_maintenance/models/sf_maintenance_requests.py +++ b/sf_maintenance/models/sf_maintenance_requests.py @@ -14,6 +14,8 @@ class SfMaintenanceEquipmentCategory(models.Model): equipment_maintenance_id = fields.Many2one('equipment.maintenance.standards', string='设备维保标准', domain="[('maintenance_type','=',sf_maintenance_type)]") + active = fields.Boolean('有效', default=True) + @api.onchange('sf_maintenance_type') def _compute_equipment_maintenance_request_id(self): for record in self: diff --git a/sf_maintenance/security/ir.model.access.csv b/sf_maintenance/security/ir.model.access.csv index abbd4878..0317cf7a 100644 --- a/sf_maintenance/security/ir.model.access.csv +++ b/sf_maintenance/security/ir.model.access.csv @@ -20,7 +20,7 @@ access_maintenance_equipment_agv_log,maintenance_equipment_agv_log,model_mainten -access_maintenance_system_user,equipment.request system user,maintenance.model_maintenance_request,base.group_user,1,0,0,0 +access_maintenance_system_user,equipment.request system user,maintenance.model_maintenance_request,base.group_user,1,1,1,0 access_maintenance_equipment_group_plan_dispatch,maintenance.equipment,maintenance.model_maintenance_equipment,sf_base.group_plan_dispatch,1,0,0,0 access_maintenance_equipment_oee_group_plan_dispatch,maintenance_equipment_oee,model_maintenance_equipment_oee,sf_base.group_plan_dispatch,1,0,0,0 diff --git a/sf_maintenance/views/maintenance_views.xml b/sf_maintenance/views/maintenance_views.xml index 8c6cb40d..4fe044d3 100644 --- a/sf_maintenance/views/maintenance_views.xml +++ b/sf_maintenance/views/maintenance_views.xml @@ -60,9 +60,9 @@ - + + domain="[('brand_id', '=', brand_id)]"/> @@ -73,7 +73,7 @@ + options="{'no_create': True}"/>