|
|
@@ -292,10 +292,7 @@
|
|
|
where del_flag = '0'
|
|
|
<if test="lotNum != null and lotNum != '' ">and lot_num = #{lotNum}</if>
|
|
|
<if test="productId != null">and product_id = #{productId}</if>
|
|
|
- <if test="productColour != null and productColour != ''">and product_colour =( SELECT CONCAT(bb.materie_encoding, bb.materie_color_number) as sp_colour FROM (
|
|
|
- SELECT b.colour_number FROM {DBNAME}.sale_products b
|
|
|
- where b.del_flag = 0 AND b.colours = #{productColour} AND b.colour_number IS NOT NULL LIMIT 0,1) aa
|
|
|
- LEFT JOIN {DBNAME}.materiel bb ON aa.colour_number = bb.materiel_code) </if>
|
|
|
+ <if test="productColour != null and productColour != ''">and product_colour = #{productColour} </if>
|
|
|
<if test="inventoryType != null and inventoryType != ''">and inventory_type = #{inventoryType}</if>
|
|
|
</select>
|
|
|
|
