TB_GOODS_IMG 변경관련 어드민 상품 수정

style24.admin/src/main/java/com/style24/admin/biz/service/TsaGoodsService.java

@@ -377,7 +377,7 @@ public class TsaGoodsService {
 				"정상가", "판매가", "할인율", "가격변경일", "ERP재고연동여부", "정상이월구분", "반품가능 여부","승인일시"};
 
 			// DB 처리 시 사용되는 파라미터명(셀명) 설정
-			String[] cellNames = {"IMG_PATH1", "GOODS_CD", "SUPPLY_COMP_CD", "BRAND_GRP_NM", "GOODS_NM", "ITEMKIND_NM",
+			String[] cellNames = {"SYS_IMG_NM", "GOODS_CD", "SUPPLY_COMP_CD", "BRAND_GRP_NM", "GOODS_NM", "ITEMKIND_NM",
 				"STOCK_QTY_SUM", "GOODS_STAT", "STYLE_YEAR", "SEASON_CD",  "LIST_PRICE", "CURR_PRICE",
 				"DC_RATE", "PRICE_UPD_DT", "ERP_STOCK_LINK_YN", "FORMAL_GB", "RETURNABLE_YN", "FRST_CFRM_DT"};
 
@@ -396,16 +396,8 @@ public class TsaGoodsService {
 			Collection<GagaMap> dataList = goodsDao.getGoodsInfoExcelList(goodsSearch); // map형식으로 조회
 			if (dataList != null && !dataList.isEmpty()) {
 				for (GagaMap gagaMap : dataList) {
-					if ("A".equals(gagaMap.get("IMG_TYPE").toString())) {
-						gagaMap.set("IMG_PATH1", gagaMap.get("IMG_PATH1").toString());
-					} else {
-
-						if (!StringUtils.isEmpty(gagaMap.get("IMG_PATH6"))) {
-							gagaMap.set("IMG_PATH1", targetPath + gagaMap.get("IMG_PATH6").toString());
-
-						} else {
-							gagaMap.set("IMG_PATH1", targetPath + gagaMap.get("IMG_PATH1").toString());
-						}
+					if (!StringUtils.isEmpty(gagaMap.get("SYS_IMG_NM").toString()) ) {
+						gagaMap.set("SYS_IMG_NM", targetPath + '/' +  gagaMap.get("SYS_IMG_NM").toString());
 					}
 				}
 			}

style24.admin/src/main/java/com/style24/admin/biz/web/TsaGoodsController.java

@@ -2360,5 +2360,4 @@ public class TsaGoodsController extends TsaBaseController {
 		return mav;
 	}
 
-
 }

style24.admin/src/main/java/com/style24/persistence/domain/Goods.java

@@ -98,9 +98,11 @@ public class Goods extends TscBaseDomain {
 	private String goodsStatOrg;
 	private String formalGbOrg;
 
-	private String imgType;
-	private String imgPath1;
-	private String imgPath6;
+	//private String imgType;
+	//private String imgPath1;
+	//private String imgPath6;
+	private String sysImgNm;
+
 	private String niClsfNm;
 	private String goodsTypeNm;
 	private String goodTnmInit;

style24.admin/src/main/java/com/style24/persistence/mybatis/shop/TsaGoods.xml

@@ -386,8 +386,6 @@
 		                       </if>
 		                   )
 		        </if>
-		        LEFT OUTER JOIN TB_GOODS_IMG GI ON G.GOODS_CD = GI.GOODS_CD
-		                                        AND G.MAIN_COLOR_CD = GI.COLOR_CD
 		        WHERE 1=1
 		        <if test="searchGb == null or searchGb =='BASIC' or searchGb =='EXTEND' or searchGb =='MASTER'" >
 		        <include refid="getGoodsListCondition_sql"/>
@@ -397,18 +395,22 @@
 	<!-- 상품 목록 -->
 	<select id="getGoodsList" parameterType="GoodsSearch" resultType="Goods">
 		/* TsaGoods.getGoodsList */
-		SELECT Z.*
-		    , (CASE WHEN Z.GOODS_TYPE = 'G056_N' THEN (SELECT NVL(SUM(CURR_STOCK_QTY - BASE_STOCK_QTY),0) FROM VW_STOCK WHERE GOODS_CD = Z.GOODS_CD) 
-		            ELSE (SELECT NVL(SUM(CURR_STOCK_QTY - BASE_STOCK_QTY),0) FROM VW_STOCK_COMPOSE WHERE GOODS_CD = Z.GOODS_CD) 
+		SELECT Q.*
+		    , (CASE WHEN Q.GOODS_TYPE = 'G056_N' THEN (SELECT NVL(SUM(CURR_STOCK_QTY - BASE_STOCK_QTY),0) FROM VW_STOCK WHERE GOODS_CD = Q.GOODS_CD) 
+		            ELSE (SELECT NVL(SUM(CURR_STOCK_QTY - BASE_STOCK_QTY),0) FROM VW_STOCK_COMPOSE WHERE GOODS_CD = Q.GOODS_CD) 
 		            END) AS STOCK_QTY_SUM
-		    , (SELECT ITEMKIND_NM FROM TB_ITEMKIND WHERE ITEMKIND_CD = Z.ITEMKIND_CD ) AS ITEMKIND_NM
+		    , (SELECT ITEMKIND_NM FROM TB_ITEMKIND WHERE ITEMKIND_CD = Q.ITEMKIND_CD ) AS ITEMKIND_NM
 		    , FN_GET_USER_NM(REG_NO) AS REG_NM
 		    , FN_GET_USER_NM(UPD_NO) AS UPD_NM
-		    <if test='goodsPriceYn != null and goodsPriceYn == "Y"'>
-		    , GB.CURR_PRICE AS BENEFIT_CURR_PRICE
-		    </if>
+		    , (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG  WHERE GOODS_CD = Q.GOODS_CD AND COLOR_CD = Q.MAIN_COLOR_CD AND DEFAULT_IMG_YN = 'Y' ) AS SYS_IMG_NM
+		    , CASE IFNULL((SELECT COUNT(SYS_IMG_NM) FROM TB_GOODS_IMG  WHERE GOODS_CD = Q.GOODS_CD AND COLOR_CD = Q.MAIN_COLOR_CD AND DEFAULT_IMG_YN = 'Y' ),0) 
+		            WHEN 0 THEN 'N'
+		            ELSE 'Y' END AS GOODS_IMAGE_YN
+		FROM (     
+		SELECT Z.*
 		FROM (
-		    SELECT A.*, @rownum := @rownum + 1 AS RNUM FROM (
+		    SELECT A.*, @rownum := @rownum + 1 AS RNUM 
+		    FROM (
 		        SELECT
 		                G.GOODS_CD
 		              , G.GOODS_TYPE
@@ -436,17 +438,10 @@
 		              , G.NEW_CUST_ORD_YN
 		              , G.GIFT_PACK_YN
 		              , G.DELV_FEE_CD
+		              , G.MAIN_COLOR_CD
 		              , DATE_FORMAT(G.FRST_CFRM_DT, '%Y%m%d%H%i%S') AS FRST_CFRM_DT
 		              , G.SELL_FEE_RATE
 		              , DATE_FORMAT(G.PRICE_UPD_DT,'%Y%m%d%H%i%S') AS PRICE_UPD_DT
-		              , CASE WHEN IMG_PATH1 IS NULL THEN
-		                     'N'
-		                ELSE
-		                     'Y'
-		                END AS GOODS_IMAGE_YN
-		              , GI.IMG_PATH1
-		              , GI.IMG_PATH6
-		              , GI.IMG_TYPE
 		              , G.REG_NO
 		              , DATE_FORMAT(G.REG_DT,'%Y%m%d%H%i%S') AS REG_DT
 		              , G.UPD_NO
@@ -501,8 +496,6 @@
 		                       </if>
 		                   )
 		        </if>
-		        LEFT OUTER JOIN TB_GOODS_IMG GI ON G.GOODS_CD = GI.GOODS_CD
-		                                        AND G.MAIN_COLOR_CD = GI.COLOR_CD
 		        WHERE 1=1
 		        <if test="searchGb == null or searchGb =='BASIC' or searchGb =='EXTEND' or searchGb =='MASTER'" >
 		        <include refid="getGoodsListCondition_sql"/>
@@ -733,16 +726,18 @@
 		<when test="pageable != null">
 		    ) A
 		)Z
+		WHERE RNUM BETWEEN  #{pageable.startRow} AND #{pageable.endRow}
+		) Q
 		<if test='goodsPriceYn != null and goodsPriceYn == "Y"'>
-		LEFT OUTER JOIN TB_GOODS_BENEFIT_PRICE GB ON Z.GOODS_CD = GB.GOODS_CD AND GB.CUST_GB = 'G100_00'
+		LEFT OUTER JOIN TB_GOODS_BENEFIT_PRICE GB ON Q.GOODS_CD = GB.GOODS_CD AND GB.CUST_GB = 'G100_00'
 		</if> 
-		WHERE RNUM BETWEEN  #{pageable.startRow} AND #{pageable.endRow}
 		</when>
 		<otherwise>
 		    ) A
 		)Z
+		)Q
 		<if test='goodsPriceYn != null and goodsPriceYn == "Y"'>
