메인전시 수정

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

@@ -704,8 +704,9 @@ public class TsaDisplayService {
 				if(contents1.getGoodsCdArr().length>0){
 					for(int i=0; i<contents1.getGoodsCdArr().length; i++){
 						contents1.setGoodsCd(contents1.getGoodsCdArr()[i]);
-						contents1.setGoodsNm(contents1.getGoodsNmArr()[i]);
-						contents1.setImgPath1(contents1.getGoodsImgArr()[i]);
+//						contents1.setGoodsNm(contents1.getGoodsNmArr()[i]);
+//						contents1.setImgPath1(contents1.getGoodsImgArr()[i]);
+						contents1.setDispOrd(Integer.parseInt(contents1.getGoodsDispOrdArr()[i]));
 						displayDao.saveContentsGoodsTemp(contents1);
 					}
 				}

src/main/java/com/style24/persistence/domain/Contents.java

@@ -72,6 +72,8 @@ public class Contents extends TscBaseDomain {
     private String[] goodsNmArr;
     @JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
     private String[] goodsImgArr;
+    @JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+    private String[] goodsDispOrdArr;
 
     @JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
     private String[] brandGroup1Arr;

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

@@ -133,6 +133,7 @@ public class Goods extends TscBaseDomain {
 //	private String searchGb;
 
 	private String blankFlag;
+	private String contentsDispOrd;
 //
 //	private Integer sizeCurrStockQty;
 //	private Integer sizeBaseStockQty;

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

@@ -1663,8 +1663,13 @@
 		    ,#{preContentsSq}
 		    ,#{contentsSq}
 		    ,#{goodsCd}
-		    ,#{goodsNm}
-		    ,#{imgPath1}
+		    ,IFNULL(#{goodsNm},'')
+		    ,IFNULL(#{imgPath1},'')
+		    <choose>
+				<when test="dispOrd != null and dispOrd != ''">
+			,#{dispOrd}
+				</when>
+				<otherwise>
 		    ,(SELECT DISP_ORD FROM (SELECT IFNULL((MAX(DISP_ORD) + 1), 1) AS DISP_ORD
 		                            FROM	TB_CONTENTS_GOODS
 		                            WHERE 1=1
@@ -1677,6 +1682,8 @@
 		                            AND BRAND_GROUP_NO = #{brandGroupNo}
 		                            </if>
 		                        ) TMP)
+				</otherwise>
+			</choose>
 		    ,#{regNo}
 		    ,NOW()
 		)
@@ -1933,6 +1940,7 @@
 		SELECT CG.GOODS_CD
 		     , G.GOODS_NM
 		     , GI.SYS_IMG_NM
+		     , CG.DISP_ORD AS CONTENTS_DISP_ORD
 		FROM TB_CONTENTS_GOODS CG
 		JOIN TB_GOODS G ON CG.GOODS_CD = G.GOODS_CD
 		JOIN TB_GOODS_IMG GI ON G.GOODS_CD = GI.GOODS_CD AND G.MAIN_COLOR_CD = COLOR_CD AND GI.DEFAULT_IMG_YN = 'Y'
@@ -1942,5 +1950,6 @@
 		</if>
 		AND CG.CONTENTS_LOC = #{contentsLoc}
 		AND CG.CONTENTS_SQ = #{dispOrd}
+		ORDER BY CG.BRAND_GROUP_NO , CG.CATE_NO ,CG.LEAF_CATE_NO ,CG.CONTENTS_LOC ,CG.PRE_CONTENTS_SQ , CG.CONTENTS_SQ , CG.DISP_ORD
 	</select>
 </mapper>

src/main/webapp/WEB-INF/views/display/MainMultiContentsPopupForm.html

@@ -182,7 +182,15 @@ console.log('brandGroupNo:'+brandGroupNo);
 		}
 		$("#multiPopSortable").append(html);
 		$("#multiPopSortable").sortable();
-		$(".itemWrap").sortable();
+		$(".itemWrap").sortable({
+			stop : function (event, table){
+				$('.tableTest').each(function (i){
+					$('#goodsListTd'+i).find('.goodsClass').each(function (j){
+						$(this).find('input[name=dispOrdEdit]').val(j+1);
+					});
+				});
+			}
+		});
 		$('.schDate').datepicker("destroy");
 		$('.schDate').datepicker({
 			changeMonth: true,
@@ -607,9 +615,10 @@ console.log('brandGroupNo:'+brandGroupNo);
 			var subText2 = '';
 			var subText3 = '';
 			var subText4 = '';
-			var goodsImgArr = [];
+			// var goodsImgArr = [];
 			var goodsCdArr = [];
-			var goodsNmArr = [];
+			// var goodsNmArr = [];
+			var goodsDispOrdArr = [];
 			var i = 1;
 			$(this).find('input[name=planImgPath]').each(function(){
 				eval("imgPath" + i + "='"+$(this).val()+"'");
@@ -642,16 +651,20 @@ console.log('brandGroupNo:'+brandGroupNo);
 				i++;
 			});
 
-			$(this).find('input[name=goodsImgPath]').each(function(){
-				goodsImgArr.push($(this).val());
-			});
+			// $(this).find('input[name=goodsImgPath]').each(function(){
+			// 	goodsImgArr.push($(this).val());
+			// });
 
 			$(this).find('input[name=goodsCd]').each(function(){
 				goodsCdArr.push($(this).val());
 			});
 
-			$(this).find('input[name=goodsNm]').each(function(){
-				goodsNmArr.push($(this).val());
+			// $(this).find('input[name=goodsNm]').each(function(){
+			// 	goodsNmArr.push($(this).val());
+			// });
+
+			$(this).find('input[name=dispOrdEdit]').each(function(){
+				goodsDispOrdArr.push($(this).val());
 			});
 
 			var dispStdt = $(this).find("[name=dispStdt]").val().replace(/[^0-9]/g, '') + "" +$(this).find("[name=stTimeHour]").val().replace('시', '') + "" +$(this).find("[name=stTimeMin]").val().replace('분', '') + "00";
@@ -716,8 +729,9 @@ console.log('brandGroupNo:'+brandGroupNo);
 				, dispOrd : dispOrd
 				, multiContentsYn : 'Y'
 				, goodsCdArr : goodsCdArr
-				, goodsNmArr : goodsNmArr
-				, goodsImgArr : goodsImgArr
+				// , goodsNmArr : goodsNmArr
+				// , goodsImgArr : goodsImgArr
+				, goodsDispOrdArr : goodsDispOrdArr
 			};
 
 			dataArr.push(data);
@@ -792,20 +806,31 @@ console.log('brandGroupNo:'+brandGroupNo);
 		// if(typeof param!='object'){
 			var imgPath = _goodsUrl;
 			for(let i=0; i<param.length; i++){
-				html += '<ul id="goodsUl'+i+'" class="item ui-state-default goodsClass" style="min-height:140px;"> ';
+				html += '<ul id="goodsUl'+i+'" class="item ui-state-default goodsClass" style="min-height:200px;"> ';
 				html += '<li class="img">';
 				html += '<img src="'+imgPath+ "/" +param[i].sysImgNm+'" onerror="this.src=\'/image/no.png\';"/>';
+				// html += '<div class="btnArea">';
+				// html += '<button type="button" class="icnSm" title="맨위로" onclick="fnUpdownBtn(\''+param[i].goodsCd+'\', \''+param[i].dispOrd+'\', \'up\');"><i class="fa fa-play-circle fa-rotate-270" aria-hidden="true"></i></button>';
+				// html += '<button type="button" class="icnSm" title="위로"><i class="fa fa-arrow-up" aria-hidden="true"></i></button>';
+				// html += '<button type="button" class="icnSm" title="맨아래로" onclick="fnUpdownBtn(\''+param[i].goodsCd+'\', \''+param[i].dispOrd+'\', \'down\');"><i class="fa fa-play-circle fa-rotate-90" aria-hidden="true"></i></button>';
+				// html += '<button type="button" class="icnSm" title="아래로"><i class="fa fa-arrow-down" aria-hidden="true"></i></button>';
+				// html += '</div>';
 				html += '</li>';
 				html += '<li class="cont">';
 				html += '<ul>';
 				html += '<li class="no" name="goodsCdLi"><span>'+param[i].goodsCd+'</span>';
-				html += '<input type="hidden" name="goodsImgPath" value="'+param[i].sysImgNm+'">';
+				// html += '<input type="hidden" name="goodsImgPath" value="'+param[i].sysImgNm+'">';
 				html += '<input type="hidden" name="goodsCd" value="'+param[i].goodsCd+'">';
-				html += '<input type="hidden" name="goodsNm" value="'+param[i].goodsNm+'">';
+				// html += '<input type="hidden" name="goodsNm" value="'+param[i].goodsNm+'">';
 				html += '<span style="margin-left:5px;"><a href="javascript:void(0);" id="delId" onclick="fnRemoveGoods(this,'+i+');">X</a></span>';
 				html += '</li>';
 				html += '</li>';
 				html += '<li class="title">'+param[i].goodsNm+'</li>';
+				html += '<li>';
+				html += '<span>전시순서 :</span>';
+				html += '<input type="text" name="dispOrdEdit" value="'+param[i].contentsDispOrd+'" />';
+				html += '<input type="hidden" name="setDispOrd" value="'+param[i].contentsDispOrd+'"/>';
+				html += '</li>';
 				html += '</ul>';
 				html += '</ul>';
 			}
@@ -848,7 +873,7 @@ console.log('brandGroupNo:'+brandGroupNo);
 			if(i==0){
 				firstOrd = result[i].dispOrd;
 			}
-			html+='<ul id="goodsUl'+i+'" class="item ui-state-default goodsClass" style="min-height:140px;" ';
+			html+='<ul id="goodsUl'+i+'" class="item ui-state-default goodsClass" style="min-height:200px;" ';
 			if(result[i].goodsStat!="G008_90" || result[i].currStockQty<1){
 				html += 'background:#f5f5f5;';
 			}
@@ -863,24 +888,24 @@ console.log('brandGroupNo:'+brandGroupNo);
 			html += '<li class="cont">';
 			html += '<ul>';
 			html += '<li class="no" name="goodsCdLi"><span>'+result[i].goodsCd+'</span>';
-			html += '<input type="hidden" name="goodsImgPath" value="'+result[i].sysImgNm+'">';
+			// html += '<input type="hidden" name="goodsImgPath" value="'+result[i].sysImgNm+'">';
 			html += '<input type="hidden" name="goodsCd" value="'+result[i].goodsCd+'">';
-			html += '<input type="hidden" name="goodsNm" value="'+result[i].goodsNm+'">';
+			// html += '<input type="hidden" name="goodsNm" value="'+result[i].goodsNm+'">';
 			html += '<span style="margin-left:5px;"><a href="javascript:void(0);" id="delId" onclick="fnRemoveGoods(this,'+i+');">X</a></span>';
 			html += '</li>';
 			html += '<li class="title">'+result[i].goodsNm+'</li>';
-			/*html += '<li>';
+			html += '<li>';
 			html += '<span>전시순서 :</span>';
-			html += '<input type="text" name="dispOrdEdit" value="" />';
-			html += '<input type="text" name="setDispOrd" value="'+result[i].dispOrd+'"/>';
-			html += '</li>';*/
+			html += '<input type="text" name="dispOrdEdit" value="'+(i+1)+'" />';
+			html += '<input type="hidden" name="setDispOrd" value="'+(i+1)+'"/>';
+			html += '</li>';
 			html += '</ul>';
 			html += '</li>';
 			html += '</ul>';
 		}
 		$("#"+addRowTd).append(html);
-		$("#"+addRowTd).sortable();
-		/*$("#"+addRowTd).sortable({
+		// $("#"+addRowTd).sortable();
+		$("#"+addRowTd).sortable({
 			stop: function(event, ui) {
 				if(gagajf.isNull(firstOrd)){
 					firstOrd = 1;
@@ -888,10 +913,10 @@ console.log('brandGroupNo:'+brandGroupNo);
 					firstOrd = Number(firstOrd);
 				}
 				$("#"+addRowTd+" .item").each(function(i){
-					$(this).find("input[name=setDispOrd]").val(i+firstOrd);
+					$(this).find("input[name=dispOrdEdit]").val(i+firstOrd);
 				});
 			}
-		});*/
+		});
 		$("#"+addRowTd).disableSelection();
 		uifnPopupClose('popupGoods');
 		fnReloadGoodsListIdx(addRowTd);