jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.优化表面工艺可选参数

Browse Source 
2.修复质量警报质量总监没有制造订单访问权限
This commit is contained in:
jinling.yang
2024-03-15 10:48:01 +08:00
parent 603f9e3f34
commit 4765e34c09
3 changed files with 42 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_base/models/common.py
View File

@@ -64,7 +64,7 @@ class MrsMaterialModel(models.Model):
@api.constrains('supplier_ids') @api.constrains('supplier_ids')
def _check_gain_way(self): def _check_gain_way(self):
if not self.gain_way: if not self.gain_way:
raise UserError("请输入获取方式") raise UserError("请选择获取方式")
if self.gain_way in ['外协', '采购']: if self.gain_way in ['外协', '采购']:
if not self.supplier_ids: if not self.supplier_ids:
raise UserError("请添加供应商") raise UserError("请添加供应商")

77
sf_base/views/common_view.xml
View File

@@ -1,38 +1,39 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<odoo> <odoo>
<data> <data>
<!--表面工艺可选参数--> <!--表面工艺可选参数-->
<record model="ir.ui.view" id="mrs_production_process_parameter_tree"> <record model="ir.ui.view" id="mrs_production_process_parameter_tree">
<field name="model">sf.production.process.parameter</field> <field name="model">sf.production.process.parameter</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="表面工艺可选参数" delete="0"> <tree string="表面工艺可选参数" create="0" delete="0">
<field name="code"/> <field name="code"/>
<field name="name"/> <field name="name"/>
<field name="gain_way"/>
</tree> </tree>
</field> </field>
</record> </record>
<record model="ir.ui.view" id="mrs_production_process_parameter_form"> <record model="ir.ui.view" id="mrs_production_process_parameter_form">
<field name="model">sf.production.process.parameter</field> <field name="model">sf.production.process.parameter</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="表面工艺可选参数" edit="0" delete="0"> <form string="表面工艺可选参数" create="0" delete="0">
<sheet> <sheet>
<div class="oe_title"> <div class="oe_title">
<h1> <h1>
<field name="name" required="1" placeholder="名称" /> <field name="name" required="1" placeholder="名称"/>
</h1> </h1>
</div> </div>
<group> <group>
<group> <group>
<field name="code" readonly="1"/> <field name="code" readonly="1"/>
<field name="process_id" readonly="1"/>
<field name="gain_way" />
</group> </group>
<group>
<field name="process_id" required="1"/>
</group>
</group> </group>
<notebook> <notebook>
<page string="适用材料"> <page string="适用材料">
<field name="materials_model_ids"></field> <field name="materials_model_ids" readonly="1"></field>
</page> </page>
</notebook> </notebook>
</sheet> </sheet>
@@ -40,7 +41,7 @@
</field> </field>
</record> </record>
<record model="ir.ui.view" id="search_mrs_production_process_parameter_view"> <record model="ir.ui.view" id="search_mrs_production_process_parameter_view">
<field name="name">search.mrs.production.process.parameter</field> <field name="name">search.mrs.production.process.parameter</field>
<field name="model">sf.production.process.parameter</field> <field name="model">sf.production.process.parameter</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
@@ -74,26 +75,26 @@
<!-- </form>--> <!-- </form>-->
<!-- </field>--> <!-- </field>-->
<!-- </record>--> <!-- </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"> <record model="ir.ui.view" id="sf_production_process_category_form">
@@ -283,7 +284,7 @@
<record model="ir.ui.view" id="sf_materials_model_tree"> <record model="ir.ui.view" id="sf_materials_model_tree">
<field name="model">sf.materials.model</field> <field name="model">sf.materials.model</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="材料型号" delete="0"> <tree string="材料型号" delete="0">
<field name="materials_no"/> <field name="materials_no"/>
<field name="materials_code"/> <field name="materials_code"/>
<field name="name"/> <field name="name"/>
@@ -392,12 +393,12 @@
<field name="res_model">sf.materials.model</field> <field name="res_model">sf.materials.model</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </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"> <record id="sf_production_process_category" model="ir.actions.act_window">
<field name="name">表面工艺类别</field> <field name="name">表面工艺类别</field>

2
sf_manufacturing/security/ir.model.access.csv
View File

@@ -22,6 +22,8 @@ access_maintenance_equipment_tool_manager,maintenance_equipment_tool,model_maint
access_maintenance_equipment_tool_equipment_manager,maintenance_equipment_tool,model_maintenance_equipment_tool,sf_maintenance.sf_group_equipment_user,1,1,1,0 access_maintenance_equipment_tool_equipment_manager,maintenance_equipment_tool,model_maintenance_equipment_tool,sf_maintenance.sf_group_equipment_user,1,1,1,0
access_mrp_production_group_sf_mrp_user,mrp_production,model_mrp_production,sf_base.group_sf_mrp_user,1,0,0,0 access_mrp_production_group_sf_mrp_user,mrp_production,model_mrp_production,sf_base.group_sf_mrp_user,1,0,0,0
access_mrp_production_manager,mrp_production,model_mrp_production,sf_base.group_sf_mrp_manager,1,1,1,0 access_mrp_production_manager,mrp_production,model_mrp_production,sf_base.group_sf_mrp_manager,1,1,1,0
access_mrp_production_group_quality,mrp_production_group_quality,model_mrp_production,sf_base.group_quality,1,0,0,0
access_mrp_production_group_quality_director,mrp_production_group_quality_director,model_mrp_production,sf_base.group_quality_director,1,0,0,0
access_mrp_workorder_group_sf_mrp_user,mrp_workorder,model_mrp_workorder,sf_base.group_sf_mrp_user,1,0,0,0 access_mrp_workorder_group_sf_mrp_user,mrp_workorder,model_mrp_workorder,sf_base.group_sf_mrp_user,1,0,0,0
access_mrp_workorder_manager,mrp_workorder,model_mrp_workorder,sf_base.group_sf_mrp_manager,1,1,1,0 access_mrp_workorder_manager,mrp_workorder,model_mrp_workorder,sf_base.group_sf_mrp_manager,1,1,1,0
access_mrp_workcenter_group_sf_mrp_user,mrp_workcenter,model_mrp_workcenter,sf_base.group_sf_mrp_user,1,0,0,0 access_mrp_workcenter_group_sf_mrp_user,mrp_workcenter,model_mrp_workcenter,sf_base.group_sf_mrp_user,1,0,0,0
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
22 access_maintenance_equipment_tool_equipment_manager maintenance_equipment_tool model_maintenance_equipment_tool sf_maintenance.sf_group_equipment_user 1 1 1 0
23 access_mrp_production_group_sf_mrp_user mrp_production model_mrp_production sf_base.group_sf_mrp_user 1 0 0 0
24 access_mrp_production_manager mrp_production model_mrp_production sf_base.group_sf_mrp_manager 1 1 1 0
25 access_mrp_production_group_quality mrp_production_group_quality model_mrp_production sf_base.group_quality 1 0 0 0
26 access_mrp_production_group_quality_director mrp_production_group_quality_director model_mrp_production sf_base.group_quality_director 1 0 0 0
27 access_mrp_workorder_group_sf_mrp_user mrp_workorder model_mrp_workorder sf_base.group_sf_mrp_user 1 0 0 0
28 access_mrp_workorder_manager mrp_workorder model_mrp_workorder sf_base.group_sf_mrp_manager 1 1 1 0
29 access_mrp_workcenter_group_sf_mrp_user mrp_workcenter model_mrp_workcenter sf_base.group_sf_mrp_user 1 0 0 0