From 4f83c5f29acb018f87c6a5d18ec801f2249eb2e1 Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Mon, 27 Nov 2023 21:30:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AD=A6=E5=91=8A=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Many2OneRadioField/many2one_radio_field.js | 2 -- .../custom_many2many_checkboxes.js | 13 +++++++------ .../src/js/custom_form_status_indicator.js | 2 +- jikimo_frontend/static/src/list/custom_width.js | 4 ++-- .../static/src/views/list_nums/list_nbCols.js | 2 +- sf_bf_connect/models/jd_eclp.py | 13 +++++++++---- sf_bf_connect/models/process_status.py | 2 +- sf_machine_connect/models/ftp_client.py | 5 ++--- .../static/src/js/barcode_button.js | 7 +++---- sf_machine_connect/static/src/js/barcode_form.js | 2 +- .../static/src/js/barcode_handler_field.js | 7 +++---- sf_machine_connect/wizard/action_up.py | 10 +++------- sf_manufacturing/static/src/js/kanban_change.js | 15 +++------------ sf_quality/models/custom_quality.py | 2 +- sf_warehouse/static/src/colorGuide.js | 6 ++---- sf_warehouse/static/src/js/cust_char.js | 16 +++++++--------- .../static/src/js/custom_kanban_controller.js | 8 ++++---- sf_warehouse/static/src/js/custom_many2one.js | 8 ++++---- .../static/src/js/3d_viewer.js | 8 ++++---- 19 files changed, 58 insertions(+), 74 deletions(-) diff --git a/jikimo_frontend/static/src/fields/Many2OneRadioField/many2one_radio_field.js b/jikimo_frontend/static/src/fields/Many2OneRadioField/many2one_radio_field.js index 836ee6d8..2be3365c 100644 --- a/jikimo_frontend/static/src/fields/Many2OneRadioField/many2one_radio_field.js +++ b/jikimo_frontend/static/src/fields/Many2OneRadioField/many2one_radio_field.js @@ -11,7 +11,6 @@ export class Many2OneRadioField extends RadioField { // 你自己的代码 } - onImageClick(event) { // 放大图片逻辑 // 获取图片元素 @@ -47,7 +46,6 @@ export class Many2OneRadioField extends RadioField { return []; } } - } Many2OneRadioField.template = "jikimo_frontend.Many2OneRadioField" diff --git a/jikimo_frontend/static/src/fields/custom_many2many_checkboxes/custom_many2many_checkboxes.js b/jikimo_frontend/static/src/fields/custom_many2many_checkboxes/custom_many2many_checkboxes.js index 5845dbae..a3053b72 100644 --- a/jikimo_frontend/static/src/fields/custom_many2many_checkboxes/custom_many2many_checkboxes.js +++ b/jikimo_frontend/static/src/fields/custom_many2many_checkboxes/custom_many2many_checkboxes.js @@ -15,23 +15,24 @@ export class MyCustomWidget extends Many2ManyCheckboxesField { // 放大图片逻辑 // 获取图片元素 const img = event.target; - const close = img.nextSibling + const close = img.nextSibling; // 实现放大图片逻辑 // 比如使用 CSS 放大 img.parentElement.classList.add('zoomed'); - close.classList.add('img_close') + close.classList.add('img_close'); } onCloseClick(event) { const close = event.target; - const img = close.previousSibling - img.parentElement.classList.remove('zoomed') - close.classList.remove('img_close') + const img = close.previousSibling; + img.parentElement.classList.remove('zoomed'); + close.classList.remove('img_close'); } } -MyCustomWidget.template = "jikimo_frontend.MyCustomWidget" +MyCustomWidget.template = "jikimo_frontend.MyCustomWidget"; // MyCustomWidget.supportedTypes = ['many2many']; registry.category("fields").add("custom_many2many_checkboxes", MyCustomWidget); + diff --git a/jikimo_frontend/static/src/js/custom_form_status_indicator.js b/jikimo_frontend/static/src/js/custom_form_status_indicator.js index a5f68479..c1ba8248 100644 --- a/jikimo_frontend/static/src/js/custom_form_status_indicator.js +++ b/jikimo_frontend/static/src/js/custom_form_status_indicator.js @@ -3,7 +3,7 @@ import {patch} from '@web/core/utils/patch'; // import { Dialog } from "@web/core/dialog/dialog"; import {_t} from "@web/core/l10n/translation"; -import {FormStatusIndicator} from "@web/views/form/form_status_indicator/form_status_indicator" +import {FormStatusIndicator} from "@web/views/form/form_status_indicator/form_status_indicator"; var Dialog = require('web.Dialog'); // var {patch} = require("web.utils") 这句话也行 diff --git a/jikimo_frontend/static/src/list/custom_width.js b/jikimo_frontend/static/src/list/custom_width.js index 785bedb5..f7c1c55d 100644 --- a/jikimo_frontend/static/src/list/custom_width.js +++ b/jikimo_frontend/static/src/list/custom_width.js @@ -1,7 +1,7 @@ /** @odoo-module */ import {patch} from '@web/core/utils/patch'; -import {ListRenderer} from "@web/views/list/list_renderer" +import {ListRenderer} from "@web/views/list/list_renderer"; // var {patch} = require("web.utils") 这句话也行 @@ -17,7 +17,7 @@ patch(ListRenderer.prototype, 'jikimo_frontend.ListRenderer', { const table = this.tableRef.el; const headers = [...table.querySelectorAll("thead th:not(.o_list_actions_header)")]; - const column_num = headers.length + const column_num = headers.length; if (!this.columnWidths || !this.columnWidths.length) { // no column widths to restore diff --git a/jikimo_frontend/static/src/views/list_nums/list_nbCols.js b/jikimo_frontend/static/src/views/list_nums/list_nbCols.js index b0bacb02..1403544f 100644 --- a/jikimo_frontend/static/src/views/list_nums/list_nbCols.js +++ b/jikimo_frontend/static/src/views/list_nums/list_nbCols.js @@ -8,4 +8,4 @@ patch(ListRenderer.prototype, '/jikimo_frontend/static/src/views/list_nums/list_ const nbCols = this._super(...arguments); return nbCols + 1; } -}); \ No newline at end of file +}); diff --git a/sf_bf_connect/models/jd_eclp.py b/sf_bf_connect/models/jd_eclp.py index 1b3c10ab..4ccb0db6 100644 --- a/sf_bf_connect/models/jd_eclp.py +++ b/sf_bf_connect/models/jd_eclp.py @@ -3,9 +3,9 @@ import logging from datetime import datetime import requests import cpca -from odoo.exceptions import UserError -from odoo.exceptions import ValidationError -from odoo import api, fields, models, SUPERUSER_ID, _ +# from odoo.exceptions import UserError +# from odoo.exceptions import ValidationError +from odoo import api, fields, models _logger = logging.getLogger(__name__) @@ -44,12 +44,18 @@ class JdEclp(models.Model): @api.depends('name') def _check_is_out(self): + """ + 判断是否为出库单 + """ if self.name: is_check_out = self.name.split('/') self.check_out = is_check_out[1] @api.depends('carrier_tracking_ref') def query_bill_pdf(self): + """ + 查询物流面单，并赋值给bill + """ self.bill = self.env['ir.attachment'].sudo().search([('name', '=', self.carrier_tracking_ref)]) @api.depends('origin') @@ -84,7 +90,6 @@ class JdEclp(models.Model): self.receiverTownName = self.receiverTownName except Exception as e: print(f"Error address is none: {e}") - pass def create_order(self): # sale_order_id = self.env['sale.order'].search([('name', '=', self.origin)]) diff --git a/sf_bf_connect/models/process_status.py b/sf_bf_connect/models/process_status.py index f7b7dccd..d79b3369 100644 --- a/sf_bf_connect/models/process_status.py +++ b/sf_bf_connect/models/process_status.py @@ -212,7 +212,7 @@ class FinishStatusChange(models.Model): action['context'] = {'default_picking_ids': self.ids} return action - out_start_time = str(datetime.now()) + # out_start_time = str(datetime.now()) json2 = { 'params': { 'model_name': 'jikimo.process.order', diff --git a/sf_machine_connect/models/ftp_client.py b/sf_machine_connect/models/ftp_client.py index 7ca0ad06..10894d3a 100644 --- a/sf_machine_connect/models/ftp_client.py +++ b/sf_machine_connect/models/ftp_client.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- import os -import time import json import base64 import shutil @@ -11,7 +10,7 @@ from zipfile import ZipFile from datetime import datetime, timedelta import requests from odoo.http import request -from odoo import fields, models, api, _ +from odoo import fields, models, api from odoo.exceptions import UserError from odoo.exceptions import MissingError from odoo.exceptions import ValidationError @@ -470,7 +469,7 @@ class WorkCenterBarcode(models.Model): raise UserError('NC下发执行超时, 请检查下发状态') def get__state(self): - pay_time = str(datetime.now()) + # pay_time = str(datetime.now()) json = { 'params': { 'model_name': 'jikimo.process.order', diff --git a/sf_machine_connect/static/src/js/barcode_button.js b/sf_machine_connect/static/src/js/barcode_button.js index e7d9f879..5fcd8caf 100644 --- a/sf_machine_connect/static/src/js/barcode_button.js +++ b/sf_machine_connect/static/src/js/barcode_button.js @@ -97,13 +97,12 @@ export class CodeField extends Component { } else { if (records[0].state === '占用') { // console.log('此托盘已占用，请检查') - alert('此托盘已占用，请检查') + alert('此托盘已占用，请检查'); } else { // console.log('此托盘已损坏，请登记') - alert('此托盘已损坏，请登记') + alert('此托盘已损坏，请登记'); } } - } else { const searchInput = this.autocompleteContainerRef.el.querySelector("input"); searchInput.value = barcode; @@ -114,7 +113,7 @@ export class CodeField extends Component { } } } -CodeField.template = 'sf_machine_connect.CodeField' +CodeField.template = 'sf_machine_connect.CodeField'; // Register the field in the registry CodeField.props = standardFieldProps; registry.category("fields").add("code", CodeField); diff --git a/sf_machine_connect/static/src/js/barcode_form.js b/sf_machine_connect/static/src/js/barcode_form.js index f6190918..3eefda66 100644 --- a/sf_machine_connect/static/src/js/barcode_form.js +++ b/sf_machine_connect/static/src/js/barcode_form.js @@ -48,4 +48,4 @@ odoo.define('my_module.barcode_handler', function (require) { return { BarcodeHandlerField: BarcodeHandlerField, }; -}); \ No newline at end of file +}); diff --git a/sf_machine_connect/static/src/js/barcode_handler_field.js b/sf_machine_connect/static/src/js/barcode_handler_field.js index 526f28d7..133e0ffe 100644 --- a/sf_machine_connect/static/src/js/barcode_handler_field.js +++ b/sf_machine_connect/static/src/js/barcode_handler_field.js @@ -8,7 +8,7 @@ const { Component, xml } = owl; export class BarcodeHandlerField extends Component { setup() { - this.actionService = useService("action") + this.actionService = useService("action"); const barcode = useService("barcode"); // this.rpc = useService("rpc"); // useBus(barcode.bus, "barcode_scanned", this.onBarcodeScanned.bind(this)); @@ -18,7 +18,7 @@ export class BarcodeHandlerField extends Component { // const { data } = await this.env.services.rpc('/web/dataset/call_kw', params); const response = await this.env.services.rpc('/web/dataset/call_kw', params); // return response - const responseObject = JSON.parse(response) + const responseObject = JSON.parse(response); return responseObject; } @@ -58,8 +58,7 @@ export class BarcodeHandlerField extends Component { } else { // console.error("Barcode not found or RPC call failed."); } - } - + }; } BarcodeHandlerField.template = xml``; diff --git a/sf_machine_connect/wizard/action_up.py b/sf_machine_connect/wizard/action_up.py index ffcb88ad..e2d160cd 100644 --- a/sf_machine_connect/wizard/action_up.py +++ b/sf_machine_connect/wizard/action_up.py @@ -2,15 +2,11 @@ import base64 import logging import os -import json -import hashlib -import time from datetime import datetime -import requests -from odoo import fields, models, api, _ -from odoo.exceptions import ValidationError +from odoo import fields, models +# from odoo.exceptions import ValidationError from odoo.exceptions import UserError -from odoo.addons.sf_machine_connect.models import py2opcua, ftp_operate +from odoo.addons.sf_machine_connect.models import ftp_operate _logger = logging.getLogger(__name__) diff --git a/sf_manufacturing/static/src/js/kanban_change.js b/sf_manufacturing/static/src/js/kanban_change.js index 7e425e3b..edef0285 100644 --- a/sf_manufacturing/static/src/js/kanban_change.js +++ b/sf_manufacturing/static/src/js/kanban_change.js @@ -17,16 +17,10 @@ class CustomKanbanController extends KanbanController { this.workOrders = await this.getAllWorkOrders(); // this.workOrdersNew = this.workOrders; // console.log('lines222222222', this.workOrders); - // // console.log(typeof this.workOrders); // console.log(Array.isArray(this.workOrders)); - // // console.log(this.workOrders.every(order => // typeof order === 'object' && order.id !== undefined)); - - - - // var aDiv = document.getElementsByClassName('o_kanban_record') // for (var i = 0; i < aDiv.length; i++) { // console.log(aDiv[i]) @@ -37,7 +31,6 @@ class CustomKanbanController extends KanbanController { buttonClick(ev) { const button = ev.currentTarget; const id = button.getAttribute('data-id'); - // console.log('true_id', id); // const context = {production_line_show: 'shengchanxian1'} this.env.services.rpc('/web/dataset/call_kw', { @@ -58,8 +51,8 @@ class CustomKanbanController extends KanbanController { // console.log('response', response); location.reload(); window.onload = function () { - button.classList.add('choose') - } + button.classList.add('choose'); + }; }); }); } @@ -82,8 +75,6 @@ class CustomKanbanController extends KanbanController { // 你可以在这里处理响应，例如将其存储在控制器的状态中 return response; } - - } CustomKanbanController.template = "sf_manufacturing.CustomKanbanView1"; @@ -94,4 +85,4 @@ export const customKanbanView = { }; // Register it to the views registry -registry.category("views").add("custom_kanban1", customKanbanView); \ No newline at end of file +registry.category("views").add("custom_kanban1", customKanbanView); diff --git a/sf_quality/models/custom_quality.py b/sf_quality/models/custom_quality.py index 1887da7a..c700b88b 100644 --- a/sf_quality/models/custom_quality.py +++ b/sf_quality/models/custom_quality.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from odoo import models, fields, api, _ +from odoo import models, fields class SfQualityPoint(models.Model): diff --git a/sf_warehouse/static/src/colorGuide.js b/sf_warehouse/static/src/colorGuide.js index c6cc0f94..dd5a4b02 100644 --- a/sf_warehouse/static/src/colorGuide.js +++ b/sf_warehouse/static/src/colorGuide.js @@ -1,12 +1,11 @@ odoo.define('sf_warehouse.custom_kanban', function (require) { - "use strict" + "use strict"; var KanbanRenderer = require('web.KanbanRenderer'); KanbanRenderer.include({ _render: function () { var self = this; return this._super.apply(this, arguments).then(function () { - var colorGuide = $('
\ \ \ @@ -16,5 +15,4 @@ odoo.define('sf_warehouse.custom_kanban', function (require) { }); }, }); - -}); \ No newline at end of file +}); diff --git a/sf_warehouse/static/src/js/cust_char.js b/sf_warehouse/static/src/js/cust_char.js index 3757bfb8..9a529d42 100644 --- a/sf_warehouse/static/src/js/cust_char.js +++ b/sf_warehouse/static/src/js/cust_char.js @@ -1,9 +1,7 @@ /** @odoo-module **/ -import { registry } from "@web/core/registry"; -import { CharField } from '@web/views/fields/char/char_field'; - - +import {registry} from "@web/core/registry"; +import {CharField} from '@web/views/fields/char/char_field'; // 继承CharField组件实现自定义组件:当光标聚焦于输入框时，选中输入框内容 class CustomChar extends CharField { @@ -20,7 +18,7 @@ class CustomChar extends CharField { // 当光标聚焦于输入框时，选中输入框内容 this.input.el.addEventListener('focus', function () { this.select(); - }) + }); } @@ -72,13 +70,13 @@ class CustomChar extends CharField { // } // } - // this.$input.on('focus', function () { - // $(this).select(); - // }); + // this.$input.on('focus', function () { + // $(this).select(); + // }); // 当光标聚焦于输入框时，选中输入框内容 } -registry.category("fields").add("custom_char", CustomChar); \ No newline at end of file +registry.category("fields").add("custom_char", CustomChar); diff --git a/sf_warehouse/static/src/js/custom_kanban_controller.js b/sf_warehouse/static/src/js/custom_kanban_controller.js index 7b9d01fb..62c83505 100644 --- a/sf_warehouse/static/src/js/custom_kanban_controller.js +++ b/sf_warehouse/static/src/js/custom_kanban_controller.js @@ -1,8 +1,8 @@ /** @odoo-module */ -import { KanbanController } from "@web/views/kanban/kanban_controller"; -import { kanbanView } from "@web/views/kanban/kanban_view"; -import { registry } from "@web/core/registry"; +import {KanbanController} from "@web/views/kanban/kanban_controller"; +import {kanbanView} from "@web/views/kanban/kanban_view"; +import {registry} from "@web/core/registry"; // the controller usually contains the Layout and the renderer. class CustomKanbanController extends KanbanController { @@ -18,4 +18,4 @@ export const customKanbanView = { }; // Register it to the views registry -registry.category("views").add("custom_kanban", customKanbanView); \ No newline at end of file +registry.category("views").add("custom_kanban", customKanbanView); diff --git a/sf_warehouse/static/src/js/custom_many2one.js b/sf_warehouse/static/src/js/custom_many2one.js index c6a86af5..592d910b 100644 --- a/sf_warehouse/static/src/js/custom_many2one.js +++ b/sf_warehouse/static/src/js/custom_many2one.js @@ -1,8 +1,7 @@ /** @odoo-module **/ -import { registry } from "@web/core/registry"; -import { Many2OneField } from '@web/views/fields/many2one/many2one_field'; - +import {registry} from "@web/core/registry"; +import {Many2OneField} from '@web/views/fields/many2one/many2one_field'; // 继承FieldMany2One组件实现自定义组件:当光标聚焦于输入框时，选中输入框内容 @@ -17,12 +16,13 @@ class CustomMany2One extends Many2OneField { // console.log('CustomMany2One.setup11111111111111'); super.setup(); } + onMounted() { // console.log('CustomMany2One.onMounted1'); // 当光标聚焦于输入框时，选中输入框内容 this.input.el.addEventListener('focus', function () { this.select(); - }) + }); } } diff --git a/web_widget_model_viewer/static/src/js/3d_viewer.js b/web_widget_model_viewer/static/src/js/3d_viewer.js index 3c66b142..15374070 100644 --- a/web_widget_model_viewer/static/src/js/3d_viewer.js +++ b/web_widget_model_viewer/static/src/js/3d_viewer.js @@ -26,15 +26,15 @@ export class StepViewer extends Component { model: this.props.record.resModel, id: JSON.stringify(this.props.record.data['id']), field: this.props.name - } - url = url_props['base_url'].replace('http://', 'https://') + '/web/content/' + url_props['model'] + '/' + url_props['id'] + '/' + url_props['field'] + '?download=true' + }; + url = url_props['base_url'].replace('http://', 'https://') + '/web/content/' + url_props['model'] + '/' + url_props['id'] + '/' + url_props['field'] + '?download=true'; // url = 'http://localhost:8069'+'/web/content/'+url_props['model']+'/'+url_props['id']+'/'+url_props['field']+'?download=true' // console.log('url111111', url) - return url + return url; } else { url = "data:model/gltf-binary;base64," + this.props.value; // console.log('url2', url) - return url + return url; // localStorage.setItem('url',url) // let new_url = localStorage.getItem(('url')) // var oViewer = document.getElementsByTagName('model-viewer')[0];