|
@@ -187,7 +187,7 @@
|
|
|
INNER JOIN TB_BRAND_GROUP D ON B.BRAND_GROUP_NO = D.BRAND_GROUP_NO
|
|
INNER JOIN TB_BRAND_GROUP D ON B.BRAND_GROUP_NO = D.BRAND_GROUP_NO
|
|
|
AND D.USE_YN = 'Y'
|
|
AND D.USE_YN = 'Y'
|
|
|
INNER JOIN TB_DELV_FEE_POLICY E ON G.SUPPLY_COMP_CD = E.SUPPLY_COMP_CD
|
|
INNER JOIN TB_DELV_FEE_POLICY E ON G.SUPPLY_COMP_CD = E.SUPPLY_COMP_CD
|
|
|
- AND G.DELV_FEE_CD = E.DELV_FEE_CD
|
|
|
|
|
|
|
+ AND G.DELV_FEE_CD = E.DELV_FEE_CD
|
|
|
LEFT OUTER JOIN TB_WISHLIST W ON G.GOODS_CD = W.GOODS_CD
|
|
LEFT OUTER JOIN TB_WISHLIST W ON G.GOODS_CD = W.GOODS_CD
|
|
|
AND IFNULL(#{custNo}, 0) = W.CUST_NO
|
|
AND IFNULL(#{custNo}, 0) = W.CUST_NO
|
|
|
LEFT OUTER JOIN TB_GOODS_SHOT_DELV_SKIP DS ON G.GOODS_CD =DS.GOODS_CD
|
|
LEFT OUTER JOIN TB_GOODS_SHOT_DELV_SKIP DS ON G.GOODS_CD =DS.GOODS_CD
|
|
@@ -829,6 +829,7 @@
|
|
|
FROM TB_GOODS G
|
|
FROM TB_GOODS G
|
|
|
INNER JOIN TB_SUPPLY_COMPANY S ON G.SUPPLY_COMP_CD = S.SUPPLY_COMP_CD
|
|
INNER JOIN TB_SUPPLY_COMPANY S ON G.SUPPLY_COMP_CD = S.SUPPLY_COMP_CD
|
|
|
INNER JOIN TB_DELV_FEE_POLICY A ON G.DELV_FEE_CD = A.DELV_FEE_CD
|
|
INNER JOIN TB_DELV_FEE_POLICY A ON G.DELV_FEE_CD = A.DELV_FEE_CD
|
|
|
|
|
+ AND G.SUPPLY_COMP_CD = A.SUPPLY_COMP_CD
|
|
|
INNER JOIN TB_DELIVERY_LOC B ON A.SUPPLY_COMP_CD = B.SUPPLY_COMP_CD
|
|
INNER JOIN TB_DELIVERY_LOC B ON A.SUPPLY_COMP_CD = B.SUPPLY_COMP_CD
|
|
|
AND B.USE_YN = 'Y'
|
|
AND B.USE_YN = 'Y'
|
|
|
AND G.DELV_LOC_CD = B.DELV_LOC_CD
|
|
AND G.DELV_LOC_CD = B.DELV_LOC_CD
|