diff --git a/sf_base/__manifest__.py b/sf_base/__manifest__.py index ceedcdd0..b10c2630 100644 --- a/sf_base/__manifest__.py +++ b/sf_base/__manifest__.py @@ -35,6 +35,7 @@ ], 'web.assets_backend': [ 'sf_base/static/src/scss/*.scss', + 'sf_base/static/src/js/*.js', ], }, diff --git a/sf_base/static/src/js/remove_focus.js b/sf_base/static/src/js/remove_focus.js new file mode 100644 index 00000000..3e4cbb22 --- /dev/null +++ b/sf_base/static/src/js/remove_focus.js @@ -0,0 +1,23 @@ +/** @odoo-module **/ + +import { registry } from '@web/core/registry'; + +import { formView } from '@web/views/form/form_view'; +import { FormController } from '@web/views/form/form_controller'; + +import { onRendered, onMounted } from "@odoo/owl"; + +export class RemoveFocusController extends FormController { + setup() { + super.setup(); + + onMounted(() => { + this.__owl__.bdom.el.querySelectorAll(':focus').forEach(element => element.blur()); + }) + } +} + +registry.category('views').add('remove_focus_view', { + ...formView, + Controller: RemoveFocusController, +}); \ No newline at end of file diff --git a/sf_manufacturing/models/agv_scheduling.py b/sf_manufacturing/models/agv_scheduling.py index 4fbfbf8d..1ee9c36d 100644 --- a/sf_manufacturing/models/agv_scheduling.py +++ b/sf_manufacturing/models/agv_scheduling.py @@ -164,8 +164,9 @@ class AgvScheduling(models.Model): task_route = task_routes.filtered( lambda r: r.start_site_id == agv_scheduling.start_site_id and r.start_site_id == agv_scheduling.start_site_id ) - # 下发AGV调度任务并修改接驳站状态为占用 - agv_scheduling.dispatch_scheduling(task_route) + if task_route: + # 下发AGV调度任务并修改接驳站状态为占用 + agv_scheduling.dispatch_scheduling(task_route) def _delivery_avg(self): config = self.env['res.config.settings'].get_values() diff --git a/sf_manufacturing/static/src/js/workpiece_delivery_wizard_confirm.js b/sf_manufacturing/static/src/js/workpiece_delivery_wizard_confirm.js index cb044955..236836ab 100644 --- a/sf_manufacturing/static/src/js/workpiece_delivery_wizard_confirm.js +++ b/sf_manufacturing/static/src/js/workpiece_delivery_wizard_confirm.js @@ -6,8 +6,6 @@ odoo.define('sf_manufacturing.action_dispatch_confirm', function (require) { var _t = core._t; async function dispatch_confirm(parent, {params}) { - console.log(params, 'params') - console.log("