From 48cd8399f4dc3f4f463ae7c865be72f7c8b6296f Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Mon, 25 Mar 2024 16:49:49 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E4=B8=AD=E6=8E=A7?= =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E7=89=B9=E9=87=87=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?2=E3=80=81=E5=B0=86=E5=88=80=E5=85=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7=E6=89=80=E6=9C=89?= =?UTF-8?q?rfid=E6=94=B9=E4=B8=BARfid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_quality/models/quality.py | 8 ++++++-- sf_tool_management/models/base.py | 10 +++++----- sf_tool_management/wizard/wizard.py | 6 +++--- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/sf_quality/models/quality.py b/sf_quality/models/quality.py index ee289415..809dbba3 100644 --- a/sf_quality/models/quality.py +++ b/sf_quality/models/quality.py @@ -19,7 +19,10 @@ class QualityCheck(models.Model): # headers = Common.get_headers(self, token, sf_secret_key) headers = {'Authorization': 'Ba F2CF5DCC-1A00-4234-9E95-65603F70CC8A'} crea_url = "https://x24467i973.zicp.fun/AutoDeviceApi/PartSpecProc" - val = ['0037835872'] + origin = self.picking_id.origin + production_id = self.env['mrp.production'].sudo().search([('name', '=', origin)]) + rfid = '' if not production_id.workorder_ids else production_id.workorder_ids[-1].rfid_code or '' + val = [rfid] r = requests.post(crea_url, json=val, headers=headers) ret = r.json() logging.info('_register_quality_check:%s' % ret) @@ -33,4 +36,5 @@ class QualityCheck(models.Model): 'quality_state': 'fail', 'user_id': self.env.user.id, 'control_date': datetime.now()}) - self._register_quality_check() + if self.picking_id and 'WH/MO/' in self.picking_id.origin: + self._register_quality_check() diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py index 2c4b4364..968f6841 100644 --- a/sf_tool_management/models/base.py +++ b/sf_tool_management/models/base.py @@ -15,7 +15,7 @@ class FunctionalCuttingToolEntity(models.Model): tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', related='functional_tool_name_id.tool_groups_id') code = fields.Char('编码') - rfid = fields.Char('rfid', readonly=True) + rfid = fields.Char('Rfid', readonly=True) 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) @@ -222,7 +222,7 @@ class FunctionalToolWarning(models.Model): _description = '功能刀具预警' code = fields.Char('编码', related='functional_tool_name_id.code') - rfid = fields.Char('rfid', related='functional_tool_name_id.rfid') + 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') name = fields.Char('名称', invisible=True, readonly=True, related='functional_tool_name_id.name') # 机床信息 @@ -296,7 +296,7 @@ class StockMoveLine(models.Model): 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') + rfid = fields.Char('Rfid') tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组') @api.model @@ -502,7 +502,7 @@ class MachineTableToolChangingApply(models.Model): barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', store=True, domain=[('product_id.name', '=', '功能刀具')], related='functional_tool_name_id.barcode_id') - rfid = fields.Char('rfid', related='functional_tool_name_id.rfid') + rfid = fields.Char('Rfid', related='functional_tool_name_id.rfid') functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', domain=[('assemble_status', '=', '1')], string='功能刀具名称') functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', store=True, @@ -828,7 +828,7 @@ class FunctionalToolAssembly(models.Model): obj.name = obj.after_assembly_functional_tool_name code = fields.Char('功能刀具编码', readonly=True) - rfid = fields.Char('rfid', readonly=True) + rfid = fields.Char('Rfid', readonly=True) tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', readonly=True) name = fields.Char(string='名称', readonly=True, compute='_compute_name') assembly_order_code = fields.Char(string='组装单编码', readonly=True) diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py index c7a039ec..25fcdde9 100644 --- a/sf_tool_management/wizard/wizard.py +++ b/sf_tool_management/wizard/wizard.py @@ -9,7 +9,7 @@ class ToolChangeRequirementInformation(models.TransientModel): _description = '换刀需求信息' code = fields.Char('编码', readonly=True) - rfid = fields.Char('rfid', readonly=True) + rfid = fields.Char('Rfid', readonly=True) tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', readonly=True) name = fields.Char('名称', related='maintenance_equipment_id.name', store=True, readonly=True) maintenance_equipment_id = fields.Many2one('maintenance.equipment', string='CNC机床', readonly=True) @@ -323,7 +323,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel): # 组装功能刀具参数信息 barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号') - rfid = fields.Char('rfid', required=True) + rfid = fields.Char('Rfid', required=True) tool_code = fields.Char(string='功能刀具编码', readonly=True, compute='_compute_tool_code') after_assembly_functional_tool_name = fields.Char(string='组装后功能刀具名称', compute='_compute_name') after_assembly_functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', @@ -455,7 +455,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel): if obj.rfid: tool_entity = self.env['sf.functional.cutting.tool.entity'].sudo().search([('rfid', '=', obj.rfid)]) if tool_entity: - raise ValidationError('【%s】的rfid已被使用，请重新录入！！！' % obj.rfid) + raise ValidationError('【%s】的Rfid已被使用，请重新录入！！！' % obj.rfid) def functional_tool_assembly(self): """