|
@@ -399,7 +399,7 @@
|
|
ON DB.BATCH_ID=APO.BATCH_ID
|
|
ON DB.BATCH_ID=APO.BATCH_ID
|
|
LEFT JOIN RMS_MATERIAL RM
|
|
LEFT JOIN RMS_MATERIAL RM
|
|
ON RM.MATERIAL_ID=DB.MATERIAL_ID
|
|
ON RM.MATERIAL_ID=DB.MATERIAL_ID
|
|
- where DB.RESULT_FOREIGN_SHIP_NAME IS NOT NULL AND RM.MATERIAL_NAME IS NOT NULL
|
|
|
|
|
|
+ where DB.RESULT_FOREIGN_SHIP_NAME IS NOT NULL AND RM.MATERIAL_NAME IS NOT NULL AND APO.DELETED = 0
|
|
<if test="con!=null">
|
|
<if test="con!=null">
|
|
and (instr(DB.RESULT_FOREIGN_SHIP_NAME , #{con}) > 0 or instr(RM.MATERIAL_NAME , #{con}) > 0 )
|
|
and (instr(DB.RESULT_FOREIGN_SHIP_NAME , #{con}) > 0 or instr(RM.MATERIAL_NAME , #{con}) > 0 )
|
|
</if>
|
|
</if>
|
|
@@ -460,6 +460,7 @@
|
|
ADN.DELETED = 0
|
|
ADN.DELETED = 0
|
|
AND DB.INSERT_UPDATE_REMARK='人工录入'
|
|
AND DB.INSERT_UPDATE_REMARK='人工录入'
|
|
AND APO.PURCHASE_ORDER_NO is null
|
|
AND APO.PURCHASE_ORDER_NO is null
|
|
|
|
+ OR APO.DELETED = 1
|
|
<if test="materialName!=null and materialName!=''.toString()">
|
|
<if test="materialName!=null and materialName!=''.toString()">
|
|
AND RM.MATERIAL_NAME LIKE CONCAT('%',CONCAT(#{materialName},'%'))
|
|
AND RM.MATERIAL_NAME LIKE CONCAT('%',CONCAT(#{materialName},'%'))
|
|
</if>
|
|
</if>
|