|
@@ -1625,6 +1625,7 @@
|
|
|
, GROUP_CONCAT(Z.OPT_CD1 ORDER BY Z.CART_DTL_SQ) AS OPT_CD1
|
|
, GROUP_CONCAT(Z.OPT_CD1 ORDER BY Z.CART_DTL_SQ) AS OPT_CD1
|
|
|
, GROUP_CONCAT(Z.OPT_CD2 ORDER BY Z.CART_DTL_SQ) AS OPT_CD2
|
|
, GROUP_CONCAT(Z.OPT_CD2 ORDER BY Z.CART_DTL_SQ) AS OPT_CD2
|
|
|
, GROUP_CONCAT(Z.ITEM_QTY ORDER BY Z.CART_DTL_SQ) AS ITEM_QTYR
|
|
, GROUP_CONCAT(Z.ITEM_QTY ORDER BY Z.CART_DTL_SQ) AS ITEM_QTYR
|
|
|
|
|
+ , MAX(Z.ORDER_GRADE) AS ORDER_GRADE
|
|
|
, Z.GOODS_QTY
|
|
, Z.GOODS_QTY
|
|
|
, Z.GOODS_TYPE
|
|
, Z.GOODS_TYPE
|
|
|
, Z.LIST_PRICE
|
|
, Z.LIST_PRICE
|
|
@@ -1682,6 +1683,10 @@
|
|
|
, G.PNT_PRATE
|
|
, G.PNT_PRATE
|
|
|
, G.PNT_MRATE
|
|
, G.PNT_MRATE
|
|
|
, DFP.SUPPLY_COMP_CD
|
|
, DFP.SUPPLY_COMP_CD
|
|
|
|
|
+ , 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
|
|
|
, CASE WHEN G.SELF_GOODS_YN = 'Y' THEN 'WMS'
|
|
, CASE WHEN G.SELF_GOODS_YN = 'Y' THEN 'WMS'
|
|
|
ELSE DFP.DELV_FEE_CD END AS DELV_FEE_CD
|
|
ELSE DFP.DELV_FEE_CD END AS DELV_FEE_CD
|
|
|
, CASE WHEN GRS.DELV_RES_DT IS NOT NULL THEN 'RES'
|
|
, CASE WHEN GRS.DELV_RES_DT IS NOT NULL THEN 'RES'
|
|
@@ -1719,6 +1724,10 @@
|
|
|
ON CA.GOODS_CD = GRS.GOODS_CD
|
|
ON CA.GOODS_CD = GRS.GOODS_CD
|
|
|
AND GRS.USE_YN = 'Y'
|
|
AND GRS.USE_YN = 'Y'
|
|
|
AND GRS.DELV_RES_DT > NOW()
|
|
AND GRS.DELV_RES_DT > NOW()
|
|
|
|
|
+ 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 1 = 1
|
|
WHERE 1 = 1
|
|
|
AND G.GOODS_STAT = 'G008_90'
|
|
AND G.GOODS_STAT = 'G008_90'
|
|
|
<if test="custNo == 0">
|
|
<if test="custNo == 0">
|