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

1、优化返工装夹预调工单时，清理rfid问题；2、优化库位信息接口数据处理方式

Browse Source
This commit is contained in:
yuxianghui
2025-05-23 17:13:12 +08:00
parent 433d5d63b7
commit 619285608d
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sf_manufacturing/wizard/rework_wizard.py
View File

@@ -127,9 +127,11 @@ class ReworkWizard(models.TransientModel):
clamp_workorder_ids = rework_workorder_ids.filtered(lambda rp: rp.routing_type == '装夹预调') clamp_workorder_ids = rework_workorder_ids.filtered(lambda rp: rp.routing_type == '装夹预调')
if clamp_workorder_ids: if clamp_workorder_ids:
for clamp_workorder_id in clamp_workorder_ids: for clamp_workorder_id in clamp_workorder_ids:
self.production_id.workorder_ids.filtered( rfid_code = clamp_workorder_id.rfid_code
lambda wk: wk.processing_panel == clamp_workorder_id.processing_panel).write( clamp_workorder_id.write({'rfid_code_old': rfid_code, 'rfid_code': False})
{'rfid_code': None}) 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'}) rework_workorder_ids.write({'state': 'rework'})
# 查询返工工单对应的工艺设计记录，并调用方法拼接数据，用于创建新的工单 # 查询返工工单对应的工艺设计记录，并调用方法拼接数据，用于创建新的工单

11
sf_warehouse/models/sync_common.py
View File

@@ -121,18 +121,13 @@ class MrsShelfLocationDataSync(models.Model):
tool.tool_in_out_stock_location(location_id) tool.tool_in_out_stock_location(location_id)
if tool: if tool:
location_id.product_sn_id = tool.barcode_id.id location_id.product_sn_id = tool.barcode_id.id
# 修改功能刀具标准状态值和已使用寿命值 # 修改功能刀具标准状态值和已使用寿命值、功能刀具状态
if 'LifeStd' in item and 'LifeUse' in item: if 'LifeStd' in item and 'LifeUse' in item:
tool.sudo().write({ tool.sudo().write({
'max_lifetime_value': item['LifeStd'], '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: else:
location_id.product_sn_id = False location_id.product_sn_id = False
if item['RfidCode']: if item['RfidCode']: