Accept Merge Request #892: (feature/修改机床参数bug -> develop)

Merge Request: 删除工序，加工工艺对象，新增表面工艺可选参数对象

Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/892

sf_base/models/common.py

@@ -90,7 +90,7 @@ class MrsProductionProcess(models.Model):
     code = fields.Char("编码")
     name = fields.Char('名称')
     remark = fields.Text("备注")
-    processing_order_ids = fields.One2many('sf.processing.order', 'production_process_id', string='工序')
+    # processing_order_ids = fields.One2many('sf.processing.order', 'production_process_id', string='工序')
     partner_process_ids = fields.Many2many('res.partner', 'process_ids', '加工工厂')
     active = fields.Boolean('有效', default=True)
     parameter_ids = fields.One2many('sf.production.process.parameter', 'process_id', string='可选参数')
@@ -98,25 +98,25 @@ class MrsProductionProcess(models.Model):
     # workcenter_ids = fields.Many2many('mrp.workcenter', 'rel_workcenter_process', required=True)
 
 
-class MrsProcessingTechnology(models.Model):
+# class MrsProcessingTechnology(models.Model):
-    _name = 'sf.processing.technology'
+#     _name = 'sf.processing.technology'
-    _description = '加工工艺'
+#     _description = '加工工艺'
-
+#
-    name = fields.Char('名称', index=True)
+#     name = fields.Char('名称', index=True)
-    remark = fields.Text('备注', index=True)
+#     remark = fields.Text('备注', index=True)
-    code = fields.Char("编码")
+#     code = fields.Char("编码")
-    processing_order_ids = fields.Many2many('sf.processing.order', 'sf_associated_processes',
+#     processing_order_ids = fields.Many2many('sf.processing.order', 'sf_associated_processes',
-                                            index=True, string='工序')
+#                                             index=True, string='工序')
-    active = fields.Boolean('有效', default=True)
+#     active = fields.Boolean('有效', default=True)
 
 
-class MrsProcessingOrder(models.Model):
+# class MrsProcessingOrder(models.Model):
-    _name = 'sf.processing.order'
+#     _name = 'sf.processing.order'
-    _description = '工序'
+#     _description = '工序'
-    sequence = fields.Integer('Sequence')
+#     sequence = fields.Integer('Sequence')
-    processing_technology_ids = fields.Many2many('sf.processing.technology', 'sf_associated_processes',
+#     processing_technology_ids = fields.Many2many('sf.processing.technology', 'sf_associated_processes',
-                                                 index=True, string='加工工艺')
+#                                                  index=True, string='加工工艺')
-    production_process_id = fields.Many2one('sf.production.process', string="表面工艺")
+#     production_process_id = fields.Many2one('sf.production.process', string="表面工艺")
 
 
 class SupplierSort(models.Model):

sf_base/security/ir.model.access.csv

@@ -9,16 +9,13 @@ access_sf_machine_brand_tags,sf_machine_brand_tags,model_sf_machine_brand_tags,b
 access_sf_machine_brand_tags_admin,sf_machine_brand_tags_admin,model_sf_machine_brand_tags,base.group_system,1,1,1,0
 access_sf_machine_control_system,sf_machine_control_system,model_sf_machine_control_system,base.group_user,1,1,1,0
 access_sf_machine_control_system_admin,sf_machine_control_system_admin,model_sf_machine_control_system,base.group_system,1,1,1,0
-access_sf_processing_order,sf_processing_order,model_sf_processing_order,base.group_user,1,1,1,0
+
-access_sf_processing_order_admin,sf_processing_order_admin,model_sf_processing_order,base.group_system,1,1,1,0
 access_sf_production_process,sf_production_process,model_sf_production_process,base.group_user,1,1,1,0
 access_sf_production_process_admin,sf_production_process_admin,model_sf_production_process,base.group_system,1,1,1,0
 access_sf_production_materials,sf_production_materials,model_sf_production_materials,base.group_user,1,1,1,0
 access_sf_production_materials_admin,sf_production_materials_admin,model_sf_production_materials,base.group_system,1,1,1,0
 access_sf_materials_model,sf_materials_model,model_sf_materials_model,base.group_user,1,1,1,0
 access_sf_materials_model_admin,sf_materials_model_admin,model_sf_materials_model,base.group_system,1,1,1,0
-access_sf_processing_technology,sf_processing_technology,model_sf_processing_technology,base.group_user,1,1,1,0
-access_sf_processing_technology_admin,sf_processing_technology_admin,model_sf_processing_technology,base.group_system,1,1,1,0
 access_sf_supplier_sort,sf_supplier_sort,model_sf_supplier_sort,base.group_user,1,1,1,0
 access_sf_supplier_sort_admin,sf_supplier_sort_admin,model_sf_supplier_sort,base.group_system,1,1,1,0
 access_sf_production_process_parameter,sf_production_process_parameter,model_sf_production_process_parameter,base.group_user,1,1,1,0
@@ -94,7 +91,6 @@ access_sf_machine_brand_group_purchase_director,sf_machine_brand_group_purchase_
 access_sf_machine_brand_group_sale_director,sf_machine_brand_group_sale_director,model_sf_machine_brand,sf_base.group_sale_director,1,0,0,0
 access_sf_machine_brand_tags,sf_machine_brand_tags,model_sf_machine_brand_tags,base.group_user,1,1,1,1
 access_sf_machine_control_system,sf_machine_control_system,model_sf_machine_control_system,sf_base.group_sf_mrp_user,1,0,0,0
-access_sf_processing_order,sf_processing_order,model_sf_processing_order,sf_base.group_sf_mrp_user,1,0,0,0
 access_sf_production_process,sf_production_process,model_sf_production_process,sf_base.group_sf_mrp_user,1,0,0,0
 access_sf_production_materials,sf_production_materials,model_sf_production_materials,sf_base.group_sf_mrp_user,1,0,0,0
 access_sf_production_materials_group_plan_director,sf_production_materials_group_plan_director,model_sf_production_materials,sf_base.group_plan_director,1,1,0,0
@@ -104,7 +100,6 @@ access_sf_materials_model,sf_materials_model,model_sf_materials_model,sf_base.gr
 access_sf_materials_model_group_plan_director,sf_materials_model_group_plan_director,model_sf_materials_model,sf_base.group_plan_director,1,0,0,0
 access_sf_materials_model_group_purchase_director,sf_materials_model_group_purchase_director,model_sf_materials_model,sf_base.group_purchase_director,1,0,0,0
 access_sf_materials_model_group_sale_director,sf_materials_model_group_sale_director,model_sf_materials_model,sf_base.group_sale_director,1,0,0,0
-access_sf_processing_technology,sf_processing_technology,model_sf_processing_technology,sf_base.group_sf_mrp_user,1,0,0,0
 access_sf_supplier_sort,sf_supplier_sort,model_sf_supplier_sort,sf_base.group_sf_mrp_user,1,0,0,0
 access_sf_production_process_parameter,sf_production_process_parameter,model_sf_production_process_parameter,sf_base.group_sf_mrp_user,1,0,0,0
 access_sf_production_process_category,sf_production_process_category,model_sf_production_process_category,sf_base.group_sf_mrp_user,1,0,0,0
@@ -161,11 +156,9 @@ access_sf_machine_tool_type,sf_machine_tool_type,model_sf_machine_tool_type,sf_b
 access_sf_machine_brand,sf_machine_brand,model_sf_machine_brand,sf_base.group_sf_mrp_user,1,1,0,0
 access_sf_machine_brand_tags,sf_machine_brand_tags,model_sf_machine_brand_tags,sf_base.group_sf_mrp_user,1,1,0,0
 access_sf_machine_control_system,sf_machine_control_system,model_sf_machine_control_system,sf_base.group_sf_mrp_user,1,1,0,0
-access_sf_processing_order,sf_processing_order,model_sf_processing_order,sf_base.group_sf_mrp_user,1,1,0,0
 access_sf_production_process,sf_production_process,model_sf_production_process,sf_base.group_sf_mrp_user,1,1,0,0
 access_sf_production_materials,sf_production_materials,model_sf_production_materials,sf_base.group_sf_mrp_user,1,1,0,0
 access_sf_materials_model,sf_materials_model,model_sf_materials_model,sf_base.group_sf_mrp_user,1,1,0,0
-access_sf_processing_technology,sf_processing_technology,model_sf_processing_technology,sf_base.group_sf_mrp_user,1,1,0,0
 access_sf_supplier_sort,sf_supplier_sort,model_sf_supplier_sort,sf_base.group_sf_mrp_user,1,1,0,0
 access_sf_production_process_parameter,sf_production_process_parameter,model_sf_production_process_parameter,sf_base.group_sf_mrp_user,1,1,0,0
 access_sf_production_process_category,sf_production_process_category,model_sf_production_process_category,sf_base.group_sf_mrp_user,1,1,0,0

sf_base/views/common_view.xml

@@ -1,6 +1,60 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <data>
+                <!--表面工艺可选参数-->
+          <record model="ir.ui.view" id="mrs_production_process_parameter_tree">
+            <field name="model">sf.production.process.parameter</field>
+            <field name="arch" type="xml">
+                <tree string="表面工艺可选参数" delete="0">
+                    <field name="code"/>
+                    <field name="name"/>
+                </tree>
+            </field>
+        </record>
+
+          <record model="ir.ui.view" id="mrs_production_process_parameter_form">
+            <field name="model">sf.production.process.parameter</field>
+            <field name="arch" type="xml">
+                <form string="表面工艺可选参数" edit="0" delete="0">
+                    <sheet>
+                        <div class="oe_title">
+                            <h1>
+                                <field name="name" required="1" placeholder="名称" />
+                            </h1>
+                        </div>
+                        <group>
+                            <group>
+                                <field name="code" readonly="1"/>
+                            </group>
+                            <group>
+                                <field name="process_id" required="1"/>
+                            </group>
+                        </group>
+                        <notebook>
+                            <page string="适用材料">
+                                <field name="materials_model_ids"></field>
+                            </page>
+                        </notebook>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+                <record model="ir.ui.view" id="search_mrs_production_process_parameter_view">
+            <field name="name">search.mrs.production.process.parameter</field>
+            <field name="model">sf.production.process.parameter</field>
+            <field name="arch" type="xml">
+                <search>
+                    <filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
+                    <field name="name" string="名称" filter_domain="[('name','ilike',self)]"/>
+                    <field name="code" string="编码" filter_domain="[('codeNum','ilike',self)]"/>
+                    <searchpanel class="account_root">
+                        <field name="process_id" icon="fa-filter"/>
+                    </searchpanel>
+                </search>
+            </field>
+        </record>
+
         <!--加工工艺-->
         <!--        <record model="ir.ui.view" id="sf_processing_technology_form">-->
         <!--            <field name="model">sf.processing.technology</field>-->
@@ -20,26 +74,26 @@
         <!--                </form>-->
         <!--            </field>-->
         <!--        </record>-->
