|
|
@@ -585,10 +585,8 @@
|
|
|
, FN_GET_USER_NM(G.UPD_NO) AS UPD_NM
|
|
|
, E.CERT_NUM
|
|
|
, E.CERT_DT
|
|
|
- , C.SUPPLY_VENDOR_CD
|
|
|
FROM TB_GOODS G
|
|
|
INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
|
|
|
- INNER JOIN TB_SUPPLY_COMPANY C ON G.SUPPLY_COMP_CD = C.SUPPLY_COMP_CD
|
|
|
LEFT OUTER JOIN TB_DELV_FEE_POLICY D ON G.SUPPLY_COMP_CD = D.SUPPLY_COMP_CD
|
|
|
AND G.DELV_FEE_CD = D.DELV_FEE_CD
|
|
|
LEFT OUTER JOIN TB_GOODS_SAFE_NO E ON G.GOODS_CD = E.GOODS_CD
|
|
|
@@ -639,7 +637,7 @@
|
|
|
<!-- 상품의 정보고시 항목 목록 -->
|
|
|
<select id="getNotiGoodsInfoList" parameterType="NotiInfo" resultType="NotiInfo">
|
|
|
/* TssGoods.getNotiGoodsInfoList */
|
|
|
- SELECT N.SUPPLY_VENDOR_CD
|
|
|
+ SELECT N.SUPPLY_COMP_CD
|
|
|
, N.NI_CLSF_CD
|
|
|
, N.NI_ITEM_CD
|
|
|
, FN_GET_CODE_NM('G005', N.NI_ITEM_CD) AS NI_ITEM_NM
|
|
|
@@ -656,7 +654,7 @@
|
|
|
FROM (
|
|
|
SELECT G.GOODS_CD
|
|
|
, G.ITEMKIND_CD
|
|
|
- , (SELECT SUPPLY_VENDOR_CD FROM TB_SUPPLY_COMPANY SC WHERE SC.SUPPLY_COMP_CD = G.SUPPLY_COMP_CD) AS SUPPLY_VENDOR_CD
|
|
|
+ , G.SUPPLY_COMP_CD
|
|
|
, G.ORIGIN_CD
|
|
|
, G.MAKE_YMD
|
|
|
, (SELECT GROUP_CONCAT(DISTINCT T.OPT_CD1) FROM TB_OPTION T WHERE T.GOODS_CD = G.GOODS_CD) AS COLOR_NM
|
|
|
@@ -669,9 +667,10 @@
|
|
|
, TB_NOTI_INFO N
|
|
|
WHERE 1 = 1
|
|
|
AND N.NI_CLSF_CD = #{niClsfCd}
|
|
|
- AND N.SUPPLY_VENDOR_CD = CASE G.SUPPLY_VENDOR_CD
|
|
|
- WHEN 'SV0001' THEN 'SV0001'
|
|
|
- WHEN 'SV0002' THEN 'SV0002'
|
|
|
+ AND N.SUPPLY_COMP_CD = CASE G.SUPPLY_COMP_CD
|
|
|
+ WHEN '1003' THEN '1003'
|
|
|
+ WHEN '1004' THEN '1004'
|
|
|
+ WHEN '1005' THEN '1005'
|
|
|
ELSE 'E'
|
|
|
END
|
|
|
ORDER BY G.GOODS_CD , N.NI_CLSF_CD, N.DISP_ORD
|
|
|
@@ -994,7 +993,7 @@
|
|
|
FROM TB_NOTI_INFO A
|
|
|
, TB_ITEMKIND B
|
|
|
WHERE A.NI_CLSF_CD = B.NI_CLSF_CD
|
|
|
- AND A.SUPPLY_VENDOR_CD = #{supplyVendorCd}
|
|
|
+ AND A.SUPPLY_COMP_CD = #{supplyCompCd}
|
|
|
AND B.ITEMKIND_CD = #{itemkindCd}
|
|
|
) D
|
|
|
LEFT OUTER JOIN (
|
|
|
@@ -1891,9 +1890,10 @@
|
|
|
, #{goodsCd} AS GOODS_CD
|
|
|
FROM TB_ITEMKIND A
|
|
|
INNER JOIN TB_NOTI_INFO B ON A.NI_CLSF_CD = B.NI_CLSF_CD
|
|
|
- AND B.SUPPLY_VENDOR_CD = (CASE #{supplyVendorCd} WHEN 'SV0001' THEN 'SV0001'
|
|
|
- WHEN 'SV0002' THEN 'SV0002'
|
|
|
- ELSE 'E'
|
|
|
+ AND B.SUPPLY_COMP_CD = (CASE #{supplyCompCd} WHEN '1003' THEN '1003'
|
|
|
+ WHEN '1004' THEN '1004'
|
|
|
+ WHEN '1005' THEN '1005'
|
|
|
+ ELSE 'E'
|
|
|
END)
|
|
|
WHERE A.ITEMKIND_CD = #{itemkindCd}
|
|
|
ORDER BY B.NI_CLSF_CD, B.DISP_ORD
|
|
|
@@ -2417,16 +2417,17 @@
|
|
|
<!-- 정보고시 상세 목록 -->
|
|
|
<select id="getNotiInfoItemList" parameterType="NotiInfo" resultType="NotiInfo">
|
|
|
/* TssGoods.getNotiInfoItemList */
|
|
|
- SELECT B.SUPPLY_VENDOR_CD
|
|
|
+ SELECT B.SUPPLY_COMP_CD
|
|
|
, B.NI_CLSF_CD
|
|
|
, B.NI_ITEM_CD
|
|
|
, FN_GET_CODE_NM('G005', B.NI_ITEM_CD) AS NI_ITEM_NM
|
|
|
, B.NI_CONTENT
|
|
|
, B.DISP_ORD
|
|
|
FROM TB_NOTI_INFO B
|
|
|
- WHERE B.SUPPLY_VENDOR_CD = CASE #{supplyVendorCd}
|
|
|
- WHEN 'SV0001' THEN 'SV0001'
|
|
|
- WHEN 'SV0002' THEN 'SV0002'
|
|
|
+ WHERE B.SUPPLY_COMP_CD = CASE #{supplyCompCd}
|
|
|
+ WHEN '1003' THEN '1003'
|
|
|
+ WHEN '1004' THEN '1004'
|
|
|
+ WHEN '1005' THEN '1005'
|
|
|
ELSE 'E' END
|
|
|
<if test="niClsfCd != null and niClsfCd != ''">
|
|
|
AND B.NI_CLSF_CD = #{niClsfCd}
|