From 1d399527e063d657e80a9d36344d21c8fd71303e Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Tue, 20 Aug 2024 10:42:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A3=85=E5=A4=B9=E9=A2=84?=
 =?UTF-8?q?=E8=B0=83=E5=B7=A5=E5=8D=95=E6=89=AB=E7=A0=81=E5=BC=80=E5=90=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/static/src/js/customRFID.js  | 12 +++++++-----
 sf_manufacturing/views/mrp_workorder_view.xml |  7 ++++++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/sf_manufacturing/static/src/js/customRFID.js b/sf_manufacturing/static/src/js/customRFID.js
index 8f775350..eced2e70 100644
--- a/sf_manufacturing/static/src/js/customRFID.js
+++ b/sf_manufacturing/static/src/js/customRFID.js
@@ -1,15 +1,17 @@
 var RFID = ''
 $(document).off('keydown')
-console.log(2222)
-$(document).on('keydown', '.modal.d-block.o_technical_modal,body.o_web_client', function (e) {
-    const dom = $('.customRFID')
-    if(!dom.length) return
+$(document).on('keydown', 'body.o_web_client', function (e) {
     setTimeout(() => {
         RFID = ''
     }, 200)
+
     if(e.key == 'Enter' && e.keyCode == 13 || e.key == 'Tab' && e.keyCode == 9){
+        console.log(RFID)
         if(!RFID || RFID.length <= 3) return;
-        dom.children('span').text(RFID)
+        $('[name="button_start"]').trigger('click')
+        setTimeout(() => {
+            $('.o_dialog .modal-footer .btn-primary').trigger('click')
+        }, 50)
         RFID = ''
         return;
     }
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index b0815ed5..fb29dc96 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -118,6 +118,9 @@
         <field name="model">mrp.workorder</field>
         <field name="inherit_id" ref="mrp.mrp_production_workorder_form_view_inherit"/>
         <field name="arch" type="xml">
+            <xpath expr="//form" position="inside">
+                <script src="sf_manufacturing/static/src/js/customRFID.js"/>
+            </xpath>
             <xpath expr="//header/field[@name='state']" position="replace">
                 <field name="state" widget="statusbar"
                        statusbar_visible="pending,waiting,ready,progress,to be detected,done,rework"/>
@@ -161,7 +164,9 @@
 <!--                <button name="button_start" type="object" string="开始" class="btn-success" confirm="是否确认开始"-->
 <!--                        attrs="{'invisible': ['|', '|', '|', ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel','to be detected')), ('is_user_working', '!=', False)]}"/>-->
                 <button name="button_start" type="object" string="开始" class="btn-success" confirm="是否确认开始"
-                        attrs="{'invisible': ['|', '|', '|', '|', ('routing_type', '=', '解除装夹'), ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel','to be detected')), ('is_user_working', '!=', False)]}"/>
+                        attrs="{'invisible': ['|', '|', '|', '|', '|', ('routing_type', '=', '装夹预调'), ('routing_type', '=', '解除装夹'), ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel','to be detected')), ('is_user_working', '!=', False)]}"/>
+                <button name="button_start" type="object" string="开始" class="btn-success"
+                        attrs="{'invisible': ['|', '|', '|', '|', ('routing_type', '!=', '装夹预调'), ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel','to be detected')), ('is_user_working', '!=', False)]}"/>
                 <button name="button_pending" type="object" string="暂停" class="btn-warning"
                         attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False)]}"/>
                 <button name="button_finish" type="object" string="完成" class="btn-success" confirm="是否确认完工"