|
|
@@ -281,9 +281,10 @@
|
|
|
) AS bb ON a.product_colour = bb.productColour
|
|
|
WHERE a.del_flag = '0'
|
|
|
<if test="lotNum != null and lotNum != '' ">and lot_num = #{lotNum}</if>
|
|
|
+ <if test="productColour != null and productColour != ''">
|
|
|
+ and bb.colours = #{productColour}
|
|
|
+ OR a.product_colour = #{productColour}</if>
|
|
|
<if test="productId != null">and a.product_id = #{productId}</if>
|
|
|
- <if test="productColour != null and productColour != ''">and bb.colours LIKE concat('%', #{productColour},
|
|
|
- '%') OR a.product_colour LIKE concat('%',#{productColour},'%')</if>
|
|
|
<if test="inventoryType != null and inventoryType != ''">and a.inventory_type = #{inventoryType}</if>
|
|
|
</select>
|
|
|
|
