|
@@ -75,14 +75,14 @@
|
|
|
ON DB.BATCH_ID = APO.BATCH_ID
|
|
|
JOIN RMS_MATERIAL RM
|
|
|
ON RM.MATERIAL_ID = DB.MATERIAL_ID
|
|
|
- <where>
|
|
|
+ where APO.DELETED = 0
|
|
|
<if test="supplierId != null">
|
|
|
and APO.SUPPLIER_UNIT_ID = #{supplierId}
|
|
|
</if>
|
|
|
<if test="index != null">
|
|
|
and (instr(RM.MATERIAL_NAME, #{index}) > 0 or instr(RM.MATERIAL_SPECIFICATION,#{index}) >0 or instr(RM.MATERIAL_MODEL,#{index}) >0)
|
|
|
</if>
|
|
|
- </where>
|
|
|
+
|
|
|
group by RM.MATERIAL_ID,RM.MATERIAL_NAME,RM.MATERIAL_CODE,RM.MATERIAL_SPECIFICATION,RM.MATERIAL_MODEL
|
|
|
)
|
|
|
<where>
|