|
@@ -461,7 +461,7 @@
|
|
|
GROUP BY RM.MATERIAL_CODE
|
|
|
) table1
|
|
|
ON table1.code = RM.MATERIAL_CODE
|
|
|
- WHERE RPG.WAREHOUSE_ID = #{warehouseId} AND RM.MATERIAL_NAME IS NOT NULL AND WIR.ISUPLOAD='0' AND WIR.INSERT_UPDATE_REMARK IS NULL
|
|
|
+ WHERE RPG.WAREHOUSE_ID = #{warehouseId} AND RM.MATERIAL_NAME IS NOT NULL AND WIR.ISUPLOAD='0'
|
|
|
<if test="con!=null and con!='null'">
|
|
|
AND RM.MATERIAL_NAME LIKE (#{con})
|
|
|
AND table1.count>0
|