Merge remote-tracking branch 'origin/develop' into jsh77b

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

@@ -486,7 +486,8 @@
 			               , TG.REG_DT                              
 			               , TG.UPD_NO                                                                    
 			               , TG.UPD_DT     
-			               , TG.PLAN_DTL_SQ                          
+			               , TG.PLAN_DTL_SQ
+			               , TG.DISP_ORD
 			         FROM TB_GOODS G
 					        JOIN ( SELECT @rownum := 0) R
 					        INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
@@ -494,7 +495,7 @@
 			         WHERE 1=1
 			         	 AND TG.PLAN_DTL_SQ = #{planDtlSq}
 			         	 AND TG.DEL_YN = 'N'
-			         ORDER BY G.REG_DT DESC, G.GOODS_CD
+			         ORDER BY TG.DISP_ORD, G.GOODS_CD
 		<include refid="getListPagingCondition_sql"/>
 		)Q
 	</select>
@@ -527,6 +528,7 @@
 			      DUPLICATE KEY
 			   UPDATE
 			        DEL_YN = 'N'
+			      , DISP_ORD = #{dispOrd}
 		          , UPD_DT = now()
 		          , UPD_NO = #{updNo}                                  
 	</insert>

src/main/java/com/style24/scm/biz/web/TssMarketingController.java

@@ -308,7 +308,7 @@ public class TssMarketingController extends TssBaseController {
 	@ResponseBody
 	public GagaMap createExceluploadGoods(@RequestBody Plan param) throws Exception {
 		String targetPath = env.getProperty("upload.excel.target.path") + "/excel/";
-		String[] goodsNames = {"planDtlSq", "goodsCd"};
+		String[] goodsNames = {"planDtlSq", "goodsCd", "dispOrd"};
 
 		Collection<GagaMap> ecxelGoodsList = GagaExcelUtil.getList(GagaFileUtil.getConcatenationPath(targetPath, param.getExcelFileNm()), 0, goodsNames, 0);
 

src/main/webapp/WEB-INF/views/marketing/PlanCornerListForm.html

@@ -79,7 +79,7 @@
 					코너명 : <label id="cornerNm"></label>
 				</h4>
 				<div class="aR" style="float: right; margin-top: 10px;">
-					<button type="button" class="btn btn-Right btn-default btn-lg"onclick="fnGoodsExcelUpload();">엑셀상품추가</button>
+					<button type="button" class="btn btn-Right btn-default btn-lg"onclick="fnGoodsExcelUpload();">엑셀상품추가/수정</button>
 					<button type="button" class="btn btn-default btn-lg" onclick="cfnDownloadSampleFile('SF012');">엑셀상품추가 양식 다운로드</button>
 					<button type="button" class="btn btn-default btn-lg" onclick="fnOpenGoodsPopup();">상품추가</button>
 					<!-- <button type="button" class="btn btn-default btn-lg"onclick="fnDispOrdChange();">순서변경</button> -->
@@ -356,6 +356,9 @@
 	var uploadGoodsUrl = [[${@environment.getProperty('upload.goods.view')}]];
 	var columnDefsGoods = [
 		{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
+		{headerName: "정렬"		, field:'dispOrd'		, width:50, cellClass: 'text-center'
+			, valueFormatter: function(params) { return params.value.addComma(); }
+		},
 		{headerName: "상품코드"	, field:'goodsCd'		, width:150, cellClass: 'text-left'
 			, cellRenderer: function(params) {return '<a href="javascript:void(0);">' + params.value + '</a>'; }
 		},