@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property= "brand" column= "brand" />
<result property= "describe" column= "describe" />
<result property= "warehouseDept" column= "warehouse_dept" />
<result property= "businessMembers" column= "business_members" />
<result property= "photoAttachId" column= "photo_attach_id" />
<result property= "photoUrl" column= "photo_url" />
<result property= "instanceId" column= "instance_id" />
@ -45,14 +46,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select id, del_flag, create_by, create_time, update_by, update_time, remark,
bomNo, material_no, material_name, audit_status, use_status,
hava_product_tem,product_item,itemName, material_type, process_method,
unit, brand, `describe`, warehouse_dept,instance_id,instance_type,submit_instance_id,
unit, brand, `describe`, warehouse_dept,business_members, instance_id,instance_type,submit_instance_id,
cancel_instance_id,restore_instance_id,apply_title,apply_user,apply_time from erp_material
</sql>
<select id= "selectErpMaterialList" parameterType= "ErpMaterialVo" resultMap= "ErpMaterialResult" >
select erp.id, erp.del_flag, erp.create_by, erp.create_time, erp.update_by, erp.update_time, erp.remark,erp.bomNo, erp.material_no
, erp.material_name, erp.audit_status, erp.use_status, erp.hava_product_tem, erp.product_item,erp.`itemName`, erp.material_type, erp.process_method
, erp.unit, erp.brand, erp.`describe`, erp.warehouse_dept
, erp.unit, erp.brand, erp.`describe`, erp.warehouse_dept,erp.business_members
,erp.instance_id,erp.instance_type,process_type_dict.dict_label as instance_type_name,
erp.submit_instance_id,erp.cancel_instance_id,erp.restore_instance_id,erp.apply_title,erp.apply_user,erp.apply_time,
ss.supplier_name
@ -111,6 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test= "applyTime != null " > and erp.apply_time = #{applyTime}</if>
<if test= "keyword != null and keyword != ''" > and (erp.material_no like concat('%',#{keyword},'%') or erp.material_name like concat('%',#{keyword},'%'))</if>
<if test= "supplierId != null and supplierId != ''" > and erp.supplier_id = #{supplierId}</if>
<if test= "businessMembers != null and businessMembers != ''" > and erp.business_members = #{businessMembers}</if>
</where>
order by erp.update_time desc
</select>
@ -118,7 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id= "selectErpMaterialById" parameterType= "Long" resultMap= "ErpMaterialResult" >
select erp.id, erp.del_flag, erp.create_by, erp.create_time, erp.update_by, erp.update_time, erp.remark,erp.bomNo, erp.material_no
, erp.material_name, erp.audit_status, erp.use_status, erp.hava_product_tem,erp.product_item,erp.itemName, erp.material_type
, erp.process_method, erp.unit, erp.brand, erp.describe, erp.warehouse_dept
, erp.process_method, erp.unit, erp.brand, erp.describe, erp.warehouse_dept,erp.supplier_id,erp.business_members
,erp.instance_id,erp.instance_type,erp.submit_instance_id,erp.cancel_instance_id,erp.restore_instance_id,erp.apply_title,erp.apply_user,erp.apply_time
,att.id as photo_attach_id
from erp_material erp
@ -133,7 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id= "selectErpMaterialByMaterialNo" resultMap= "ErpMaterialResult" >
select erp.id, erp.del_flag, erp.create_by, erp.create_time, erp.update_by, erp.update_time, erp.remark,erp.bomNo, erp.material_no
, erp.material_name, erp.audit_status, erp.use_status, erp.hava_product_tem,erp.product_item,erp.itemName, erp.material_type
, erp.process_method, erp.unit, erp.brand, erp.describe, erp.warehouse_dept
, erp.process_method, erp.unit, erp.brand, erp.describe, erp.warehouse_dept,erp.supplier_id,erp.business_members
,erp.instance_id,erp.instance_type,erp.submit_instance_id,erp.cancel_instance_id,erp.restore_instance_id,erp.apply_title,erp.apply_user,erp.apply_time
,att.id as photo_attach_id
from erp_material erp
@ -168,6 +170,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test= "brand != null" > brand,</if>
<if test= "describe != null" > `describe`,</if>
<if test= "warehouseDept != null" > warehouse_dept,</if>
<if test= "supplierId != null" > supplier_id,</if>
<if test= "businessMembers != null" > business_members,</if>
<if test= "auditStatus != null" > audit_status,</if>
<if test= "useStatus != null" > use_status,</if>
<if test= "instanceId != null" > instance_id,</if>
@ -199,6 +203,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test= "brand != null" > #{brand},</if>
<if test= "describe != null" > #{describe},</if>
<if test= "warehouseDept != null" > #{warehouseDept},</if>
<if test= "supplierId != null" > #{supplierId},</if>
<if test= "businessMembers != null" > #{businessMembers},</if>
<if test= "auditStatus != null" > #{auditStatus},</if>
<if test= "useStatus != null" > #{useStatus},</if>
<if test= "instanceId != null" > #{instanceId},</if>
@ -238,6 +244,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test= "brand != null" > brand = #{brand},</if>
<if test= "describe != null" > `describe` = #{describe},</if>
<if test= "warehouseDept != null" > warehouse_dept = #{warehouseDept},</if>
<if test= "supplierId != null" > supplier_id = #{supplierId},</if>
<if test= "businessMembers != null" > business_members = #{businessMembers},</if>
<if test= "instanceId != null" > instance_id = #{instanceId},</if>
<if test= "instanceType != null" > instance_type = #{instanceType},</if>
<if test= "submitInstanceId != null" > submit_instance_id = #{submitInstanceId},</if>