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

Merge Request: 物流可见性控制，优化警告问题

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/697?initial=true

sf_machine_connect/models/ftp_client.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 import os
-import time
 import json
 import base64
 import logging
@@ -9,7 +8,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.addons.sf_machine_connect.models import py2opcua, ftp_operate
 
@@ -466,7 +465,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',

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);

sf_machine_connect/static/src/js/barcode_form.js

@@ -48,4 +48,4 @@ odoo.define('my_module.barcode_handler', function (require) {
     return {
         BarcodeHandlerField: BarcodeHandlerField,
     };
-});
+});

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``;

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__)