|
|
@@ -201,6 +201,7 @@
|
|
|
, GROUP_CONCAT(A.OPT_CD1 ORDER BY A.ORD_DTL_ITEM_SQ) AS OPT_CD1
|
|
|
, GROUP_CONCAT(A.OPT_CD2 ORDER BY A.ORD_DTL_ITEM_SQ) AS OPT_CD2
|
|
|
, GROUP_CONCAT(A.ITEM_QTY ORDER BY A.ORD_DTL_ITEM_SQ) AS ITEM_QTYR
|
|
|
+ , GROUP_CONCAT(A.COLOR_NM ORDER BY A.ORD_DTL_ITEM_SQ) AS COLOR_NM
|
|
|
, A.LIST_PRICE
|
|
|
, A.CURR_PRICE
|
|
|
, SUM(A.OPT_ADD_PRICE) AS OPT_ADD_PRICE
|
|
|
@@ -251,6 +252,7 @@
|
|
|
, ODI.OPT_CD1
|
|
|
, ODI.OPT_CD2
|
|
|
, ODI.ITEM_QTY
|
|
|
+ , IFNULL((SELECT COLOR_KNM FROM TB_COLOR WHERE COLOR_CD = IFNULL(NULLIF(ODI.OPT_CD1,'') , G1.MAIN_COLOR_CD ) AND USE_YN = 'Y'), ODI.OPT_CD1) AS COLOR_NM
|
|
|
, OD.LIST_PRICE
|
|
|
, OD.CURR_PRICE
|
|
|
, ODI.OPT_ADD_PRICE
|
|
|
@@ -4564,6 +4566,10 @@
|
|
|
, A.ORD_QTY
|
|
|
, A.CNCL_RTN_QTY
|
|
|
, A.ORD_AMT
|
|
|
+ , GROUP_CONCAT(A.OPT_CD ORDER BY A.ORD_DTL_ITEM_SQ) AS OPT_CD
|
|
|
+ , GROUP_CONCAT(A.OPT_CD1 ORDER BY A.ORD_DTL_ITEM_SQ) AS OPT_CD1
|
|
|
+ , GROUP_CONCAT(A.OPT_CD2 ORDER BY A.ORD_DTL_ITEM_SQ) AS OPT_CD2
|
|
|
+ , GROUP_CONCAT(A.COLOR_NM ORDER BY A.ORD_DTL_ITEM_SQ) AS COLOR_NM
|
|
|
, SUM(A.CNCL_RTN_AMT) AS CNCL_RTN_AMT
|
|
|
, SUM(A.CPN1_DC_AMT) AS CPN1_DC_AMT
|
|
|
, SUM(A.TMTB1_DC_AMT) AS TMTB1_DC_AMT
|
|
|
@@ -4615,6 +4621,11 @@
|
|
|
, RF.RA_NO
|
|
|
, IFNULL(DDF.REAL_DELV_AMT, 0) * -1 AS REAL_DELV_AMT
|
|
|
, RF.RF_DELV_CPN_AMT AS DELV_CPN_DC_AMT
|
|
|
+ , IFNULL((SELECT COLOR_KNM FROM TB_COLOR C WHERE COLOR_CD = IFNULL(NULLIF(ODIH.OPT_CD1,'') , G1.MAIN_COLOR_CD ) AND USE_YN = 'Y'), ODIH.OPT_CD1) AS COLOR_NM
|
|
|
+ , ODIH.ORD_DTL_ITEM_SQ
|
|
|
+ , ODIH.OPT_CD
|
|
|
+ , ODIH.OPT_CD1
|
|
|
+ , ODIH.OPT_CD2
|
|
|
, ODIH.ORD_QTY
|
|
|
, ODIH.CNCL_RTN_QTY
|
|
|
, ODIH.ORD_AMT
|
card007