From d8e8babbd3fb927442a1721aca09fd212af60ed0 Mon Sep 17 00:00:00 2001
From: liaodanlong <liaodanlong@jikimo.com>
Date: Fri, 21 Feb 2025 10:28:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E8=AF=A6=E6=83=85=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=9B=9E=E9=80=80=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_workorder.py      |  8 ++---
 sf_manufacturing/views/mrp_workorder_view.xml | 29 ++++++++++++-------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 1edf529d..dfae3d16 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -178,9 +178,9 @@ class ResMrpWorkOrder(models.Model):
                     [('workorder_id', '=', self.id)])
                 for check_order in quality_check:
                     if check_order.point_id.is_inspect:
-                        check_order.state = 'waiting'
+                        check_order.quality_state = 'waiting'
                     else:
-                        check_order.state = 'none'
+                        check_order.quality_state = 'none'
                     # move_dest_ids
                 finished_quants = moves.mapped('move_line_ids.lot_id.quant_ids')
                 finished_quants.quantity = 0
@@ -204,9 +204,9 @@ class ResMrpWorkOrder(models.Model):
                 [('workorder_id', '=', self.id)])
             for check_order in quality_check:
                 if check_order.point_id.is_inspect:
-                    check_order.state = 'waiting'
+                    check_order.quality_state = 'waiting'
                 else:
-                    check_order.state = 'none'
+                    check_order.quality_state = 'none'
 
     def _compute_working_users(self):
         super()._compute_working_users()
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index dab95f1b..bd94e9c9 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -61,7 +61,8 @@
             </xpath>
 
             <xpath expr="//button[@name='button_start']" position="after">
-                <button name="button_back" string="回退" type="object" class="btn-primary" attrs="{'invisible': [('back_button_display', '=', False)]}"  confirm="是否确认回退"/>
+                <button name="button_back" string="回退" type="object" class="btn-primary"
+                        attrs="{'invisible': [('back_button_display', '=', False)]}" confirm="是否确认回退"/>
             </xpath>
             <xpath expr="//button[@name='%(mrp.act_mrp_block_workcenter_wo)d']" position="attributes">
                 <attribute name="attrs">{'invisible':
@@ -168,7 +169,8 @@
                 <field name='is_delivery' invisible="1"/>
                 <field name="is_trayed" invisible="1"/>
                 <field name="is_inspect" invisible="1"/>
-<!--                <field name="rework_flag" invisible="1"/>-->
+                <field name="back_button_display" invisible="1"/>
+                <!--                <field name="rework_flag" invisible="1"/>-->
                 <!--                <field name='is_send_program_again' invisible="1"/>-->
                 <!--                 工单form页面的开始停工按钮等 -->
                 <!--                 <button name="button_start" type="object" string="开始" class="btn-success" -->
@@ -183,6 +185,8 @@
 
                 <!--                <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_back" string="回退" type="object" class="btn-primary"
+                        attrs="{'invisible': [('back_button_display', '=', False)]}" confirm="是否确认回退"/>
                 <button name="button_start" type="object" string="开始" class="btn-success"
                         attrs="{'invisible': [('state', '!=', 'ready')]}"/>
                 <button name="button_pending" type="object" string="暂停" class="btn-warning"
@@ -217,12 +221,13 @@
                         attrs="{'invisible': ['|', '|', '|', ('routing_type','!=','装夹预调'),('state','!=','progress'), ('is_trayed', '=', False), ('state', 'in', ('done'))]}"/>
                 <button name="print_method" type="object" string="打印二维码" class="btn-primary"
                         attrs="{'invisible': ['|',('routing_type','!=','解除装夹'),('state','!=','done')]}"/>
-<!--                <button type="object" class="oe_highlight jikimo_button_confirm" name="button_rework"-->
-<!--                        string="返工"-->
-<!--                        attrs='{"invisible": [("rework_flag","=",True)]}' confirm="是否返工"/>-->
+                <!--                <button type="object" class="oe_highlight jikimo_button_confirm" name="button_rework"-->
+                <!--                        string="返工"-->
+                <!--                        attrs='{"invisible": [("rework_flag","=",True)]}' confirm="是否返工"/>-->
             </xpath>
             <xpath expr="//page[1]" position="before">
-                <page string="开料要求" attrs='{"invisible": [("routing_type","not in",("切割", "线切割", "人工线下加工"))]}'>
+                <page string="开料要求"
+                      attrs='{"invisible": [("routing_type","not in",("切割", "线切割", "人工线下加工"))]}'>
                     <group>
                         <group>
                             <field name="product_tmpl_id_materials_id" widget="many2one"/>
@@ -263,8 +268,8 @@
                 <field name='tag_type' readonly="1" attrs='{"invisible": [("tag_type","=",False)]}'
                        decoration-danger="tag_type == '重新加工'"/>
                 <field name="is_test_env" invisible="1"/>
-                  <field name="rfid_code" force_save="1" readonly="1" cache="True"
-                       attrs="{'invisible': [('rfid_code_old', '!=', False)]}"  widget="qrcode_widget"/>
+                <field name="rfid_code" force_save="1" readonly="1" cache="True"
+                       attrs="{'invisible': [('rfid_code_old', '!=', False)]}" widget="qrcode_widget"/>
                 <field name="rfid_code" string="RFID码(手动输入框)" force_save="1" readonly="0" cache="True"
                        attrs="{'invisible': ['|',('rfid_code_old', '!=', False), ('is_test_env', '=', False)]}"/>
                 <field name="rfid_code_old" readonly="1" attrs="{'invisible': [('rfid_code_old', '=', False)]}"/>
@@ -321,7 +326,7 @@
             <xpath expr="//page[1]" position="before">
                 <page string="工件装夹" attrs='{"invisible": [("routing_type","!=","装夹预调")]}'>
                     <group>
-<!--                         <field name="_barcode_scanned" widget="barcode_handler"/> -->
+                        <!--                         <field name="_barcode_scanned" widget="barcode_handler"/> -->
                         <group string="托盘">
                             <field name="tray_serial_number" readonly="1" string="序列号"/>
                         </group>
@@ -498,7 +503,8 @@
                     </group>
                 </page>
 
-                <page string="2D加工图纸" attrs='{"invisible": [("routing_type","not in",["装夹预调", "人工线下加工"])]}'>
+                <page string="2D加工图纸"
+                      attrs='{"invisible": [("routing_type","not in",["装夹预调", "人工线下加工"])]}'>
                     <field name="machining_drawings" widget="adaptive_viewer"/>
                 </page>
 
@@ -647,7 +653,8 @@
         <field name="inherit_id" ref="sf_manufacturing.view_mrp_production_workorder_tray_form_inherit_sf"/>
         <field name="arch" type="xml">
             <xpath expr="//form//sheet//group//group[2]" position="replace">
-                <group string="装夹图纸" attrs="{'invisible': [('routing_type', 'not in', ['装夹预调', '人工线下加工'])]}">
+                <group string="装夹图纸"
+                       attrs="{'invisible': [('routing_type', 'not in', ['装夹预调', '人工线下加工'])]}">
                     <!--                         隐藏加工图纸字段名 -->
                     <field name="processing_drawing" widget="pdf_viewer" string="" readonly="1"/>
                     <!--                    <field name="production_id" invisible="0"/>-->