|
|
@@ -531,6 +531,10 @@
|
|
|
, IFNULL(O.ADD_PRICE, 0) AS OPT_ADD_PRICE
|
|
|
, BR.BRAND_ENM
|
|
|
, BR.BRAND_KNM
|
|
|
+ , CT.CUST_GRADE
|
|
|
+ , CASE WHEN GOG.CUST_GRADE IS NOT NULL AND GOG.CUST_GRADE = IFNULL(CT.CUST_GRADE, '') THEN GOG.CUST_GRADE
|
|
|
+ WHEN GOG.CUST_GRADE IS NOT NULL THEN 'NO'
|
|
|
+ ELSE CT.CUST_GRADE END AS ORDER_GRADE
|
|
|
, (SELECT SUPPLY_COMP_NM FROM TB_SUPPLY_COMPANY WHERE SUPPLY_COMP_CD = G.SUPPLY_COMP_CD) AS SUPPLY_COMP_NM
|
|
|
, (SELECT GOODS_NM FROM TB_GOODS WHERE GOODS_CD = CD.ITEM_CD) AS ITEM_NM
|
|
|
, CASE WHEN G.SELF_GOODS_YN = 'Y' THEN 'WMS'
|
|
|
@@ -602,12 +606,16 @@
|
|
|
) A
|
|
|
GROUP BY A.CART_SQ
|
|
|
) STOCK
|
|
|
- ON C.CART_SQ = STOCK.CART_SQ
|
|
|
+ ON C.CART_SQ = STOCK.CART_SQ
|
|
|
+ LEFT OUTER JOIN TB_CUSTOMER CT
|
|
|
+ ON C.CUST_NO = CT.CUST_NO
|
|
|
+ LEFT OUTER JOIN TB_GOODS_ORDER_GRADE GOG
|
|
|
+ ON G.GOODS_CD = GOG.GOODS_CD
|
|
|
WHERE G.SELF_MALL_YN = 'Y'
|
|
|
- AND G.GOODS_STAT = 'G008_90'
|
|
|
+ AND G.GOODS_STAT = 'G008_90'
|
|
|
<if test="custNo == 0">
|
|
|
- AND C.CUST_NO = 0
|
|
|
- AND C.JSESSION_ID = #{jsessionId}
|
|
|
+ AND C.CUST_NO = 0
|
|
|
+ AND C.JSESSION_ID = #{jsessionId}
|
|
|
</if>
|
|
|
<if test="custNo != 0">
|
|
|
AND C.CUST_NO = #{custNo}
|
|
|
@@ -619,6 +627,13 @@
|
|
|
</foreach>
|
|
|
</if>
|
|
|
ORDER BY G.SUPPLY_COMP_CD ) Z
|
|
|
+ WHERE 1=1
|
|
|
+ <if test="custNo != 0">
|
|
|
+ AND Z.ORDER_GRADE = Z.CUST_GRADE
|
|
|
+ </if>
|
|
|
+ <if test="custNo == 0">
|
|
|
+ AND Z.ORDER_GRADE IS NULL
|
|
|
+ </if>
|
|
|
GROUP BY Z.CART_SQ
|
|
|
, Z.GOODS_CD
|
|
|
, Z.GOODS_QTY
|