|
|
@@ -312,8 +312,8 @@
|
|
|
FROM dkic_b.t_psi_inventory tpi
|
|
|
<include refid="Join_Table"/>
|
|
|
<where>
|
|
|
- (tmgs.warning_lower_limit <> 0 AND tpi.inv_qty < tmgs.warning_lower_limit)
|
|
|
- OR (tmgs.warning_upper_limit <> 0 AND tpi.inv_qty > tmgs.warning_upper_limit)
|
|
|
+ ((tmgs.warning_lower_limit <> 0 AND tpi.inv_qty < tmgs.warning_lower_limit)
|
|
|
+ OR (tmgs.warning_upper_limit <> 0 AND tpi.inv_qty > tmgs.warning_upper_limit))
|
|
|
<if test="whId != null and whId != ''">
|
|
|
AND tpi.wh_id = #{whId}::UUID
|
|
|
</if>
|
|
|
@@ -360,7 +360,7 @@
|
|
|
<if test="brandId != null and brandId != ''">
|
|
|
AND tmgs.brand_id = #{brandId}::UUID
|
|
|
</if>
|
|
|
- <if test="searchText != null">
|
|
|
+ <if test="searchText != null and searchText != ''">
|
|
|
AND (tmgs.sku_model like concat('%', my_ex.likequery(#{searchText}) , '%')
|
|
|
OR tmgs.sku_name like concat('%', my_ex.likequery(#{searchText}) , '%')
|
|
|
OR tpi.non_std_code like concat('%', my_ex.likequery(#{searchText}) , '%')
|
|
|
@@ -391,8 +391,8 @@
|
|
|
LEFT JOIN dkic_b.t_mst_unit tmu ON tmu.unit_id = tmgs.unit_id
|
|
|
LEFT JOIN dkic_b.t_mst_unit subtmu ON subtmu.unit_id = tmgs.sub_unit_id
|
|
|
<where>
|
|
|
- (tmgs.warning_lower_limit <> 0 AND tpi.inv_qty < tmgs.warning_lower_limit)
|
|
|
- OR (tmgs.warning_upper_limit <> 0 AND tpi.inv_qty > tmgs.warning_upper_limit)
|
|
|
+ ((tmgs.warning_lower_limit <> 0 AND tpi.inv_qty < tmgs.warning_lower_limit)
|
|
|
+ OR (tmgs.warning_upper_limit <> 0 AND tpi.inv_qty > tmgs.warning_upper_limit))
|
|
|
<if test="flgValid != null">
|
|
|
AND tpi.flg_valid = #{flgValid}
|
|
|
</if>
|
|
|
@@ -408,7 +408,7 @@
|
|
|
<if test="brandId != null and brandId != ''">
|
|
|
AND tmgs.brand_id = #{brandId}::UUID
|
|
|
</if>
|
|
|
- <if test="searchText != null">
|
|
|
+ <if test="searchText != null and searchText != ''">
|
|
|
AND (tmgs.sku_model like concat('%', my_ex.likequery(#{searchText}) , '%')
|
|
|
OR tmgs.sku_name like concat('%', my_ex.likequery(#{searchText}) , '%')
|
|
|
OR tpi.non_std_code like concat('%', my_ex.likequery(#{searchText}) , '%')
|