Merge branch 'feature/收藏无法删除缺陷优化' into feature/刀具组装扫码优化

sf_tool_management/wizard/wizard.py

@@ -387,9 +387,9 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
             lot_ids = self.env['stock.lot'].sudo().search([('rfid', '=', barcode)])
             if lot_ids:
                 for lot_id in lot_ids:
-                    if lot_id.quant_ids[-1].location_id.name in '刀具房':
+                    if lot_id.tool_material_status == '可用':
                         record.handle_code_id = lot_id.id
-                    elif lot_id.quant_ids[-1].location_id.name == '刀具组装位置':
+                    elif lot_id.quant_ids[-1].location_id.name in ['刀具组装位置']:
                         raise ValidationError('该刀柄已使用，请重新扫描！！！')
                     else:
                         raise ValidationError('该刀柄未入库，请重新扫描！！！')