From 4c75417f2a8abf389f63a485fe296e1b2d4c5e19 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Tue, 25 Apr 2023 22:22:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_machine_connect/views/compensation.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sf_machine_connect/views/compensation.xml b/sf_machine_connect/views/compensation.xml
index 4804df61..a6f47b23 100644
--- a/sf_machine_connect/views/compensation.xml
+++ b/sf_machine_connect/views/compensation.xml
@@ -19,8 +19,6 @@
                                     class="btn-primary" attrs='{"invisible": ["|",
                                     ("state","!=","progress"),("user_permissions","=",False)]}'/>
                                 <span>&#32;</span>
-<!--                                <field name="button_up_all_state" attrs='{"invisible": ["|",-->
-<!--                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>-->
                                 <button string="一键下发" name="up_all" type="object" style="text-align: right;" confirm="是否确认一键下发"
                                     class="btn-primary" context="{'default_workorder_id': id}"  attrs='{"invisible": ["|",
                                     ("state","!=","progress"),("user_permissions","=",False)]}'/>

From 69aa7319901b5c33403b939308300547e0784df4 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Wed, 26 Apr 2023 17:35:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B9=B3=E6=9D=BF?=
 =?UTF-8?q?=E6=89=AB=E7=A0=81=E7=BB=91=E5=AE=9A=E6=89=98=E7=9B=98=E7=9A=84?=
 =?UTF-8?q?=E6=B8=B2=E6=9F=93=E5=BD=A2=E5=BC=8F=E4=BB=A5=E5=8F=8A=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_machine_connect/static/src/js/barcode_button.js   | 5 ++---
 sf_machine_connect/static/src/xml/barcode_button.xml | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/sf_machine_connect/static/src/js/barcode_button.js b/sf_machine_connect/static/src/js/barcode_button.js
index 8bd48d65..c6554598 100644
--- a/sf_machine_connect/static/src/js/barcode_button.js
+++ b/sf_machine_connect/static/src/js/barcode_button.js
@@ -98,9 +98,8 @@ export class CodeField extends Component {
                     }]);
                   console.log(updatetrayRecord)
                 });
-                this.props.update(records[0].code, records[0].tray_id);
-                location.replace(location.href)
-                // location.reload()
+                this.props.update(records[0].code);
+                $('.o_form_button_save').click();
             } else {
                 if (records[0].state === '占用') {
                     console.log('此托盘已占用，请检查')
diff --git a/sf_machine_connect/static/src/xml/barcode_button.xml b/sf_machine_connect/static/src/xml/barcode_button.xml
index 215f4cd0..d380e222 100644
--- a/sf_machine_connect/static/src/xml/barcode_button.xml
+++ b/sf_machine_connect/static/src/xml/barcode_button.xml
@@ -12,7 +12,6 @@
                     aria-label="Scan barcode"
                     title="Scan barcode"
                     data-tooltip="Scan barcode"
-                    style="position: absolute !important;"
                 />
                 </div>