From cab9e08066c76e4f1cf95923b46601d01d59b206 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Thu, 24 Oct 2024 15:50:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9Enter=E7=9A=84?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/static/src/js/qr.js          | 2 +-
 sf_manufacturing/views/mrp_workorder_view.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sf_manufacturing/static/src/js/qr.js b/sf_manufacturing/static/src/js/qr.js
index ec148933..fd501f27 100644
--- a/sf_manufacturing/static/src/js/qr.js
+++ b/sf_manufacturing/static/src/js/qr.js
@@ -27,7 +27,7 @@ class QRCodeWidget extends Component {
     onGlobalKeyDown(event) {
 
         // 如果是Tab键，表示扫码输入结束
-        if (event.key === 'Tab') {
+        if (event.key === 'Tab' || event.key === 'Enter') {
             this.qrCodeValue = this.inputBuffer;  // 完整条码赋值
             console.log('完整条码:', this.qrCodeValue);
             this.onQRCodeChange(this.qrCodeValue);  // 调用父组件的 onQRCodeChange 方法
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index a34c5c51..708a9779 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -247,8 +247,8 @@
                 <field name='process_state' invisible="1"/>
                 <field name='tag_type' readonly="1" attrs='{"invisible": [("tag_type","=",False)]}'
                        decoration-danger="tag_type == '重新加工'"/>
-                <field name="rfid_code" force_save="1" readonly="0" cache="True"
-                       attrs="{'invisible': [('rfid_code_old', '!=', False)]}"/>
+                <field name="rfid_code" force_save="1" readonly="1" cache="True"
+                       attrs="{'invisible': [('rfid_code_old', '!=', False)]}" widget='qrcode_widget'/>
                 <field name="rfid_code_old" readonly="1" attrs="{'invisible': [('rfid_code_old', '=', False)]}"/>
 
             </xpath>