-        <record model="ir.ui.view" id="sf_processing_technology_tree">
+<!--        <record model="ir.ui.view" id="sf_processing_technology_tree">-->
-            <field name="model">sf.processing.technology</field>
+<!--            <field name="model">sf.processing.technology</field>-->
-            <field name="arch" type="xml">
+<!--            <field name="arch" type="xml">-->
-                <tree string="加工工艺" create="0" edit="0" delete="1">
+<!--                <tree string="加工工艺" create="0" edit="0" delete="1">-->
-                    <field name="code"/>
+<!--                    <field name="code"/>-->
-                    <field name="name"/>
+<!--                    <field name="name"/>-->
-                </tree>
+<!--                </tree>-->
-            </field>
+<!--            </field>-->
-        </record>
+<!--        </record>-->
-        <record model="ir.ui.view" id="search_sf_processing_technology_view">
+<!--        <record model="ir.ui.view" id="search_sf_processing_technology_view">-->
-            <field name="name">search.sf.processing.technology.type</field>
+<!--            <field name="name">search.sf.processing.technology.type</field>-->
-            <field name="model">sf.processing.technology</field>
+<!--            <field name="model">sf.processing.technology</field>-->
-            <field name="arch" type="xml">
+<!--            <field name="arch" type="xml">-->
-                <search>
+<!--                <search>-->
-                    <field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
+<!--                    <field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>-->
-                    <field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
+<!--                    <field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>-->
-                    <filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
+<!--                    <filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>-->
-                </search>
+<!--                </search>-->
-            </field>
+<!--            </field>-->
-        </record>
+<!--        </record>-->
 
         <!--表面工艺类别-->
         <record model="ir.ui.view" id="sf_production_process_category_form">
@@ -156,19 +210,7 @@
                                         </form>
                                     </field>
                                 </page>
-                                <page string="工序">
+
-                                    <field name='processing_order_ids' options="{'no_create':True}" widget="one2many">
-                                        <tree editable='bottom'>
-                                            <field name="sequence" widget="handle"/>
-                                            <field name="processing_technology_ids" widget="many2many_tags">
-                                            </field>
-                                        </tree>
-                                        <form>
-                                            <field name="processing_technology_ids" widget="many2many">
-                                            </field>
-                                        </form>
-                                    </field>
-                                </page>
                             </notebook>
                         </group>
                         <group>
@@ -350,12 +392,12 @@
             <field name="res_model">sf.materials.model</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <record id="sf_processing_technology" model="ir.actions.act_window">
+<!--        <record id="sf_processing_technology" model="ir.actions.act_window">-->
-            <field name="name">加工工艺</field>
+<!--            <field name="name">加工工艺</field>-->
-            <field name="type">ir.actions.act_window</field>
+<!--            <field name="type">ir.actions.act_window</field>-->
-            <field name="res_model">sf.processing.technology</field>
+<!--            <field name="res_model">sf.processing.technology</field>-->
-            <field name="view_mode">tree</field>
+<!--            <field name="view_mode">tree</field>-->
-        </record>
+<!--        </record>-->
 
         <record id="sf_production_process_category" model="ir.actions.act_window">
             <field name="name">表面工艺类别</field>
@@ -363,6 +405,12 @@
             <field name="res_model">sf.production.process.category</field>
             <field name="view_mode">tree,form</field>
         </record>
+        <record id="mrs_production_process_parameter_action" model="ir.actions.act_window">
+            <field name="name">表面工艺可选参数</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sf.production.process.parameter</field>
+            <field name="view_mode">tree,form</field>
+        </record>
 
 
     </data>

sf_base/views/menu_view.xml

@@ -111,13 +111,19 @@
 
         />
 
-
 		 <menuitem
-                id="menu_sf_processing_technology"
+                id="mrs_production_process_parameter_view"
-                name="加工工艺"
+                name="表面工艺可选参数"
                 parent="menu_sf_production_process_1"
-                sequence="3"
+                sequence="2"
-                action="sf_processing_technology"/>
+                action="mrs_production_process_parameter_action"
+        />
+<!--        <menuitem-->
+<!--                id="menu_sf_processing_technology"-->
+<!--                name="加工工艺"-->
+<!--                parent="menu_sf_production_process_1"-->
+<!--                sequence="3"-->
+<!--                action="sf_processing_technology"/>-->
 
         <!--         <menuitem-->
         <!--                id="menu_sf_partner_views"-->
@@ -143,5 +149,6 @@
                 sequence="1"
                 action="action_sf_machine_control_system"/>
 
+
     </data>
 </odoo>

sf_maintenance/security/ir.model.access.csv

