From 619285608d81c493e2dca1e8162141cf37fe2a86 Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Fri, 23 May 2025 17:13:12 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E8=BF=94=E5=B7=A5?= =?UTF-8?q?=E8=A3=85=E5=A4=B9=E9=A2=84=E8=B0=83=E5=B7=A5=E5=8D=95=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E6=B8=85=E7=90=86rfid=E9=97=AE=E9=A2=98=EF=BC=9B2?= =?UTF-8?q?=E3=80=81=E4=BC=98=E5=8C=96=E5=BA=93=E4=BD=8D=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/wizard/rework_wizard.py | 8 +++++--- sf_warehouse/models/sync_common.py | 11 +++-------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/sf_manufacturing/wizard/rework_wizard.py b/sf_manufacturing/wizard/rework_wizard.py index cc3f5fb2..7fc935a0 100644 --- a/sf_manufacturing/wizard/rework_wizard.py +++ b/sf_manufacturing/wizard/rework_wizard.py @@ -127,9 +127,11 @@ class ReworkWizard(models.TransientModel): clamp_workorder_ids = rework_workorder_ids.filtered(lambda rp: rp.routing_type == '装夹预调') if clamp_workorder_ids: for clamp_workorder_id in clamp_workorder_ids: - self.production_id.workorder_ids.filtered( - lambda wk: wk.processing_panel == clamp_workorder_id.processing_panel).write( - {'rfid_code': None}) + rfid_code = clamp_workorder_id.rfid_code + clamp_workorder_id.write({'rfid_code_old': rfid_code, 'rfid_code': False}) + self.production_id.workorder_ids.filtered(lambda wk: ( + wk.routing_type != '装夹预调' and + wk.processing_panel == clamp_workorder_id.processing_panel)).write({'rfid_code': None}) # 返工工单状态设置为【返工】 rework_workorder_ids.write({'state': 'rework'}) # 查询返工工单对应的工艺设计记录，并调用方法拼接数据，用于创建新的工单 diff --git a/sf_warehouse/models/sync_common.py b/sf_warehouse/models/sync_common.py index 18510917..3c6b23fd 100644 --- a/sf_warehouse/models/sync_common.py +++ b/sf_warehouse/models/sync_common.py @@ -121,18 +121,13 @@ class MrsShelfLocationDataSync(models.Model): tool.tool_in_out_stock_location(location_id) if tool: location_id.product_sn_id = tool.barcode_id.id - # 修改功能刀具标准状态值和已使用寿命值 + # 修改功能刀具标准状态值和已使用寿命值、功能刀具状态 if 'LifeStd' in item and 'LifeUse' in item: tool.sudo().write({ 'max_lifetime_value': item['LifeStd'], - 'used_value': item['LifeUse'] + 'used_value': item['LifeUse'], + 'functional_tool_status': item['State'], }) - # 修改功能刀具状态 - if item.get('State') == '报警': - if tool.functional_tool_status != item.get('State'): - tool.sudo().write({ - 'functional_tool_status': item['State'] - }) else: location_id.product_sn_id = False if item['RfidCode']: