|
@@ -99,6 +99,9 @@
|
|
|
<when notnull="@arg_mattressid">
|
|
|
u_mattress.mattressid = @arg_mattressid
|
|
|
</when>
|
|
|
+ <when notnull="@arg_mattresstypeid">
|
|
|
+ u_mattress.mattresstypeid = @arg_mattresstypeid
|
|
|
+ </when>
|
|
|
<when notnull="@arg_deptid">
|
|
|
u_mattress.deptid = @arg_deptid
|
|
|
</when>
|
|
@@ -138,9 +141,9 @@
|
|
|
<field field="mattressname">床垫名称</field>
|
|
|
<field field="mattresstypeid" mapper="" ddd="ddd_mattress_type_choose">床垫类别</field>
|
|
|
<field field="erp_mtrlcode">L1物料编码</field>
|
|
|
- <field field="mattress_width" datatype="number">床垫宽/CM</field>
|
|
|
- <field field="mattress_length" datatype="number">床垫长/CM</field>
|
|
|
- <field field="mattress_height" datatype="number">床垫高/CM</field>
|
|
|
+ <field field="mattress_width" datatype="integer">床垫宽/CM</field>
|
|
|
+ <field field="mattress_length" datatype="integer">床垫长/CM</field>
|
|
|
+ <field field="mattress_height" datatype="integer">床垫高/CM</field>
|
|
|
<field field="total_cost" datatype="number">总成本</field>
|
|
|
<field field="nottax_factory_cost" datatype="number">不含税出厂价</field>
|
|
|
<field field="nottax_dept_cost" datatype="number">部门不含税价</field>
|