From 424754db1ab9026d8e7ae97320ad0b2933c3de38 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Tue, 27 Feb 2024 10:37:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1.=E5=B7=A5=E5=8D=95=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9E=E5=B7=A5=E5=BA=8F=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=92=8C=E7=8A=B6=E6=80=81=E6=90=9C=E7=B4=A2=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=BF=202.=E9=94=80=E5=94=AE=E6=A8=A1=E5=9D=97=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9Edelivery=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/WorkCenterBarcodes.xml              | 23 +++++++++++--------
 sf_sale/__manifest__.py                       |  2 +-
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/sf_machine_connect/views/WorkCenterBarcodes.xml b/sf_machine_connect/views/WorkCenterBarcodes.xml
index ca2c3d61..0a0cccd6 100644
--- a/sf_machine_connect/views/WorkCenterBarcodes.xml
+++ b/sf_machine_connect/views/WorkCenterBarcodes.xml
@@ -2,18 +2,23 @@
 <odoo>
     <record id="workcenter_form_vieww_scan_barcode_search" model="ir.ui.view">
         <field name="name">work.order.search</field>
-<!--        <field name="model">mrp.workcenter</field>-->
+        <!--        <field name="model">mrp.workcenter</field>-->
         <field name="model">mrp.workorder</field>
         <field name="inherit_id" ref="mrp.view_mrp_production_work_order_search"/>
         <field name="arch" type="xml">
-                <xpath expr="//field[@name='production_id']" position="before">
-<!--                    <field name="name" filter_domain="['|', '|', ('明确的字段内容', 'ilike', self), ('shortdesc', 'ilike', self), ('name', 'ilike', self)]" string="Theme"/>-->
-<!--                    <field name="tray_code" filter_domain="[('production_id.tray_ids.code','=',self)]"/>-->
-<!--                    <field name="production_id"/>-->
-                </xpath>
-<!--                <xpath expr="//search//group//filter[@name='product']" position="before">-->
-<!--                    <filter string="Tray code" name="traycode" domain="[]" context="{'group_by': 'tray_code'}"/>-->
-<!--                </xpath>-->
+            <xpath expr="//group" position="before">
+                <searchpanel>
+                    <field name="routing_type" select="multi" string="工序类型" icon="fa-building" enable_counters="1"/>
+                    <field name="state" select="multi" string="状态" icon="fa-building" enable_counters="1"/>
+                </searchpanel>
+
+                <!--                    <field name="name" filter_domain="['|', '|', ('明确的字段内容', 'ilike', self), ('shortdesc', 'ilike', self), ('name', 'ilike', self)]" string="Theme"/>-->
+                <!--                    <field name="tray_code" filter_domain="[('production_id.tray_ids.code','=',self)]"/>-->
+                <!--                    <field name="production_id"/>-->
+            </xpath>
+            <!--                <xpath expr="//search//group//filter[@name='product']" position="before">-->
+            <!--                    <filter string="Tray code" name="traycode" domain="[]" context="{'group_by': 'tray_code'}"/>-->
+            <!--                </xpath>-->
 
         </field>
     </record>
diff --git a/sf_sale/__manifest__.py b/sf_sale/__manifest__.py
index 6d340058..efe72de6 100644
--- a/sf_sale/__manifest__.py
+++ b/sf_sale/__manifest__.py
@@ -10,7 +10,7 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['sale', 'sale_management', 'web_widget_model_viewer', 'sf_base', 'account', 'purchase'],
+    'depends': ['sale', 'sale_management', 'web_widget_model_viewer', 'sf_base', 'account', 'purchase', 'delivery'],
     'data': [
         'security/group_security.xml',
         'security/ir.model.access.csv',

From 545c1a0407c6ad9da67c1d4532933be53ea10c67 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Tue, 27 Feb 2024 10:46:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E6=80=BB=E7=9B=91=E5=AE=A1=E6=A0=B8=E6=9C=AA=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=8C=89=E9=92=AE=E6=9C=AA=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_sale/views/sale_order_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml
index e6e7e8a2..de37ae7a 100644
--- a/sf_sale/views/sale_order_view.xml
+++ b/sf_sale/views/sale_order_view.xml
@@ -73,7 +73,7 @@
                     <field name="schedule_status" invisible="1"/>
                     <button name="sf_sale.action_sale_order_check_wizard" string="审核" type="action"
                             context="{'default_order_id':active_id}" groups="sf_base.group_sale_director"
-                            attrs="{'invisible': ['|',('check_status','in', ['approved',False]),('state', 'in', ['cancel'])]}"
+                            attrs="{'invisible': ['|',('check_status','in', ['approved',False,'fail']),('state', 'in', ['cancel'])]}"
                             class="oe_highlight"/>
                 </xpath>
                 <!--                <xpath expr="//form/header/button[@name='action_confirm'][1]" position="attributes">-->