-		LEFT OUTER JOIN TB_GOODS_BENEFIT_PRICE GB ON Z.GOODS_CD = GB.GOODS_CD AND GB.CUST_GB = 'G100_00'
+		LEFT OUTER JOIN TB_GOODS_BENEFIT_PRICE GB ON Q.GOODS_CD = GB.GOODS_CD AND GB.CUST_GB = 'G100_00'
 		</if> 
 		</otherwise>
 		</choose>
@@ -775,18 +770,14 @@
 		     , G.SELL_FEE_RATE
 		     , DATE_FORMAT(G.PRICE_UPD_DT, '%Y-%m-%d %H:%i:%S') AS PRICE_UPD_DT
 		     , DATE_FORMAT(G.FRST_CFRM_DT, '%Y-%m-%d %H:%i:%S') AS FRST_CFRM_DT
-		     , CASE WHEN IMG_PATH1 IS NULL THEN
-		           'N'
-		       ELSE
-		           'Y'
-		       END AS GOODS_IMAGE_YN
-		     /*, (CASE WHEN G.GOODS_TYPE = 'N' THEN (SELECT NVL(SUM(CURR_STOCK_QTY - BASE_STOCK_QTY),0) FROM VW_STOCK WHERE GOODS_CD = G.GOODS_CD) 
-		             ELSE (SELECT NVL(SUM(CURR_STOCK_QTY - BASE_STOCK_QTY),0) FROM VW_STOCK_EXTEND WHERE GOODS_CD = G.GOODS_CD) 
-		             END) AS STOCK_QTY_SUM*/
+		     , CASE IFNULL((SELECT COUNT(SYS_IMG_NM) FROM TB_GOODS_IMG  WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = G.MAIN_COLOR_CD AND DEFAULT_IMG_YN = 'Y' ),0) 
+		            WHEN 0 THEN 'N'
+		            ELSE 'Y' END AS GOODS_IMAGE_YN
+		     , (CASE WHEN G.GOODS_TYPE = 'G056_N' THEN (SELECT NVL(SUM(CURR_STOCK_QTY - BASE_STOCK_QTY),0) FROM VW_STOCK WHERE GOODS_CD = G.GOODS_CD) 
+		            ELSE (SELECT NVL(SUM(CURR_STOCK_QTY - BASE_STOCK_QTY),0) FROM VW_STOCK_COMPOSE WHERE GOODS_CD = G.GOODS_CD) 
+		            END) AS STOCK_QTY_SUM
 		     , (SELECT ITEMKIND_NM FROM TB_ITEMKIND WHERE ITEMKIND_CD = G.ITEMKIND_CD) AS ITEMKIND_NM
