From f4eb378bea7cbf1d5fb25982892ee8a1d111c738 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Wed, 26 Jun 2024 10:17:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=B6=E9=80=A0=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=EF=BC=9A=E6=97=A0=E5=B7=A5=E5=8D=95=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95page=E9=9C=80=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/product_template.py               | 4 ++--
 sf_manufacturing/views/mrp_production_addional_change.xml | 7 ++++---
 sf_sale/models/quick_easy_order.py                        | 4 ++--
 sf_sale/models/quick_easy_order_old.py                    | 4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 71522528..cea53c64 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -7,8 +7,8 @@ import os
 from odoo import models, fields, api, _
 from odoo.exceptions import ValidationError
 from odoo.modules import get_resource_path
-# from OCC.Extend.DataExchange import read_step_file
-# from OCC.Extend.DataExchange import write_stl_file
+from OCC.Extend.DataExchange import read_step_file
+from OCC.Extend.DataExchange import write_stl_file
 
 
 class ResProductMo(models.Model):
diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index e1d0d28c..58cdb2c4 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -68,7 +68,6 @@
                         progress,pending_cam,pending_processing,pending_era_cam,completed,done
                     </attribute>
                 </xpath>
-
                 <xpath expr="//sheet//group//group[2]//label" position="before">
                     <!--                     <field name="process_state"/> -->
                     <field name="state"/>
@@ -79,8 +78,8 @@
                     <field name="programming_no" readonly="1"/>
                     <field name="work_state" invisible="1"/>
                     <field name="schedule_state" invisible='1'/>
-                    <field name="manual_quotation" readonly="1"/>
                     <field name="programming_state" readonly="1"/>
+                    <field name="manual_quotation" readonly="1"/>
                 </xpath>
                 <xpath expr="//field[@name='user_id']" position="before">
                     <field name="plan_start_processing_time" readonly="1"/>
@@ -255,7 +254,9 @@
                 </xpath>
 
                 <xpath expr="//sheet//notebook//page[@name='operations']" position="attributes">
-                    <attribute name="attrs">{'invisible': [('schedule_state', '=', '未排')]}</attribute>
+                    <attribute name="attrs">{'invisible': ['|',('schedule_state', '=', '未排'),('workorder_ids', '=',
+                        [])]}
+                    </attribute>
                 </xpath>
             </field>
         </record>
diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py
index 11acc06f..e3bf3002 100644
--- a/sf_sale/models/quick_easy_order.py
+++ b/sf_sale/models/quick_easy_order.py
@@ -8,8 +8,8 @@ from datetime import datetime
 import requests
 from odoo import http
 from odoo.http import request
-# from OCC.Extend.DataExchange import read_step_file
-# from OCC.Extend.DataExchange import write_stl_file
+from OCC.Extend.DataExchange import read_step_file
+from OCC.Extend.DataExchange import write_stl_file
 from odoo import models, fields, api
 from odoo.modules import get_resource_path
 from odoo.exceptions import ValidationError, UserError
diff --git a/sf_sale/models/quick_easy_order_old.py b/sf_sale/models/quick_easy_order_old.py
index 92f6cda2..3ae65db3 100644
--- a/sf_sale/models/quick_easy_order_old.py
+++ b/sf_sale/models/quick_easy_order_old.py
@@ -6,8 +6,8 @@ import os
 from datetime import datetime
 from stl import mesh
 # from OCC.Core.GProp import GProp_GProps
-# from OCC.Extend.DataExchange import read_step_file
-# from OCC.Extend.DataExchange import write_stl_file
+from OCC.Extend.DataExchange import read_step_file
+from OCC.Extend.DataExchange import write_stl_file
 from odoo.addons.sf_base.commons.common import Common
 from odoo import models, fields, api
 from odoo.modules import get_resource_path