Jcdm041-Mes.git

			@@ -22,10 +22,11 @@
			<result property="version" column="version" />
			<result property="status" column="status" />
			<result property="supplier" column="supplier" />
			<result property="mark" column="mark" />
			</resultMap>

			<sql id="selectBsMaterialInfoVo">
			select id, material_code, material_name, material_view, type_z, type_l, unit, matter_version, remarks, create_user, create_time, update_user, update_time, erp_spec, data_source, version, status, supplier from bs_material_info
			select id, material_code, mark, material_name, material_view, type_z, type_l, unit, matter_version, remarks, create_user, create_time, update_user, update_time, erp_spec, data_source, version, status, supplier from bs_material_info
			</sql>

			<select id="selectBsMaterialInfoList" parameterType="BsMaterialInfo" resultMap="BsMaterialInfoResult">
			@@ -33,6 +34,7 @@
			<where>
			<if test="materialCode != null and materialCode != ''"> and material_code like concat('%', #{materialCode}, '%')</if>
			<if test="materialName != null and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
			<if test="mark != null and mark != ''"> and mark like concat('%', #{mark}, '%')</if>
			<if test="materialView != null and materialView != ''"> and material_view = #{materialView}</if>
			<if test="typeZ != null and typeZ != ''"> and type_z = #{typeZ}</if>
			<if test="typeL != null and typeL != ''"> and type_l = #{typeL}</if>
			@@ -61,6 +63,7 @@
			<if test="id != null">id,</if>
			<if test="materialCode != null">material_code,</if>
			<if test="materialName != null">material_name,</if>
			<if test="mark != null">mark,</if>
			<if test="materialView != null">material_view,</if>
			<if test="typeZ != null">type_z,</if>
			<if test="typeL != null">type_l,</if>
			@@ -81,6 +84,7 @@
			<if test="id != null">#{id},</if>
			<if test="materialCode != null">#{materialCode},</if>
			<if test="materialName != null">#{materialName},</if>
			<if test="mark != null">#{mark},</if>
			<if test="materialView != null">#{materialView},</if>
			<if test="typeZ != null">#{typeZ},</if>
			<if test="typeL != null">#{typeL},</if>
			@@ -104,6 +108,7 @@
			<trim prefix="SET" suffixOverrides=",">
			<if test="materialCode != null">material_code = #{materialCode},</if>
			<if test="materialName != null">material_name = #{materialName},</if>
			<if test="mark != null">mark = #{mark},</if>
			<if test="materialView != null">material_view = #{materialView},</if>
			<if test="typeZ != null">type_z = #{typeZ},</if>
			<if test="typeL != null">type_l = #{typeL},</if>