|
@@ -549,10 +549,10 @@
|
|
|
ON RM.UNIT_OF_MEASURE_ID = RUOM.UNIT_OF_MEASURE_ID
|
|
|
WHERE RM.DELETED!=1
|
|
|
ORDER BY RM.INSERT_TIME DESC
|
|
|
- <if test="con!=null">
|
|
|
- where "materialName" like #{con}
|
|
|
- </if>
|
|
|
)
|
|
|
+ <if test="con != null">
|
|
|
+ where "materialName" like #{con} or "materialCode" like #{con} or "materialTypeName" like #{con}
|
|
|
+ </if>
|
|
|
<where>
|
|
|
<if test="materialId!= null">
|
|
|
and
|