-		     , GI.IMG_PATH1
-		     , GI.IMG_PATH6
-		     , GI.IMG_TYPE
+		     , (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG  WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = G.MAIN_COLOR_CD AND DEFAULT_IMG_YN = 'Y' ) AS SYS_IMG_NM
 		     , G.REG_NO
 		     , DATE_FORMAT(G.REG_DT, '%Y-%m-%d %H:%i:%S') AS REG_DT
 		     , G.UPD_NO
@@ -831,8 +822,6 @@
 		               </if>
 		              )
 		</if>
-		LEFT OUTER JOIN TB_GOODS_IMG GI ON G.GOODS_CD = GI.GOODS_CD
-		                                AND G.MAIN_COLOR_CD = GI.COLOR_CD
 		WHERE 1=1
 		<if test="searchGb == null or searchGb =='BASIC' or searchGb =='EXTEND' or searchGb =='MASTER'" >
 		<include refid="getGoodsListCondition_sql"/>
@@ -903,14 +892,10 @@
 		     , FN_GET_CODE_NM('G056', G.GOODS_TYPE) AS GOODS_TYPE_NM
 		     , DATE_FORMAT(G.FRST_CFRM_DT, '%Y%m%d%H%i%S') AS FRST_CFRM_DT
 		     , (SELECT I.NI_CLSF_CD FROM TB_ITEMKIND I WHERE I.ITEMKIND_CD = G.ITEMKIND_CD) AS NI_CLSF_CD
