Merge branch develop into feature/增加一键合并下发功能，修正合并下发逻辑

sf_machine_connect/__manifest__.py

@@ -12,7 +12,7 @@
     'category': 'sf',
     'author': 'jikimo',
     'website': 'https://sf.cs.jikimo.com',
-    'depends': ['sf_base', 'sf_manufacturing', 'barcodes', ],
+    'depends': ['sf_manufacturing', 'barcodes', ],
     'data': [
         # 定义权限组放在最上面
         # 权限组
@@ -33,8 +33,11 @@
     ],
 
     'assets': {
+        'web.assets_backend': [
+            'sf_machine_connect/static/src/js/*'
+        ],
     },
-
+    'license': 'LGPL-3',
     'installable': True,
     'application': True,
     # 'auto_install': False,

sf_machine_connect/static/src/js/test.js

@@ -102,9 +102,6 @@ export class CodeField extends Component {
         this.orm = this.env.services.orm;
         this.record = this.props.record;
     }
-    // get domain() {
-    //     return this.props.record.getFieldDomain(this.props.name);
-
      async onBarcodeBtnClick() {
         // console.log(BarcodeScanner)
         const barcode = await BarcodeScanner.scanBarcode();
@@ -114,6 +111,7 @@ export class CodeField extends Component {
         if (barcode) {
             // console.log("存在")
             // alert('存在')
+
              await this.onBarcodeScanned(barcode);
             if ("vibrate" in browser.navigator) {
                 browser.navigator.vibrate(100);