@@ -1,5 +1,6 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_equipment_maintenance_standards,equipment_maintenance_standards,model_equipment_maintenance_standards,sf_maintenance.sf_group_equipment_user,1,1,1,0
+access_equipment_maintenance_standards_manager,equipment_maintenance_standards,model_equipment_maintenance_standards,sf_maintenance.sf_group_equipment_manager,1,1,1,1
+access_equipment_maintenance_standards,equipment_maintenance_standards,model_equipment_maintenance_standards,sf_maintenance.sf_group_equipment_user,1,0,0,0
 access_sf_maintenance_logs_sf_group_equipment_user,sf_maintenance_logs,model_sf_maintenance_logs,sf_maintenance.sf_group_equipment_user,1,0,0,0
 access_sf_maintenance_logs_sf_group_equipment_manager,sf_maintenance_logs,model_sf_maintenance_logs,sf_maintenance.sf_group_equipment_manager,1,1,1,0
 access_maintenance_equipment_sf_group_equipment_user,maintenance_equipment,model_maintenance_equipment,sf_maintenance.sf_group_equipment_user,1,0,0,0
@@ -9,7 +10,7 @@ access_maintenance_equipment_oee,maintenance_equipment_oee,model_maintenance_equ
 access_maintenance_equipment_oee_logs_sf_group_equipment_user,maintenance_equipment_oee_logs,model_maintenance_equipment_oee_logs,sf_maintenance.sf_group_equipment_user,1,0,0,0
 access_maintenance_equipment_oee_logs,maintenance_equipment_oee_logs,model_maintenance_equipment_oee_logs,sf_maintenance.sf_group_equipment_manager,1,1,1,0
 access_maintenance_standards_sf_group_equipment_user,maintenance_standards,model_maintenance_standards,sf_maintenance.sf_group_equipment_user,1,0,0,0
-access_maintenance_standards,maintenance_standards,model_maintenance_standards,sf_maintenance.sf_group_equipment_manager,1,1,1,0
+access_maintenance_standards,maintenance_standards,model_maintenance_standards,sf_maintenance.sf_group_equipment_manager,1,1,1,1
 access_maintenance_standard_image_sf_group_equipment_user,maintenance_standard_image,model_maintenance_standard_image,sf_maintenance.sf_group_equipment_user,1,0,0,0
 access_maintenance_standard_image,maintenance_standard_image,model_maintenance_standard_image,sf_maintenance.sf_group_equipment_manager,1,1,1,0
 access_sf_robot_axis_num_sf_group_equipment_user,sf_robot_axis_num,model_sf_robot_axis_num,sf_maintenance.sf_group_equipment_user,1,0,0,0
@@ -41,16 +42,13 @@ access_sf_machine_brand_tags_sf_group_equipment_user,sf_machine_brand_tags,sf_ba
 access_sf_machine_brand_tags_admin_sf_group_equipment_user,sf_machine_brand_tags_admin,sf_base.model_sf_machine_brand_tags,sf_maintenance.sf_group_equipment_user,1,0,0,0
 access_sf_machine_control_system_sf_group_equipment_user,sf_machine_control_system,sf_base.model_sf_machine_control_system,sf_maintenance.sf_group_equipment_user,1,0,0,0
 access_sf_machine_control_system_admin_sf_group_equipment_user,sf_machine_control_system_admin,sf_base.model_sf_machine_control_system,sf_maintenance.sf_group_equipment_user,1,0,0,0
-access_sf_processing_order_sf_group_equipment_user,sf_processing_order,sf_base.model_sf_processing_order,sf_maintenance.sf_group_equipment_user,1,0,0,0
-access_sf_processing_order_admin_sf_group_equipment_user,sf_processing_order_admin,sf_base.model_sf_processing_order,sf_maintenance.sf_group_equipment_user,1,0,0,0
 access_sf_production_process_sf_group_equipment_user,sf_production_process,sf_base.model_sf_production_process,sf_maintenance.sf_group_equipment_user,1,0,0,0
 access_sf_production_process_admin_sf_group_equipment_user,sf_production_process_admin,sf_base.model_sf_production_process,sf_maintenance.sf_group_equipment_user,1,0,0,0
 access_sf_production_materials_sf_group_equipment_user,sf_production_materials,sf_base.model_sf_production_materials,sf_maintenance.sf_group_equipment_user,1,0,0,0
 access_sf_production_materials_admin_sf_group_equipment_user,sf_production_materials_admin,sf_base.model_sf_production_materials,sf_maintenance.sf_group_equipment_user,1,0,0,0
 access_sf_materials_model_sf_group_equipment_user,sf_materials_model,sf_base.model_sf_materials_model,sf_maintenance.sf_group_equipment_user,1,0,0,0
 access_sf_materials_model_admin_sf_group_equipment_user,sf_materials_model_admin,sf_base.model_sf_materials_model,sf_maintenance.sf_group_equipment_user,1,0,0,0
