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

Accept Merge Request #2167: (feature/销售合同优化 -> develop)

Browse Source 
Merge Request: 返工装夹预调工单时，清除同一个面工单的rfid，并且保留返工工单的rfid记录

Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2167
This commit is contained in:
禹翔辉
2025-06-05 11:20:09 +08:00
committed by Coding
parent 87891b45ef 1082384d00
commit 2766bc7d34
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sf_manufacturing/wizard/rework_wizard.py
View File

@@ -131,14 +131,22 @@ class ReworkWizard(models.TransientModel):
# 'rfid_code_old': order.rfid_code,
# 'rfid_code': False
# })
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_old': clamp_workorder_id.rfid_code,
'rfid_code': None})
# 返工工单状态设置为【返工】
rework_workorder_ids.write({'state': 'rework'})
if clamp_workorder_ids:
for clamp_workorder_id in clamp_workorder_ids:
# 清除返工的装夹预调工单以及其他同面返工工单的RFID并保存rfid记录
self.production_id.workorder_ids.filtered(lambda wk: (
wk.processing_panel == clamp_workorder_id.processing_panel
and wk.state == 'rework' and wk.rfid_code)).write(
{'rfid_code_old': clamp_workorder_id.rfid_code, 'rfid_code': None})
# 清除返工的装夹预调工单同面的非返工工单的RFID
self.production_id.workorder_ids.filtered(lambda wk: (
wk.processing_panel == clamp_workorder_id.processing_paneland and wk.state != 'rework')).write(
{'rfid_code_old': None, 'rfid_code': None})
# 清除其他返工工单的RFID
for work in rework_workorder_ids.filtered(lambda wk: wk.rfid_code):
work.write({'rfid_code_old': work.rfid_code, 'rfid_code': None})
# 查询返工工单对应的工艺设计记录，并调用方法拼接数据，用于创建新的工单
workorders_values = []
for work in rework_workorder_ids: