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

Merge branch 'develop' into feature/commercially_launched

Browse Source
This commit is contained in:
胡尧
2025-03-13 08:47:59 +08:00
parent f5da36a82c dff0841317
commit 3cc3c48ab3
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sf_manufacturing/models/mrp_workorder.py
View File

@@ -1511,8 +1511,8 @@ class ResMrpWorkOrder(models.Model):
for workorder in record.production_id.workorder_ids:
if workorder.processing_panel == record.processing_panel:
rfid_code = workorder.rfid_code
workorder.write({'rfid_code_old': rfid_code,
'rfid_code': False})
workorder.filtered(lambda wo: wo.state != 'rework' or wo.rfid_code is not False).write(
{'rfid_code_old': rfid_code, 'rfid_code': False})
self.env['stock.lot'].sudo().search([('rfid', '=', rfid_code)]).write(
{'tool_material_status': '可用'})
if workorder.rfid_code:
@@ -1929,7 +1929,8 @@ class SfWorkOrderBarcodes(models.Model):
self.write(val)
workorder_rfid = self.env['mrp.workorder'].search(
[('production_id', '=', workorder.production_id.id),
('processing_panel', '=', workorder.processing_panel)])
('processing_panel', '=', workorder.processing_panel),
('state', '!=', 'rework')])
if workorder_rfid:
for item in workorder_rfid:
item.write({'rfid_code': barcode})