-access_sf_processing_technology_sf_group_equipment_user,sf_processing_technology,sf_base.model_sf_processing_technology,sf_maintenance.sf_group_equipment_user,1,0,0,0
+
-access_sf_processing_technology_admin_sf_group_equipment_user,sf_processing_technology_admin,sf_base.model_sf_processing_technology,sf_maintenance.sf_group_equipment_user,1,0,0,0
 access_sf_supplier_sort_sf_group_equipment_user,sf_supplier_sort,sf_base.model_sf_supplier_sort,sf_maintenance.sf_group_equipment_user,1,0,0,0
 access_sf_supplier_sort_admin_sf_group_equipment_user,sf_supplier_sort_admin,sf_base.model_sf_supplier_sort,sf_maintenance.sf_group_equipment_user,1,0,0,0
 access_sf_production_process_parameter_sf_group_equipment_user,sf_production_process_parameter,sf_base.model_sf_production_process_parameter,sf_maintenance.sf_group_equipment_user,1,0,0,0

sf_maintenance/views/equipment_maintenance_standards_views.xml

@@ -31,7 +31,7 @@
                     <notebook>
                         <page string="维保项目">
 
-                            <field name="maintenance_standards_ids">
+                            <field name="maintenance_standards_ids" delete="1">
                                 <tree editable="bottom">
                                  <field name="name" class="table_custom_required"/>
                                  <field name="fault_type" class="table_custom_required"/>

sf_mrs_connect/models/res_config_setting.py

@@ -34,8 +34,8 @@ class ResConfigSettings(models.TransientModel):
             _logger.info("同步资源库表面工艺类别完成")
             self.env['sf.production.process'].sync_all_production_process()
             _logger.info("同步资源库表面工艺完成")
-            self.env['sf.processing.technology'].sync_all_processing_technology()
+            # self.env['sf.processing.technology'].sync_all_processing_technology()
-            _logger.info("同步资源库加工工艺")
+            # _logger.info("同步资源库加工工艺")
             self.env['sf.machine.brand.tags'].sync_all_machine_brand_tags()
             _logger.info("同步资源库品牌类别完成")
             self.env['sf.machine.brand'].sync_all_machine_brand()

sf_mrs_connect/models/sync_common.py

@@ -40,10 +40,10 @@ class MrStaticResourceDataSync(models.Model):
             logging.info("表面工艺已每日同步成功")
             self.env['sf.production.process.parameter'].sync_production_process_parameter_yesterday()
             logging.info("表面工艺可选参数已每日同步成功")
-            self.env['sf.processing.technology'].sync_processing_technology_yesterday()
+            # self.env['sf.processing.technology'].sync_processing_technology_yesterday()
-            logging.info("加工工艺已每日同步成功")
+            # logging.info("加工工艺已每日同步成功")
-            self.env['sf.processing.order'].sync_processing_order_yesterday()
+            # self.env['sf.processing.order'].sync_processing_order_yesterday()
-            logging.info("工序已同步已每日同步成功")
+            # logging.info("工序已同步已每日同步成功")
             self.env['sf.fixture.material'].sync_fixture_material_yesterday()
             logging.info("夹具物料已每日同步成功")
             self.env['sf.multi_mounting.type'].sync_multi_mounting_type_yesterday()
