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

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册

Browse Source
This commit is contained in:
jinling.yang
2023-08-15 17:31:49 +08:00
parent 9fe58a1fba 0ecd4e4c3b
commit 8a99bd8589
110 changed files with 27374 additions and 1649 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
sf_base/views/common_view.xml
View File

@@ -36,6 +36,7 @@
<search>
<field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
<field name="process_encode" string="编码搜索" filter_domain="[('process_encode','ilike',self)]"/>
<filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
</search>
</field>
</record>
@@ -46,9 +47,13 @@
<field name="arch" type="xml">
<form string="表面工艺类别" create="0" edit="0" delete="0">
<sheet>
<div class="oe_title">
<h1>
<field name="code"/>
</h1>
</div>
<group>
<group>
<field name="code" readonly="1"/>
<field name="sequence"/>
</group>
<group>
@@ -77,8 +82,8 @@
<field name="arch" type="xml">
<tree string="表面工艺类别" default_order="sequence, id" create="0" edit="0" delete="0">
<field name="sequence" widget="handle" string="序号"/>
<field name="code" readonly="1"/>
<field name="name"/>
<field name="code" />
<field name="name" string="名称"/>
</tree>
</field>
</record>
@@ -90,6 +95,7 @@
<search>
<field name="name" string="名称" filter_domain="[('name','ilike',self)]"/>
<field name="code" string="编码" filter_domain="[('code','ilike',self)]"/>
<filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
</search>
</field>
</record>
@@ -99,8 +105,8 @@
<field name="model">sf.production.process</field>
<field name="arch" type="xml">
<tree string="表面工艺" create="0" edit="0" delete="0">
<field name="process_encode" readonly="1"/>
<field name="name" readonly="1"/>
<field name="process_encode" />
<field name="name" string="名称"/>
<field name="remark"/>
</tree>
</field>
@@ -111,12 +117,14 @@
<field name="arch" type="xml">
<form string="表面工艺" create="0" edit="0" delete="0">
<sheet>
<div class="oe_title">
<h1>
<field name="process_encode"/>
</h1>
</div>
<group>
<group>
<field name="process_encode" readonly="1"/>
</group>
<group>
<field name="name" required="1"/>
<field name="name" required="1" string="名称"/>
</group>
<notebook>
<page string="可选参数">
@@ -179,6 +187,7 @@
<search>
<field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
<field name="process_encode" string="编码搜索" filter_domain="[('process_encode','ilike',self)]"/>
<filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
</search>
</field>
</record>
@@ -188,14 +197,19 @@
<field name="arch" type="xml">
<form string="材料型号" create="0" edit="1" delete="0">
<sheet>
<div class="oe_title">
<h1>
<field name="materials_no" readonly="1" force_save="1"/>
</h1>
</div>
<group>
<group>
<field name="materials_no" readonly="1"/>
<field name="name" readonly="1"/>
<field name="gain_way" required="1"/>
<field name="density" readonly="1"/>
</group>
<group>
<field name="name" readonly="1"/>
<field name="need_h" default="false" readonly="1"/>
<field name="mf_materia_post" attrs="{'invisible':[('need_h','=',False)]} "
readonly="1"/>
@@ -241,10 +255,10 @@
<search>
<field name="name" string="型号名搜索" filter_domain="[('name','ilike',self)]"/>
<field name="materials_no" string="编码搜索" filter_domain="[('materials_no','ilike',self)]"/>
<filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
<searchpanel class="account_root">
<field name="materials_id" icon="fa-filter"/>
</searchpanel>
</search>
</field>
</record>
@@ -254,12 +268,14 @@
<field name="arch" type="xml">
<form string="材料" create="0" edit="0" delete="0">
<sheet>
<div class="oe_title">
<h1>
<field name="materials_no"/>
</h1>
</div>
<group>
<group>
<field name="materials_no" readonly="1" default="编码"/>
</group>
<group>
<field name="name" required="1"/>
<field name="name" required="1" string="名称"/>
</group>
<notebook>
<page string="型号">
@@ -288,7 +304,7 @@
<field name="arch" type="xml">
<tree string="材料" create="0" edit="0" delete="0">
<field name="materials_no" readonly="1"/>
<field name="name" readonly="1"/>
<field name="name" string="名称"/>
</tree>
</field>
</record>
@@ -299,6 +315,7 @@
<search>
<field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
<field name="materials_no" string="编码搜索" filter_domain="[('materials_no','ilike',self)]"/>
<filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
</search>
</field>
</record>
@@ -355,6 +372,7 @@
<search string="托盘">
<field name="name" string="名称" filter_domain="[('name','ilike',self)]"/>
<field name="code" string="编码" filter_domain="[('code','ilike',self)]"/>
<filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
<group string="分组">
<filter name="state" string="状态" domain="[]" context="{'group_by': 'state'}"/>
</group>
@@ -384,12 +402,14 @@
<field name='state' widget="radio" options="{'horizontal': True}"/>
</header>
<sheet>
<div class="oe_title">
<h1>
<field name="code"/>
</h1>
</div>
<group name="group1">
<group>
<field name="code" required="1"/>
</group>
<group>
<field name="name" required="1"/>
<field name="name" required="1" string="名称"/>
</group>
</group>
</sheet>