-		     , GI.IMG_TYPE
-		     , GI.IMG_PATH1
-		     , GI.IMG_PATH6
-		     , CASE WHEN IMG_PATH1 IS NULL THEN
-		           'N'
-		       ELSE
-		           'Y'
-		       END AS GOODS_IMAGE_YN
+		     , (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG  WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = G.MAIN_COLOR_CD AND DEFAULT_IMG_YN = 'Y' ) AS SYS_IMG_NM
+		     , CASE IFNULL((SELECT COUNT(SYS_IMG_NM) FROM TB_GOODS_IMG  WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = G.MAIN_COLOR_CD AND DEFAULT_IMG_YN = 'Y' ),0) 
+		            WHEN 0 THEN 'N'
+		            ELSE 'Y' END AS GOODS_IMAGE_YN
 		     , (SELECT B.CD_NM 
 		       FROM TB_ITEMKIND A
 		          , TB_COMMON_CODE B 
@@ -922,8 +907,6 @@
 		     , E.CERT_DT
 		FROM TB_GOODS G
 		INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
-		LEFT OUTER JOIN TB_GOODS_IMG GI ON G.GOODS_CD = GI.GOODS_CD
-		                                AND G.MAIN_COLOR_CD = GI.COLOR_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
@@ -1212,14 +1195,10 @@
 		SELECT A.GOODS_CD
 		     , A.SUPPLY_COMP_CD
 		     , (SELECT I.NI_CLSF_CD FROM TB_ITEMKIND I WHERE I.ITEMKIND_CD = A.ITEMKIND_CD) AS NI_CLSF_CD
-		     , CASE WHEN B.IMG_PATH1 IS NULL THEN
-		            'N'
-		       ELSE
-		            'Y'
-		       END AS GOODS_IMAGE_YN
+		     , CASE IFNULL((SELECT COUNT(SYS_IMG_NM) FROM TB_GOODS_IMG  WHERE GOODS_CD = A.GOODS_CD AND COLOR_CD = A.MAIN_COLOR_CD AND DEFAULT_IMG_YN = 'Y' ),0) 
+		            WHEN 0 THEN 'N'
+		            ELSE 'Y' END AS GOODS_IMAGE_YN
 		FROM TB_GOODS A
-		LEFT OUTER JOIN TB_GOODS_IMG B ON A.GOODS_CD = B.GOODS_CD
-		                               AND A.MAIN_COLOR_CD = B.COLOR_CD
 		WHERE 1 = 1
 		<choose>
 		<when test="goodsCd != null and goodsCd != ''">
@@ -1444,10 +1423,8 @@
 		SELECT A.GOODS_CD 
 		     , NVL(A.OPT_CD1, A.MAIN_COLOR_CD) AS OPT_CD1
 		     , A.MAIN_COLOR_CD
-		     , IF(A.MAIN_COLOR_CD = NVL(A.OPT_CD1, A.MAIN_COLOR_CD), 'Y','N') AS  MAIN_COLOR_YN 
-		     , GI.IMG_PATH1
-		     , GI.IMG_PATH6
-		     , NVL(GI.IMG_TYPE,'G030_A') AS IMG_TYPE
+		     , IF(A.MAIN_COLOR_CD = NVL(A.OPT_CD1, A.MAIN_COLOR_CD), 'Y','N') AS  MAIN_COLOR_YN
+		     , (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG  WHERE GOODS_CD = A.GOODS_CD AND COLOR_CD = A.MAIN_COLOR_CD AND DEFAULT_IMG_YN = 'Y' ) AS SYS_IMG_NM 
 		     , C.COLOR_ENM 
 		FROM (
 		      SELECT A.GOODS_CD 
@@ -1459,8 +1436,6 @@
 		      GROUP BY A.GOODS_CD , B.OPT_CD1
 		     ) A 
 		LEFT OUTER JOIN TB_COLOR C ON A.OPT_CD1 = C.COLOR_CD 
-		LEFT OUTER JOIN TB_GOODS_IMG GI ON A.GOODS_CD  = GI.GOODS_CD 
-		                                AND A.OPT_CD1 = GI.COLOR_CD
 	</select>
 	
 	<!-- 구성상품 목록 -->
@@ -1482,9 +1457,7 @@
 		     , B.GOODS_STAT
 		     , B.SELF_GOODS_YN
 		     , B.SUPPLY_COMP_CD
-		     , I.IMG_PATH1
-		     , I.IMG_PATH6
-		     , I.IMG_TYPE
+		     , (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG  WHERE GOODS_CD = B.GOODS_CD AND COLOR_CD = B.MAIN_COLOR_CD AND DEFAULT_IMG_YN = 'Y' ) AS SYS_IMG_NM
 		     , A.REG_NO
 		     , FN_GET_USER_NM(A.REG_NO) AS REG_NM
 		     , DATE_FORMAT(A.REG_DT, '%Y%m%d%H%i%S') AS REG_DT
@@ -1493,8 +1466,6 @@
 		     , DATE_FORMAT(A.UPD_DT, '%Y%m%d%H%i%S') AS UPD_DT
 		FROM TB_GOODS_COMPOSE A
 		INNER JOIN  TB_GOODS B ON A.COMPS_GOODS_CD = B.GOODS_CD
-		LEFT OUTER JOIN TB_GOODS_IMG I ON A.COMPS_GOODS_CD = I.GOODS_CD
-		                               AND B.MAIN_COLOR_CD = I.COLOR_CD
 		WHERE A.GOODS_CD = #{goodsCd}
 		ORDER BY A.DISP_ORD 
 	</select>
@@ -1883,6 +1854,8 @@
 	<!-- 상품 타이틀 예약관리 목록 -->
 	<select id="getGoodsTitleReserveList" parameterType="GoodsSearch" resultType="GoodsTnmRes">
 		/* TsaGoods.getGoodsTitleReserveList */
+		SELECT Q.* 
+		FROM (
 		SELECT Z.*
 		FROM (
 		    SELECT A.*, @rownum := @rownum + 1 AS RNUM FROM (
@@ -2109,6 +2082,8 @@
 	<!-- 상품예약판매 목록 -->
 	<select id="getGoodsResSellList" parameterType="GoodsSearch" resultType="GoodsResSell">
 		/* TsaGoods.getGoodsResSellList */
+		SELECT Q.*
+		FROM (
 		SELECT Z.*
 		FROM (
 		      SELECT A.*, @rownum := @rownum + 1 AS RNUM
@@ -2283,6 +2258,8 @@
 	<!-- 네이버 EP 제외 상품 목록 -->
 	<select id="getGoodsEpSkipList" parameterType="GoodsSearch" resultType="GoodsEpSkip">
 		/* TsaGoods.getGoodsEpSkipList */
+		SELECT Q.*
+		FROM (
 		SELECT Z.*
 		FROM (
 		    SELECT A.*, @rownum := @rownum + 1 AS RNUM FROM (
@@ -2586,6 +2563,8 @@
 	<!-- 상품 가격예약 목록 -->
 	<select id="getGoodsPriceResList" parameterType="GoodsSearch" resultType="GoodsPriceRes">
 		/* TsaGoods.getGoodsPriceResList */
+		SELECT Q.*
+		FROM (
 		SELECT Z.*
 		FROM (
 		    SELECT A.*, @rownum := @rownum + 1 AS RNUM FROM (
@@ -3379,8 +3358,6 @@
 		INNER JOIN VW_STOCK VS ON IA.GOODS_CD = VS.GOODS_CD
 		                       AND IA.OPT_CD = VS.OPT_CD
 		INNER JOIN TB_CUSTOMER C ON IA.CUST_NO = C.CUST_NO
-		LEFT OUTER JOIN TB_GOODS_IMG GI ON IA.GOODS_CD = GI.GOODS_CD
-		                                AND IA.OPT_CD1 = GI.COLOR_CD
 		WHERE 1=1
 		<if test='alarmYn != null and alarmYn == "Y"'>
 		AND IA.INFORM_DT IS NOT NULL
@@ -3428,6 +3405,8 @@
 	<!-- 재입고알림 목록 -->
 	<select id="getReinboundInformList" parameterType="GoodsSearch" resultType="ReinboundInform">
 		/* TsaGoods.getReinboundInformList */
+		SELECT Q.*
+		FROM (
 		SELECT Z.*
 		FROM (
 		       SELECT A.*, @rownum := @rownum + 1 AS RNUM 
@@ -3451,9 +3430,7 @@
 		                   , G.GOODS_STAT
 		                   , B.BRAND_ENM
 		                   , G.SELF_MALL_YN
-		                   , GI.IMG_TYPE
-		                   , GI.IMG_PATH1
-		                   , GI.IMG_PATH6
+		                   , (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG  WHERE GOODS_CD = IA.GOODS_CD AND COLOR_CD = IA.OPT_CD1 AND DEFAULT_IMG_YN = 'Y' ) AS SYS_IMG_NM
 		                   , VS.CURR_STOCK_QTY
 		                   , VS.SOLDOUT_YN
 		              FROM TB_REINBOUND_INFORM IA
@@ -3465,8 +3442,6 @@
 		              INNER JOIN VW_STOCK VS ON IA.GOODS_CD = VS.GOODS_CD
 		                                     AND IA.OPT_CD = VS.OPT_CD
 		              INNER JOIN TB_CUSTOMER C ON IA.CUST_NO = C.CUST_NO
-		              LEFT OUTER JOIN TB_GOODS_IMG GI ON IA.GOODS_CD = GI.GOODS_CD
-		                                              AND IA.OPT_CD1 = GI.COLOR_CD 
 		              WHERE 1=1
 		              <if test="rinbdInfoSq != null and rinbdInfoSq != ''">
 		              AND IA.RINBD_INFO_SQ = #{rinbdInfoSq}
@@ -3535,7 +3510,7 @@
 		     , SUBSTRING_INDEX(SYS_IMG_NM , '/', -1) AS SYS_IMG_NM
 		     , SUBSTRING_INDEX(SYS_IMG_NM , '/', 2) AS SYS_IMG_URL
 		     , DEFAULT_IMG_YN
-		FROM   TB_GOODS_IMG_DX5
+		FROM   TB_GOODS_IMG
 		WHERE  GOODS_CD = #{goodsCd}
 		AND    COLOR_CD = #{colorCd}
 		ORDER  BY DISP_ORD
@@ -3545,7 +3520,7 @@
 	<delete id="deleteGoodsImageTotal" parameterType="GoodsImg">
 		/* TsaGoods.deleteGoodsImageTotal */
 		DELETE
-		FROM TB_GOODS_IMG_DX5
+		FROM TB_GOODS_IMG
 		WHERE GOODS_CD = #{goodsCd}
 		AND COLOR_CD = #{colorCd}
 	</delete>
@@ -3554,7 +3529,7 @@
 	<delete id="deleteGoodsImage" parameterType="GoodsImg">
 		/* TsaGoods.deleteGoodsImage */
 		DELETE
-		FROM TB_GOODS_IMG_DX5
+		FROM TB_GOODS_IMG
 		WHERE GOODS_CD = #{goodsCd}
 		AND COLOR_CD = #{colorCd}
 		AND DISP_ORD = #{dispOrd}
@@ -3563,7 +3538,7 @@
 	<!-- 상품이미지 등록 -->
 	<insert id="createGoodsImage" parameterType="GoodsImg">
 		/* TsaGoods.createGoodsImage */
-		INSERT INTO TB_GOODS_IMG_DX5 (
+		INSERT INTO TB_GOODS_IMG (
 		       GOODS_CD
 		     , COLOR_CD
 		     , DISP_ORD

style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsDetailForm.html

@@ -99,9 +99,9 @@
 									</colgroup>
 									<tbody>
 									<tr>
-										<td rowspan="4" style="text-align:center" th:with="uploadGoodsUrl=${@environment.getProperty('upload.goods.view')}">
+										<td rowspan="4" style="text-align:center">
 										<img id="goodsImgUrl" src="" width="100px"/>
-										<input type="hidden" name="imgPath1" id="imgPath1" />
+										<input type="hidden" name="sysImgNm" id="sysImgNm" />
 										</td>
 										<th>상품타이틀</th>
 										<td colspan="5">
@@ -517,7 +517,6 @@
 	var authBrandList = [[${authBrandList}]];
 	var useYnList = gagajf.convertToArray([[${useYnList}]]);
 	var goodsTypeList = gagajf.convertToArray([[${goodsTypeList}]]);
-	var uploadGoodsUrl = [[${@environment.getProperty('upload.goods.view')}]];
 	// Get a SmartEditor options
 	//var seOptions = gagaSe.getEditorOptions();
 	
@@ -572,22 +571,9 @@
 		{headerName: "정렬", field: "dispOrd", width: 70 ,hide: false, cellClass: 'text-center',  rowDrag: true },
 		{headerName: "CRUD", field: "crud", width: 75, minWidth: 75, hide: true},
 		//{headerName: 'No', width: 60, cellClass: 'text-center', valueGetter: function(params) { return params.node.rowIndex + 1 }},
-		{headerName: "이미지", field: "imgPath1", width: 100, height: 60, cellClass: 'text-center'
+		{headerName: "이미지", field: "sysImgNm", width: 100, height: 60, cellClass: 'text-center'
 			,cellRenderer: function(params) {
-				if (params.data.imgType == "G030_A"){
-					if(!gagajf.isNull(params.data.imgPath6)){
-						return '<img width="60" src="'+ params.data.imgPath1 + '" alt="" onerror="this.src=\'/image/no.gif\';"/>';
-					}else{
-						return '<img width="60" src="'+ params.value + '" alt="" onerror="this.src=\'/image/no.gif\';"/>';
-					}	
-						
-				}else{
-					if(!gagajf.isNull(params.data.imgPath6)){
-						return '<img width="60" src="'+ uploadGoodsUrl+params.data.imgPath6 + '" alt=""  onerror="this.src=\'/image/no.gif\';"/>';
-					}else{
-						return '<img width="60" src="'+ uploadGoodsUrl+params.value + '" alt=""  onerror="this.src=\'/image/no.gif\';"/>';
-					}
-				}
+				return '<img width="60" src="'+ _goodsUrl+ "/" + params.value + '" alt="" onclick="cfnOpenImagePreViewPopup(\'goodsImgView\', \''+ _goodsUrl+ "/" + params.value +'\')" onerror="this.src=\'/image/no.gif\';"/>';
 			}
 		},
 		{headerName: "상품타입", field: "goodsType" , width: 100, cellClass: 'text-center',
@@ -864,28 +850,8 @@
 				}
 			}
 
-			var goodsImg = "";
-			var goodsImgPath1 = "";
-			if (result.imgType == "G030_A"){
-				if (!gagajf.isNull(result.imgPath6)){
-					goodsImg = result.imgPath6;
-					goodsImgPath1 = result.imgPath6;
-				}else{
-					goodsImg = result.imgPath1;
-					goodsImgPath1 = result.imgPath1;
-				}
-				
-			}else{
-				if (!gagajf.isNull(result.imgPath6)){
-					goodsImg = uploadGoodsUrl+result.imgPath6;
-					goodsImgPath1 = result.imgPath6;
-				}else{
-					goodsImg = uploadGoodsUrl+result.imgPath1;
-					goodsImgPath1 = result.imgPath1;
-				}
-			}
-			$('#goodsDetailForm').find('#goodsImgUrl').attr('src',goodsImg);
-			$('#goodsDetailForm input[name=imgPath1]').val(goodsImgPath1);
+			$('#goodsDetailForm').find('#goodsImgUrl').attr('src',  _goodsUrl + '/'+ result.sysImgNm);
+			$('#goodsDetailForm input[name=sysImgNm]').val(result.sysImgNm);
 			$("#goodsDetailForm input[type=checkbox][checked]").parent("label").addClass("checked");
 
 			//품목변경 권한 관련 처리

style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsItemkindForm.html

@@ -174,7 +174,6 @@
 <script type="text/javascript" src="/ux/plugins/gaga/gaga.paging.js?v=2019072202"></script>
 <script th:inline="javascript">
 /*<![CDATA[*/
-	var uploadGoodsUrl = [[${@environment.getProperty('upload.goods.view')}]];
 	var goodsImgParam = "?width=60&height=60";
 	var columnDefs = [];
 	columnDefs = [
@@ -182,21 +181,9 @@
 		{headerName: 'No', width: 60, cellClass: 'text-center',
 			valueGetter: function(params) { return cfnGridNumner('searchForm',params.node.rowIndex, 'A');}
 		},
-		{headerName: "이미지", field: "imgPath1", width: 100, height: 60, cellClass: 'text-center'
+		{headerName: "이미지", field: "sysImgNm", width: 100, height: 60, cellClass: 'text-center'
 			,cellRenderer: function(params) {
-				if (params.data.imgType == "G030_A"){
-					if(!gagajf.isNull(params.data.imgPath6)){
-						return '<img width="60" src="'+ params.data.imgPath1 + '" alt="" onerror="this.src=\'/image/no.gif\';"/>';
-					}else{
-						return '<img width="60" src="'+ params.value + '" alt="" onerror="this.src=\'/image/no.gif\';"/>';
-					}
-				}else{
-					if(!gagajf.isNull(params.data.imgPath6)){
-						return '<img width="60" src="'+ uploadGoodsUrl+params.data.imgPath6 + '" alt=""  onerror="this.src=\'/image/no.gif\';"/>';
-					}else{
-						return '<img width="60" src="'+ uploadGoodsUrl+params.value + '" alt=""  onerror="this.src=\'/image/no.gif\';"/>';
-					}	
-				}
+				return '<img width="60" src="'+ _goodsUrl+ "/" + params.value + '" alt=""  onerror="this.src=\'/image/no.gif\';"/>';
 			}
 		},
 		{headerName: "상품코드", field: "goodsCd", width: 140, cellClass: 'text-center'

style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsListForm.html

@@ -423,29 +423,15 @@
 	var goodsStatList = gagajf.convertToArray([[${goodsStatList}]]);
 	var formalGbList = gagajf.convertToArray([[${formalGbList}]]);
 	var seasonList = gagajf.convertToArray([[${seasonList}]]);
-	var uploadGoodsUrl = [[${@environment.getProperty('upload.goods.view')}]];
 	var columnDefs = [];
 	columnDefs = [
 		{width: 40, minWidth: 40, cellClass: 'text-right', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
 		{headerName: 'No', width: 60, cellClass: 'text-center',
 			valueGetter: function(params) { return cfnGridNumner('searchForm',params.node.rowIndex, 'A');}
 		},
-		{headerName: "이미지", field: "imgPath1", width: 100, height: 60, cellClass: 'text-center'
+		{headerName: "이미지", field: "sysImgNm", width: 100, height: 60, cellClass: 'text-center'
 			,cellRenderer: function(params) {
-				if (params.data.imgType == "G030_A"){
-					if (gagajf.isNull(params.value)) {
-						return '<img width="60" src="'+ params.data.imgPath6 + '" alt="" onclick="cfnOpenImagePreViewPopup(\'goodsImgView\', \''+ params.data.imgPath6 +'\')" onerror="this.src=\'/image/no.gif\';"/>';
-					} else {
-						return '<img width="60" src="'+ params.value + '" alt="" onclick="cfnOpenImagePreViewPopup(\'goodsImgView\', \''+ params.value +'\')" onerror="this.src=\'/image/no.gif\';"/>';
-					}
-					
-				}else{
-					if(!gagajf.isNull(params.data.imgPath6)){
-						return '<img width="60" src="'+ uploadGoodsUrl+params.data.imgPath6 + '" alt="" onclick="cfnOpenImagePreViewPopup(\'goodsImgView\', \''+ uploadGoodsUrl+params.data.imgPath6 +'\')" onerror="this.src=\'/image/no.gif\';"/>';
-					}else{
-						return '<img width="60" src="'+ uploadGoodsUrl+params.value + '" alt="" onclick="cfnOpenImagePreViewPopup(\'goodsImgView\', \''+ uploadGoodsUrl+params.value +'\')" onerror="this.src=\'/image/no.gif\';"/>';
-					}	
-				}
+				return '<img width="60" src="'+ _goodsUrl+ "/" + params.value + '" alt="" onclick="cfnOpenImagePreViewPopup(\'goodsImgView\', \''+ _goodsUrl+ "/" + params.value +'\')" onerror="this.src=\'/image/no.gif\';"/>';
 			}
 		},
 		{headerName: "브랜드", field: "brandCd", width: 80, cellClass: 'text-center'},
@@ -1102,6 +1088,11 @@
 		
 	});
 	
+	// 상품이미지 미리보기 레이어에서 창 종료 이벤트
+	$(document).on("mouseleave","#goodsImgView",function(){
+		$("#goodsImgView").remove();
+	});
+	
 	$(document).ready(function() {
 
 		cfnCreateCalendar('#sellTerms', 'stDate', 'edDate', true, '등록일', 'X');