@@ -367,64 +367,64 @@ class sfProductionProcess(models.Model):
             raise ValidationError("表面工艺认证未通过")
 
 
-class sfProcessingTechnology(models.Model):
+# class sfProcessingTechnology(models.Model):
-    _inherit = 'sf.processing.technology'
+#     _inherit = 'sf.processing.technology'
-    _description = '加工工艺'
+#     _description = '加工工艺'
-    url = '/api/processing_technology/list'
+#     url = '/api/processing_technology/list'
-
+#
-    # 定时同步加工工艺
+#     # 定时同步加工工艺
-    def sync_processing_technology_yesterday(self):
+#     def sync_processing_technology_yesterday(self):
-        config = self.env['res.config.settings'].get_values()
+#         config = self.env['res.config.settings'].get_values()
-        headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
+#         headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
-        strUrl = config['sf_url'] + self.url
+#         strUrl = config['sf_url'] + self.url
-        r = requests.post(strUrl, json={}, data=None, headers=headers)
+#         r = requests.post(strUrl, json={}, data=None, headers=headers)
-        r = r.json()
+#         r = r.json()
-        result = json.loads(r['result'])
+#         result = json.loads(r['result'])
-        if result['status'] == 1:
+#         if result['status'] == 1:
-            for item in result['processing_technology_yesterday_list']:
+#             for item in result['processing_technology_yesterday_list']:
-                if item:
+#                 if item:
-                    processing_technology = self.search(
+#                     processing_technology = self.search(
-                        [("code", '=', item['process_encode']), ('active', 'in', [True, False])])
+#                         [("code", '=', item['process_encode']), ('active', 'in', [True, False])])
-                    if processing_technology:
+#                     if processing_technology:
-                        processing_technology.name = item['name']
+#                         processing_technology.name = item['name']
-                        processing_technology.remark = item['remark']
+#                         processing_technology.remark = item['remark']
-                        processing_technology.active = item['active']
+#                         processing_technology.active = item['active']
-                    else:
+#                     else:
-                        self.create({
+#                         self.create({
-                            "name": item['name'],
+#                             "name": item['name'],
-                            "code": item['process_encode'],
+#                             "code": item['process_encode'],
-                            "remark": item['remark'],
+#                             "remark": item['remark'],
-                            "active": item['active'],
+#                             "active": item['active'],
-                        })
+#                         })
-        else:
+#         else:
-            raise ValidationError("加工工艺认证未通过")
+#             raise ValidationError("加工工艺认证未通过")
-
+#
-    # 同步所有加工工艺
+#     # 同步所有加工工艺
-    def sync_all_processing_technology(self):
+#     def sync_all_processing_technology(self):
-        config = self.env['res.config.settings'].get_values()
+#         config = self.env['res.config.settings'].get_values()
-        headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
+#         headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
-        strUrl = config['sf_url'] + self.url
+#         strUrl = config['sf_url'] + self.url
-        r = requests.post(strUrl, json={}, data=None, headers=headers)
+#         r = requests.post(strUrl, json={}, data=None, headers=headers)
-        r = r.json()
+#         r = r.json()
-        result = json.loads(r['result'])
+#         result = json.loads(r['result'])
-        if result['status'] == 1:
+#         if result['status'] == 1:
-            for item in result['processing_technology_all_list']:
+#             for item in result['processing_technology_all_list']:
-                if item:
+#                 if item:
-                    processing_technology = self.search(
+#                     processing_technology = self.search(
-                        [("code", '=', item['process_encode']), ('active', 'in', [True, False])])
+#                         [("code", '=', item['process_encode']), ('active', 'in', [True, False])])
-                    if not processing_technology:
+#                     if not processing_technology:
-                        self.create({
+#                         self.create({
-                            "name": item['name'],
+#                             "name": item['name'],
-                            "code": item['process_encode'],
+#                             "code": item['process_encode'],
-                            "remark": item['remark'],
+#                             "remark": item['remark'],
-                            "active": item['active'],
+#                             "active": item['active'],
-                        })
+#                         })
-                    else:
+#                     else:
-                        processing_technology.name = item['name']
+#                         processing_technology.name = item['name']
-                        processing_technology.remark = item['remark']
+#                         processing_technology.remark = item['remark']
-                        processing_technology.active = item['active']
+#                         processing_technology.active = item['active']
-        else:
+#         else:
-            raise ValidationError("加工工艺认证未通过")
+#             raise ValidationError("加工工艺认证未通过")
 
 
 class MachineBrandTags(models.Model):
