상품관련 쿼리 rownum -> limit 로 수정

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

@@ -2017,7 +2017,8 @@
 		FROM (
 		SELECT Z.*
 		FROM (
-		    SELECT A.*, @rownum := @rownum + 1 AS RNUM FROM (
+		    SELECT A.*
+		    FROM (
 		        SELECT
 		                G.GOODS_CD
 		              , B.BRAND_ENM
@@ -2037,7 +2038,6 @@
 		              , FN_GET_USER_NM(GR.REG_NO) AS REG_NM
 		              , DATE_FORMAT(GR.REG_DT,'%Y%m%d%H%i%S') AS REG_DT
 		        FROM TB_GOODS G
-		        JOIN ( SELECT @rownum := 0) R
 		        INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
 		        INNER JOIN TB_SUPPLY_COMPANY S ON G.SUPPLY_COMP_CD = S.SUPPLY_COMP_CD
 		        INNER JOIN TB_GOODS_TNM_RES GR ON G.GOODS_CD = GR.GOODS_CD
@@ -2087,7 +2087,7 @@
 		        <if test="searchGb != null and searchGb =='EXCEL'">
 		        ORDER BY SD.TMP_DISP_ORD
 		        </if>
-		<include refid="getListPagingCondition_sql"/>
+		<include refid="getListLimitPagingCondition_sql"/>
 	</select>
 
 	<!-- 상품 타이틀 예약조회(기간 체크용) -->
@@ -2245,7 +2245,7 @@
 		FROM (
 		SELECT Z.*
 		FROM (
-		      SELECT A.*, @rownum := @rownum + 1 AS RNUM
+		      SELECT A.*
 		      FROM (
 		            SELECT
 		                   G.GOODS_CD
@@ -2265,7 +2265,6 @@
 		                   , FN_GET_USER_NM(GR.UPD_NO) AS UPD_NM
 		                   , DATE_FORMAT(GR.UPD_DT,'%Y%m%d%H%i%S') AS UPD_DT
 		            FROM TB_GOODS G
-		            JOIN ( SELECT @rownum := 0) R
 		            INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
 		            INNER JOIN TB_SUPPLY_COMPANY S ON G.SUPPLY_COMP_CD = S.SUPPLY_COMP_CD
 		            INNER JOIN TB_GOODS_RES_SELL GR ON G.GOODS_CD = GR.GOODS_CD
@@ -2312,7 +2311,7 @@
 		            <if test="searchGb != null and searchGb =='EXCEL'">
 		            ORDER BY SD.TMP_DISP_ORD
 		            </if>
-		<include refid="getListPagingCondition_sql"/>
+		<include refid="getListLimitPagingCondition_sql"/>
 	</select>
 
 	<!-- 상품예약판매 조회(기간 체크용) -->
@@ -2421,7 +2420,8 @@
 		FROM (
 		SELECT Z.*
 		FROM (
-		    SELECT A.*, @rownum := @rownum + 1 AS RNUM FROM (
+		    SELECT A.*
+		    FROM (
 		        SELECT
 		                G.GOODS_CD
 		              , B.BRAND_ENM
@@ -2440,7 +2440,6 @@
 		              , FN_GET_USER_NM(GE.UPD_NO) AS UPD_NM
 		              , DATE_FORMAT(GE.UPD_DT,'%Y%m%d%H%i%S') AS UPD_DT
 		        FROM TB_GOODS G
-		        JOIN ( SELECT @rownum := 0) R
 		        INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
 		        INNER JOIN TB_SUPPLY_COMPANY S ON G.SUPPLY_COMP_CD = S.SUPPLY_COMP_CD
 		        INNER JOIN TB_GOODS_EP_SKIP GE ON G.GOODS_CD = GE.GOODS_CD
@@ -2487,7 +2486,7 @@
 		         <if test="searchGb != null and searchGb =='EXCEL'">
 		        ORDER BY SD.TMP_DISP_ORD
 		        </if>
-		<include refid="getListPagingCondition_sql"/>
+		<include refid="getListLimitPagingCondition_sql"/>
 	</select>
 
 	<!-- 네이버 EP 제외 상품 조회(기간 체크용) -->
@@ -2499,7 +2498,7 @@
 		<![CDATA[
 		AND APPLY_STDT <= DATE_FORMAT(#{applyStdt}, '%Y%m%d')
 		]]>
-		AND APPLY_EDDT >= DATE_FORMAT(#{applyEddt},'%Y%m%d%')
+		AND APPLY_EDDT >= DATE_FORMAT(#{applyEddt}, '%Y%m%d')
 		AND GOODS_CD = #{goodsCd}
 	</select>
 
@@ -2726,7 +2725,8 @@
 		FROM (
 		SELECT Z.*
 		FROM (
-		    SELECT A.*, @rownum := @rownum + 1 AS RNUM FROM (
+		    SELECT A.* 
+		    FROM (
 		        SELECT
 		                G.GOODS_CD
 		              , G.CURR_PRICE
@@ -2757,7 +2757,6 @@
 		              , FN_GET_USER_NM(GR.UPD_NO) AS UPD_NM
 		              , DATE_FORMAT(GR.UPD_DT,'%Y%m%d%H%i%S') AS UPD_DT
 		        FROM TB_GOODS G
-		        JOIN ( SELECT @rownum := 0) R
 		        INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
 		        INNER JOIN TB_SUPPLY_COMPANY S ON G.SUPPLY_COMP_CD = S.SUPPLY_COMP_CD
 		        INNER JOIN TB_GOODS_PRICE_RES GR ON G.GOODS_CD = GR.GOODS_CD
@@ -2813,7 +2812,7 @@
 		        <if test="searchGb != null and (searchGb =='EXCEL' or searchGb =='EXCELRESULT')">
 		        ORDER BY SD.TMP_DISP_ORD, GR.APPLY_STDT DESC, GR.APPLY_EDDT DESC, G.GOODS_CD, GR.GOODS_PRICE_RES_SQ
 		        </if>
-		<include refid="getListPagingCondition_sql"/>
+		<include refid="getListLimitPagingCondition_sql"/>
 	</select>
 
 	<!-- 상품 가격예약 조회(기간 체크용) -->
@@ -2825,7 +2824,7 @@
 		<![CDATA[
 		AND APPLY_STDT <= DATE_FORMAT(#{applyStdt}, '%Y%m%d%H%i%S')
 		]]>
-		AND APPLY_EDDT >= DATE_FORMAT(#{applyEddt},'%Y%m%d%H%i%S')
+		AND APPLY_EDDT >= DATE_FORMAT(#{applyEddt}, '%Y%m%d%H%i%S')
 	</select>
 
 	<!-- 상품 가격예약 등록 -->
@@ -3542,7 +3541,7 @@
 		              AND DATE_FORMAT(IA.REQ_DT, '%Y%m%d')  >= DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -15 DAY), '%Y%m%d') 
 		              </if>
 		<include refid="getGoodsListCondition_sql"/>
-		ORDER BY IA.REG_DT DESC
+		ORDER BY IA.RINBD_INFO_SQ
 	</select>
 
 	<!-- 재입고알림 목록 -->
@@ -3552,7 +3551,7 @@
 		FROM (
 		SELECT Z.*
 		FROM (
-		       SELECT A.*, @rownum := @rownum + 1 AS RNUM 
+		       SELECT A.*
 		       FROM (
 		              SELECT IA.RINBD_INFO_SQ
 		                   , IA.GOODS_CD
@@ -3578,7 +3577,6 @@
 		                   , VS.CURR_STOCK_QTY
 		                   , VS.SOLDOUT_YN
 		              FROM TB_REINBOUND_INFORM IA
-		              JOIN ( SELECT @rownum := 0) R
 		              INNER JOIN TB_GOODS G ON IA.GOODS_CD = G.GOODS_CD
 		                                    AND G.GOODS_STAT IN ('G008_70', 'G008_90', 'G008_96')
 		              INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
@@ -3631,9 +3629,9 @@
 		              AND DATE_FORMAT(IA.REQ_DT, '%Y%m%d')  >= DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -15 DAY), '%Y%m%d') 
 		              </if>
 		              <include refid="getGoodsListCondition_sql"/>
-		              ORDER BY IA.REG_DT DESC
-		<include refid="getListPagingCondition_sql"/>
-	</select>
+		              ORDER BY IA.RINBD_INFO_SQ
+		<include refid="getListLimitPagingCondition_sql"/>
+	</select> 
 	
 	<!-- 재입고 알림톡 발송처리 -->
 	<update id="updateReinboundInform" parameterType="ReinboundInform">
@@ -3812,7 +3810,7 @@
 		/* TsaGoods.getGoodsWmsIncomelotList */
 		SELECT Q.* FROM (
 		SELECT Z.* FROM (
-		SELECT A.*, @rownum := @rownum + 1 AS RNUM 
+		SELECT A.*
 		    FROM (
 		SELECT A.PRODUCT_NO
 		     , A.PRODUCT_CODE
@@ -3833,7 +3831,6 @@
 		     , FN_GET_USER_NM(A.UPD_NO) AS UPD_NM
 		     , DATE_FORMAT(A.UPD_DT,'%Y%m%d%H%i%S') AS UPD_DT
 		FROM TB_WMS_GOODS A
-		JOIN ( SELECT @rownum := 0) R
 		INNER JOIN TB_BRAND B ON A.BRAND_NO = B.BRAND_NO 
 		                           AND B.SELF_YN  = 'Y'
 		                           AND B.USE_YN  = 'Y'
@@ -3857,7 +3854,7 @@
 		AND B.BRAND_CD = #{brandCd}
 		</if>
 		ORDER BY A.UPD_DT DESC
-		<include refid="getListPagingCondition_sql"/>
+		<include refid="getListLimitPagingCondition_sql"/>
 	</select>
 	
 	<!-- 사은품 등록 -->
@@ -4578,7 +4575,7 @@
 		FROM (
 		SELECT Z.*
 		FROM (
-		    SELECT A.*, @rownum := @rownum + 1 AS RNUM 
+		    SELECT A.*
 		    FROM (
 		SELECT G.GOODS_CD
 		     , G.GOODS_NM
@@ -4598,7 +4595,6 @@
 		         </otherwise>
 		     </choose>
 		FROM TB_GOODS_SHOT_DELV_SKIP A
-		JOIN ( SELECT @rownum := 0) R
 		INNER JOIN TB_GOODS G ON A.GOODS_CD = G.GOODS_CD
 		INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
 		INNER JOIN TB_BRAND_GROUP D ON B.BRAND_GROUP_NO  = D.BRAND_GROUP_NO
@@ -4628,7 +4624,7 @@
 		            </if>
 		        <include refid="getGoodsListCondition_sql"/>
 		</if>
-		<include refid="getListPagingCondition_sql"/>
+		<include refid="getListLimitPagingCondition_sql"/>
 	</select>
 	
 	<!-- 총알배송 제외 상품 저장 -->

src/main/webapp/WEB-INF/views/goods/GoodsEpSkipForm.html

@@ -24,7 +24,6 @@
 		</div>
 		<form id="goodsEpSkipListForm" name="goodsEpSkipListForm" action="#" th:action="@{'/goods/ep/skip/list'}">
 		<input type="hidden" id="searchGb" name="searchGb" />
-		<input type="hidden" id="arrGoodsCd" name="arrGoodsCd" />
  		<!-- 패널 영역1 -->
 		<div class="panelStyle" >
 			<!-- TITLE -->

src/main/webapp/WEB-INF/views/goods/GoodsEpSkipPopupForm.html

@@ -251,7 +251,7 @@
 	
 	//창종료
 	var fnGoodsRsvtEpSkipListFormClose = function(){
-		uifnPopClose('popupGoodsEpSkip');
+		uifnPopupClose('popupGoodsEpSkip');
 		fnGoodsEpSkipResDeleteCallBack();
 	}
 

src/main/webapp/WEB-INF/views/goods/GoodsPopupListForm.html

@@ -270,6 +270,7 @@
 				}else{
 					return  params.value.replaceAll(">", ">");
 				}
+			}
 		},
 		{headerName: "전시재고", field: "stockQtySum", width: 100, cellClass: 'text-right',
 			valueFormatter: function(params) {	return params.value.addComma();}

src/main/webapp/WEB-INF/views/goods/GoodsTitleReserveForm.html

@@ -24,8 +24,7 @@
 		</div>
 		<form id="goodsTnmListForm" name="goodsTnmListForm" action="#" th:action="@{'/goods/title/reserve/list'}">
 		<input type="hidden" id="searchGb" name="searchGb" />
-		<input type="hidden" id="arrGoodsCd" name="arrGoodsCd" />
- 		<!-- 패널 영역1 -->
+		 		<!-- 패널 영역1 -->
 		<div class="panelStyle" >
 			<!-- TITLE -->
 			<div class="panelTitle">