From f01a300aaef2d3262ecdf9902dbefa48c691bfb2 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Fri, 22 Nov 2024 17:56:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E4=BB=A3=E7=A0=81?=
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 | 2 +-
 sf_manufacturing/views/mrp_workorder_view.xml             | 2 +-
 sf_sale/models/quick_easy_order.py                        | 4 ++--
 sf_sale/models/quick_easy_order_old.py                    | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 210a27d0..b01cc465 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -9,8 +9,8 @@ from odoo.exceptions import ValidationError, UserError
 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 f0615962..725f5eb8 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -102,7 +102,7 @@
                            attrs="{'invisible': [('production_type', 'not in', ['自动化产线加工'])]}"/>
                     <field name="programming_no" readonly="1"
                            attrs="{'invisible': [('production_type', 'not in', ['自动化产线加工'])]}"/>
-                    <field name="programming_state" readonly="0"
+                    <field name="programming_state" readonly="1"
                            attrs="{'invisible': [('production_type', 'not in', ['自动化产线加工'])]}"
                            decoration-success="programming_state == '已编程'"
                            decoration-warning="programming_state =='编程中'"
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index b5879f30..1faec0ac 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -250,7 +250,7 @@
                 <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="0" cache="True"
+                  <field name="rfid_code" force_save="1" readonly="1" cache="True"
                        attrs="{'invisible': [('rfid_code_old', '!=', False)]}"  />
                 <field name="rfid_code" string="RFID码(手动输入框)" force_save="1" readonly="0" cache="True"
                        attrs="{'invisible': ['|',('rfid_code_old', '!=', False), ('is_test_env', '=', False)]}"/>
diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py
index cb1886a1..081807a4 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 d963d021..87848e3a 100644
--- a/sf_sale/models/quick_easy_order_old.py
+++ b/sf_sale/models/quick_easy_order_old.py
@@ -5,8 +5,8 @@ import requests
 import os
 from datetime import datetime
 # 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