@@ -1000,50 +1000,50 @@ class MachineToolType(models.Model):
             raise ValidationError("机床型号认证未通过")
 
 
-class sfProcessingOrder(models.Model):
+# class sfProcessingOrder(models.Model):
-    _inherit = 'sf.processing.order'
+#     _inherit = 'sf.processing.order'
-    _description = '工序'
+#     _description = '工序'
-    url = '/api/processing_order/list'
+#     url = '/api/processing_order/list'
-
+#
-    # 定时同步工序
+#     # 定时同步工序
-    def sync_processing_order_yesterday(self):
+#     def sync_processing_order_yesterday(self):
-        config = self.env['res.config.settings'].get_values()
+#         config = self.env['res.config.settings'].get_values()
-        headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
+#         headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
-        strUrl = config['sf_url'] + self.url
+#         strUrl = config['sf_url'] + self.url
-        r = requests.post(strUrl, json={}, data=None, headers=headers)
+#         r = requests.post(strUrl, json={}, data=None, headers=headers)
-        r = r.json()
+#         r = r.json()
-        result = json.loads(r['result'])
+#         result = json.loads(r['result'])
-        if result['status'] == 1:
+#         if result['status'] == 1:
-            for item in result['processing_order_yesterday_list']:
+#             for item in result['processing_order_yesterday_list']:
-                processing_order = self.search([("id", '=', item['id']), ('active', 'in', [True, False])])
+#                 processing_order = self.search([("id", '=', item['id']), ('active', 'in', [True, False])])
-                if processing_order:
+#                 if processing_order:
-                    processing_order.sequence = item['sequence']
+#                     processing_order.sequence = item['sequence']
-                else:
+#                 else:
-                    self.create({
+#                     self.create({
-                        "sequence": item['sequence'],
+#                         "sequence": item['sequence'],
-                    })
+#                     })
-        else:
+#         else:
-            raise ValidationError("工序认证未通过")
+#             raise ValidationError("工序认证未通过")
-
+#
-    # 同步所有工序
+#     # 同步所有工序
-    def sync_all_processing_order(self):
+#     def sync_all_processing_order(self):
-        config = self.env['res.config.settings'].get_values()
+#         config = self.env['res.config.settings'].get_values()
-        headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
+#         headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
-        strUrl = config['sf_url'] + self.url
+#         strUrl = config['sf_url'] + self.url
-        r = requests.post(strUrl, json={}, data=None, headers=headers)
+#         r = requests.post(strUrl, json={}, data=None, headers=headers)
-        r = r.json()
+#         r = r.json()
-        result = json.loads(r['result'])
+#         result = json.loads(r['result'])
-        if result['status'] == 1:
+#         if result['status'] == 1:
-            for item in result['processing_order_all_list']:
+#             for item in result['processing_order_all_list']:
-                processing_order = self.search([("id", '=', item['id']), ('active', 'in', [True, False])])
+#                 processing_order = self.search([("id", '=', item['id']), ('active', 'in', [True, False])])
-                if not processing_order:
+#                 if not processing_order:
-                    self.create({
+#                     self.create({
-                        "sequence": item['sequence'],
+#                         "sequence": item['sequence'],
-                    })
+#                     })
-                else:
+#                 else:
-                    processing_order.sequence = item['sequence']
+#                     processing_order.sequence = item['sequence']
-        else:
+#         else:
-            raise ValidationError("工序认证未通过")
+#             raise ValidationError("工序认证未通过")
 
 
 class sfProductionProcessParameter(models.Model):