|
|
@@ -149,14 +149,7 @@
|
|
|
</otherwise>
|
|
|
</choose>
|
|
|
<if test="delvFeeCd != null and delvFeeCd != ''">
|
|
|
- <choose>
|
|
|
- <when test="delvFeeCd == 'WMS'">
|
|
|
- AND G.SELF_GOODS_YN = 'Y'
|
|
|
- </when>
|
|
|
- <otherwise>
|
|
|
AND OD.DELV_FEE_CD = #{delvFeeCd}
|
|
|
- </otherwise>
|
|
|
- </choose>
|
|
|
</if>
|
|
|
AND O.DISP_YN = 'Y'
|
|
|
AND OD.ORD_QTY - OD.CNCL_RTN_QTY > 0
|
|
|
@@ -320,14 +313,7 @@
|
|
|
AND O.ORD_NO = #{ordNo}
|
|
|
</if>
|
|
|
<if test="delvFeeCd != null and delvFeeCd != ''">
|
|
|
- <choose>
|
|
|
- <when test="delvFeeCd == 'WMS'">
|
|
|
- AND G.SELF_GOODS_YN = 'Y'
|
|
|
- </when>
|
|
|
- <otherwise>
|
|
|
AND OD.DELV_FEE_CD = #{delvFeeCd}
|
|
|
- </otherwise>
|
|
|
- </choose>
|
|
|
</if>
|
|
|
<choose>
|
|
|
<when test="chgGb == 'G680_30'">
|