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

Accept Merge Request #676: (feature/制造代码优化 -> develop)

Browse Source 
Merge Request: 优化代码结构

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/676?initial=true
This commit is contained in:
马广威
2023-11-20 17:42:54 +08:00
committed by Coding
parent 31f07c5156 7391b1324d
commit 247b3e4444
3 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_bf_connect/models/process_status.py
View File

@@ -1,10 +1,10 @@
from datetime import datetime
from collections import defaultdict, namedtuple
import logging
import requests
from odoo import api, fields, models, SUPERUSER_ID, _
from odoo.exceptions import UserError
from odoo.exceptions import ValidationError
from collections import defaultdict, namedtuple
_logger = logging.getLogger(__name__)

7
sf_manufacturing/models/stock.py
View File

@@ -1,13 +1,14 @@
# -*- coding: utf-8 -*-
import base64
from collections import defaultdict, namedtuple
import logging
from re import findall as regex_findall
from datetime import datetime
import json
from re import split as regex_split
from re import findall as regex_findall
from datetime import datetime, timedelta
import requests
from odoo import SUPERUSER_ID, _, api, fields, models
from odoo.tools import float_compare
from collections import defaultdict, namedtuple
from odoo.addons.stock.models.stock_rule import ProcurementException
from odoo.addons.sf_base.commons.common import Common
from odoo.exceptions import UserError

14
web_widget_model_viewer/static/src/js/3d_viewer.js
View File

@@ -3,20 +3,14 @@
import {registry} from "@web/core/registry";
import {_lt} from "@web/core/l10n/translation";
import {standardFieldProps} from "@web/views/fields/standard_field_props";
import {useInputField} from "@web/views/fields/input_field_hook";
import {FileUploader} from "@web/views/fields/file_handler";
import {session} from "@web/session";
import {useService} from "@web/core/utils/hooks";
import {isBinarySize} from "@web/core/utils/binary";
import {download} from "@web/core/network/download";
import utils from 'web.utils';
import core from 'web.core';
import rpc from 'web.rpc';
var QWeb = core.qweb;
import {Component, onWillUpdateProps, useState, useRef, useEffect} from "@odoo/owl";
import {Component} from "@odoo/owl";
export class StepViewer extends Component {
setup() {
@@ -35,11 +29,11 @@ export class StepViewer extends Component {
}
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)
// console.log('url111111', url)
return url
} else {
url = "data:model/gltf-binary;base64," + this.props.value;
console.log('url2', url)
// console.log('url2', url)
return url
// localStorage.setItem('url',url)
// let new_url = localStorage.getItem(('url'))