productDev/dmMes.git

			@@ -778,7 +778,7 @@
			<!-- AND #{endDate} >= `a`.`PLAN_DATE`-->
			<!-- </if>-->
			<if test="mixParam != null and mixParam!=''">
			AND (mmodel.name like concat('%',#{mixParam},'%') or mmodel.code like concat('%',#{mixParam},'%') or pmodel.name like concat('%',#{mixParam},'%'))
			AND (mmodel.name like concat('%',#{mixParam},'%') or mmodel.code like concat('%',#{mixParam},'%') or pmodel.name like concat('%',#{mixParam},'%') or a.BATCH like concat('%',#{mixParam},'%') or w.SALESORDER like concat('%',#{mixParam},'%') )
			</if>
			<if test="usermodelInvalidTime != null">
			AND `usermodel`.`INVALID_TIME` = #{usermodelInvalidTime}