Merge branch 'develop' into eskim

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

@@ -612,7 +612,7 @@ public class TsaOcmService {
 		Goods goods = new Goods();
 		goods.setGoodsCd(param.getGoodsCd());
 		// goods.setCustNo(0);
-		goods.setFrontGb("P");
+		goods.setShoplinkerFrontGb("P");
 		goods.setSiteCd(TscConstants.Site.STYLE24.value());
 		goods = ocmDao.getGoodsInfo(goods);
 

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

@@ -724,6 +724,7 @@ public class TsaPlanService {
 		plan.setRegNo(TsaSession.getInfo().getUserNo());
 		plan.setUpdNo(TsaSession.getInfo().getUserNo());
 		plan.setGoodsCd(param.getGoodsCd());
+		plan.setDispOrd(param.getDispOrd());
 		plan.setPlanDtlSq(param.getPlanDtlSq());
 		planDao.savePlanCornerGoods(plan);
 	}
@@ -1063,7 +1064,7 @@ public class TsaPlanService {
 				String goodsTitle = multiPlanGoodsContent1.getGoodsTitle();
 				String goodsUrl = multiPlanGoodsContent1.getGoodsUrl();
 				String goodsType = multiPlanGoodsContent1.getGoodsType();
-				long goodsDispOrd = multiPlanGoodsContent1.getGoodsDispOrd();
+				int goodsDispOrd = multiPlanGoodsContent1.getGoodsDispOrd();
 				String goodsDispYn = multiPlanGoodsContent1.getGoodsDispYn();
 				Integer goodsPlanContSq = multiPlanGoodsContent1.getGoodsPlanContSq();
 				String linkOpenGb = multiPlanGoodsContent1.getGoodsLinkOpenGb();
@@ -1102,7 +1103,7 @@ public class TsaPlanService {
 				String goodsTitle = multiPlanGoodsContent2.getGoodsTitle();
 				String goodsUrl = multiPlanGoodsContent2.getGoodsUrl();
 				String goodsType = multiPlanGoodsContent2.getGoodsType();
-				long goodsDispOrd = multiPlanGoodsContent2.getGoodsDispOrd();
+				int goodsDispOrd = multiPlanGoodsContent2.getGoodsDispOrd();
 				String goodsDispYn = multiPlanGoodsContent2.getGoodsDispYn();
 				Integer goodsPlanContSq = multiPlanGoodsContent2.getGoodsPlanContSq();
 				String linkOpenGb = multiPlanGoodsContent2.getGoodsLinkOpenGb();
@@ -1141,7 +1142,7 @@ public class TsaPlanService {
 				String goodsTitle = multiPlanGoodsContent3.getGoodsTitle();
 				String goodsUrl = multiPlanGoodsContent3.getGoodsUrl();
 				String goodsType = multiPlanGoodsContent3.getGoodsType();
-				long goodsDispOrd = multiPlanGoodsContent3.getGoodsDispOrd();
+				int goodsDispOrd = multiPlanGoodsContent3.getGoodsDispOrd();
 				String goodsDispYn = multiPlanGoodsContent3.getGoodsDispYn();
 				Integer goodsPlanContSq = multiPlanGoodsContent3.getGoodsPlanContSq();
 				String linkOpenGb = multiPlanGoodsContent3.getGoodsLinkOpenGb();
@@ -1180,7 +1181,7 @@ public class TsaPlanService {
 				String goodsTitle = multiPlanGoodsContent4.getGoodsTitle();
 				String goodsUrl = multiPlanGoodsContent4.getGoodsUrl();
 				String goodsType = multiPlanGoodsContent4.getGoodsType();
-				long goodsDispOrd = multiPlanGoodsContent4.getGoodsDispOrd();
+				int goodsDispOrd = multiPlanGoodsContent4.getGoodsDispOrd();
 				String goodsDispYn = multiPlanGoodsContent4.getGoodsDispYn();
 				Integer goodsPlanContSq = multiPlanGoodsContent4.getGoodsPlanContSq();
 				String linkOpenGb = multiPlanGoodsContent4.getGoodsLinkOpenGb();
@@ -1219,7 +1220,7 @@ public class TsaPlanService {
 				String goodsTitle = multiPlanGoodsContent5.getGoodsTitle();
 				String goodsUrl = multiPlanGoodsContent5.getGoodsUrl();
 				String goodsType = multiPlanGoodsContent5.getGoodsType();
-				long goodsDispOrd = multiPlanGoodsContent5.getGoodsDispOrd();
+				int goodsDispOrd = multiPlanGoodsContent5.getGoodsDispOrd();
 				String goodsDispYn = multiPlanGoodsContent5.getGoodsDispYn();
 				Integer goodsPlanContSq = multiPlanGoodsContent5.getGoodsPlanContSq();
 				String linkOpenGb = multiPlanGoodsContent5.getGoodsLinkOpenGb();
@@ -1259,7 +1260,7 @@ public class TsaPlanService {
 				String goodsTitle = multiPlanGoodsContent6.getGoodsTitle();
 				String goodsUrl = multiPlanGoodsContent6.getGoodsUrl();
 				String goodsType = multiPlanGoodsContent6.getGoodsType();
-				long goodsDispOrd = multiPlanGoodsContent6.getGoodsDispOrd();
+				int goodsDispOrd = multiPlanGoodsContent6.getGoodsDispOrd();
 				String goodsDispYn = multiPlanGoodsContent6.getGoodsDispYn();
 				Integer goodsPlanContSq = multiPlanGoodsContent6.getGoodsPlanContSq();
 				String linkOpenGb = multiPlanGoodsContent6.getGoodsLinkOpenGb();
@@ -1298,7 +1299,7 @@ public class TsaPlanService {
 				String goodsTitle = multiPlanGoodsContent7.getGoodsTitle();
 				String goodsUrl = multiPlanGoodsContent7.getGoodsUrl();
 				String goodsType = multiPlanGoodsContent7.getGoodsType();
-				long goodsDispOrd = multiPlanGoodsContent7.getGoodsDispOrd();
+				int goodsDispOrd = multiPlanGoodsContent7.getGoodsDispOrd();
 				String goodsDispYn = multiPlanGoodsContent7.getGoodsDispYn();
 				Integer goodsPlanContSq = multiPlanGoodsContent7.getGoodsPlanContSq();
 				String linkOpenGb = multiPlanGoodsContent7.getGoodsLinkOpenGb();
@@ -1337,7 +1338,7 @@ public class TsaPlanService {
 				String goodsTitle = multiPlanGoodsContent8.getGoodsTitle();
 				String goodsUrl = multiPlanGoodsContent8.getGoodsUrl();
 				String goodsType = multiPlanGoodsContent8.getGoodsType();
-				long goodsDispOrd = multiPlanGoodsContent8.getGoodsDispOrd();
+				int goodsDispOrd = multiPlanGoodsContent8.getGoodsDispOrd();
 				String goodsDispYn = multiPlanGoodsContent8.getGoodsDispYn();
 				Integer goodsPlanContSq = multiPlanGoodsContent8.getGoodsPlanContSq();
 				String linkOpenGb = multiPlanGoodsContent8.getGoodsLinkOpenGb();
@@ -1376,7 +1377,7 @@ public class TsaPlanService {
 				String goodsTitle = multiPlanGoodsContent9.getGoodsTitle();
 				String goodsUrl = multiPlanGoodsContent9.getGoodsUrl();
 				String goodsType = multiPlanGoodsContent9.getGoodsType();
-				long goodsDispOrd = multiPlanGoodsContent9.getGoodsDispOrd();
+				int goodsDispOrd = multiPlanGoodsContent9.getGoodsDispOrd();
 				String goodsDispYn = multiPlanGoodsContent9.getGoodsDispYn();
 				Integer goodsPlanContSq = multiPlanGoodsContent9.getGoodsPlanContSq();
 				String linkOpenGb = multiPlanGoodsContent9.getGoodsLinkOpenGb();
@@ -1415,7 +1416,7 @@ public class TsaPlanService {
 				String goodsTitle = multiPlanGoodsContent10.getGoodsTitle();
 				String goodsUrl = multiPlanGoodsContent10.getGoodsUrl();
 				String goodsType = multiPlanGoodsContent10.getGoodsType();
-				long goodsDispOrd = multiPlanGoodsContent10.getGoodsDispOrd();
+				int goodsDispOrd = multiPlanGoodsContent10.getGoodsDispOrd();
 				String goodsDispYn = multiPlanGoodsContent10.getGoodsDispYn();
 				Integer goodsPlanContSq = multiPlanGoodsContent10.getGoodsPlanContSq();
 				String linkOpenGb = multiPlanGoodsContent10.getGoodsLinkOpenGb();

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

@@ -147,9 +147,9 @@ public class Goods extends TscBaseDomain {
 
 	private int goodsSq;
 	private String sizeGb;
-	private String colorCd;
-	private String frontGb;
-	private Integer custNo;
+	private String shoplinkerColorCd;		// 샵링커용
+	private String shoplinkerFrontGb;		// 샵링커용
+	private Integer shoplinkerCustNo;		// 샵링커용
 
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private String[] arrGoodsCd;
@@ -175,10 +175,10 @@ public class Goods extends TscBaseDomain {
 
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private String[] currStockQty; // wms가용재고
-	
+
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private String[] storeStockQty; // 매장가용재고
-	
+
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private String[] storeMaxQty; // wms, 매장 재고중 최대값
 
@@ -210,5 +210,5 @@ public class Goods extends TscBaseDomain {
 	private int pageNo = 1;
 	private int pageSize = 50;
 	private int pageUnit = 10;
-	
+
 }

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

@@ -69,7 +69,7 @@ public class Plan extends TscBaseDomain{
 		private String edDate;
 		@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 		private long[] dispOrdArr;			// 표시순서 배열
-		private long dispOrd;				//표시순서
+		private int dispOrd;				//표시순서
 		private long readCnt;				//조회수
 		private Integer pollSq;				//투표일련번호
 		private String badgeNm;				//뱃지이름

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

@@ -898,7 +898,7 @@
 			   VALUES (
 			    	    #{planDtlSq}
 			          , #{goodsCd}
-			          , 0
+			          , #{dispOrd}
 			          , 'N'
 			          , #{regNo}
 			          , now()

src/main/resources/config/application-tsit.yml

@@ -90,7 +90,7 @@ shoplinker:
     shoplinker_id : istyle1
     xml:
         path: /TSIT/servers/files/data/style24/shoplinker
-        view: //ts5000.ipdisk.co.kr:8999/shoplinker
+        view: http://ts5000.ipdisk.co.kr:8999/shoplinker
     url:
         option : /Product/attribute_insert.php?iteminfo_url=
         product : /Product/attribute_prod_insert.php?iteminfo_url=

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

@@ -1279,8 +1279,8 @@
 	var fnAddLinkPopRow = function (param){
 		var val = typeof param=='object'?'#':param;
 		var html = '<tr name="linkPopRow">';
-		html += '<th>링크 (없으면 #)</th>';
-		html += '<td><input name="link" type="text" maxlength="200" required="required" data-valid-name="링크" value="'+val+'"/></td>';
+		html += '<th>링크 (없으면 #)<br>(메인은 /)</th>';
+		html += '<td><input name="link" type="text" maxlength="200" required="required" data-valid-name="링크" placeholder="외부 URL 입력시 https:// 붙여주세요. ex)https://www.levis-kids.co.kr" value="'+val+'"/></td>';
 		if(contentsLoc!='SMM001' && contentsLoc!='SOM001' && contentsLoc!='SCM001' && contentsLoc!='SBM004'){
 			html += '<td class="aL"><button type="button" class="btn icn" onclick="fnDeleteTrRow(this);"><i class="fa fa-times" aria-hidden="true"></i></button></td>';
 		}

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

@@ -152,8 +152,8 @@
 			html += '		<td><input name="title" type="text" maxlength="200" data-valid-name="타이틀" value=""/></td>';
 			html += '	</tr>';
 			html += '	<tr name="tabLinkRow">';
-			html += '		<th>링크 (없으면 #)</th>';
-			html += '		<td><input name="link" type="text" maxlength="200" data-valid-name="링크" value=""/></td>';
+			html += '		<th>링크 (없으면 #)<br>(메인은 /)</th>';
+			html += '		<td><input name="link" type="text" maxlength="200" placeholder="외부 URL 입력시 https:// 붙여주세요. ex)https://www.levis-kids.co.kr" data-valid-name="링크" value=""/></td>';
 			html += '	</tr>';
 		}else{
 			html += '	<tr name="tabCateRow" style="display:none;">';
@@ -172,8 +172,8 @@
 			html += '		<td><input name="title" type="text" maxlength="200" data-valid-name="타이틀" value=""/></td>';
 			html += '	</tr>';
 			html += '	<tr name="tabLinkRow" style="display:none;">';
-			html += '		<th>링크 (없으면 #)</th>';
-			html += '		<td><input name="link" type="text" maxlength="200" data-valid-name="링크" value=""/></td>';
+			html += '		<th>링크 (없으면 #)<br>(메인은 /)</th>';
+			html += '		<td><input name="link" type="text" maxlength="200" placeholder="외부 URL 입력시 https:// 붙여주세요. ex)https://www.levis-kids.co.kr" data-valid-name="링크" value=""/></td>';
 			html += '	</tr>';
 		}
 		html += '	</tbody>';
@@ -743,8 +743,8 @@
 				html += '		<td><input name="title" type="text" maxlength="200" data-valid-name="타이틀" value="'+result[i].gtabNm+'"/></td>';
 				html += '	</tr>';
 				html += '	<tr name="tabLinkRow">';
-				html += '		<th>링크 (없으면 #)</th>';
-				html += '		<td><input name="link" type="text" maxlength="200" data-valid-name="링크" value="'+result[i].linkUrl+'"/></td>';
+				html += '		<th>링크 (없으면 #)<br>(메인은 /)</th>';
+				html += '		<td><input name="link" type="text" maxlength="200" placeholder="외부 URL 입력시 https:// 붙여주세요. ex)https://www.levis-kids.co.kr" data-valid-name="링크" value="'+result[i].linkUrl+'"/></td>';
 				html += '	</tr>';
 			}else{
 				if(result[i].contentsType=='C'){
@@ -769,8 +769,8 @@
 					html += '		<td><input name="title" type="text" maxlength="200" data-valid-name="타이틀" value="'+result[i].gtabNm+'"/></td>';
 					html += '	</tr>';
 					html += '	<tr name="tabLinkRow">';
-					html += '		<th>링크 (없으면 #)</th>';
-					html += '		<td><input name="link" type="text" maxlength="200" data-valid-name="링크" value="'+result[i].linkUrl+'"/></td>';
+					html += '		<th>링크 (없으면 #)<br>(메인은 /)</th>';
+					html += '		<td><input name="link" type="text" maxlength="200" placeholder="외부 URL 입력시 https:// 붙여주세요. ex)https://www.levis-kids.co.kr" data-valid-name="링크" value="'+result[i].linkUrl+'"/></td>';
 					html += '	</tr>';
 				}
 			}

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

@@ -463,45 +463,33 @@
 	// 상품추가
 	var fnCreateGoods = function(result) {
 		if (result.length < 1) return;
-
-		// 기존상품
+	
 		var oldGoodsList = gagaAgGrid.getAllRowData(gridOptionsGoods);
-
-		// 중복체크
-		var check = true;
-		var checkData = [];
-		$(oldGoodsList).each(function(idx) {
-
-			$(result).each(function(newIdx) {
-
-				if (oldGoodsList[idx].goodsCd == result[newIdx].goodsCd) {
-					check = false;
-					checkData.push(result[newIdx].goodsCd);
-				}
-			});
-		});
-
-		if (!check) {
-			mcxDialog.alert('아래 중복상품이 존재 합니다.<br/>' + checkData.join(","));
-			return;
-
-		} else {
-			for (var disp = 0; disp < result.length; disp++) {
+		for (var disp = 0; disp < result.length; disp++) {
+			let addChk = true;
+			
+			// 받아온 data for
+			for(let j = 0 ; j < oldGoodsList.length ; j++) {
+				if(oldGoodsList[j].goodsCd == result[disp].goodsCd) {	addChk = false;	}					// 중복체크
+			}
+			
+			if(addChk) {
 				var goods = { planDtlSq : _planDtlSq ,
-							  goodsCd : result[disp].goodsCd };
+						      goodsCd : result[disp].goodsCd ,
+						      dispOrd : oldGoodsList.length+1
+						    };
 				oldGoodsList.unshift(goods);
 			}
-			
-			mcxDialog.confirm('선택하신 상품을 추가 하시겠습니까?', {
-				cancelBtnText: "취소",
-				sureBtnText: "확인",
-				sureBtnClick: function() {
-					var jsonData = JSON.stringify(oldGoodsList);
-					gagajf.ajaxJsonSubmit('/marketing/planning/corner/goods/save', jsonData, fnConnerGoodsSearch);
-				}
-			});
-	
 		}
+		
+		mcxDialog.confirm('선택하신 상품을 추가 하시겠습니까?', {
+			cancelBtnText: "취소",
+			sureBtnText: "확인",
+			sureBtnClick: function() {
+				var jsonData = JSON.stringify(oldGoodsList);
+				gagajf.ajaxJsonSubmit('/marketing/planning/corner/goods/save', jsonData, fnConnerGoodsSearch);
+			}
+		});
 	}
 
 	// 순셔 변경 팝업

src/main/webapp/WEB-INF/views/order/OrderListForm.html

@@ -379,7 +379,7 @@ var columnDefsOrderList = [
 		, cellClass		: 'text-center'
 		, sortable		: true
 	},
-	{headerName: "출고처", field: "delvLocNm", width: 110, cellClass: 'text-center', sortable: true, hide:true},
+	{headerName: "출고처"		, field: "delvLocNm"	, width: 110	, cellClass: 'text-center'	, sortable: true, hide:true},
 	{headerName: "상품코드"	, field: "goodsCd"		, width: 100	, cellClass: 'text-center'	, sortable: true},
 	{headerName: "브랜드"		, field: "brandGroupNm"	, width: 100	, cellClass: 'text-center'	, sortable: true},
 	{headerName: "구성유형"	, field: "goodsTypeNm"	, width: 100	, cellClass: 'text-center'	, sortable: true},
@@ -481,24 +481,15 @@ var columnDefsOrderList = [
 			return gagaAgGrid.toDateTimeFormat(params.data.delvAssignDt); 
 		}
 	},
-	{
-		headerName		: "송장출력일시"
-		, field			: "invoiceDt"
-		, width			: 150
-		, cellClass		: 'text-center'
-		, valueGetter	: function (params) { 
-			return gagaAgGrid.toDateTimeFormat(params.data.invoiceDt); 
-		}
-	},
 	{headerName: "출고택배사"		, field: "shipCompNm"	, width: 150, cellClass: 'text-center'},
 	{headerName: "출고송장"		, field: "invoiceNo"	, width: 150, cellClass: 'text-center'},
 	{
 		headerName		: "출고일시"
-		, field			: "delvResDt"
+		, field			: "delvStDt"
 		, width			: 150
 		, cellClass		: 'text-center'
 		, valueGetter: function (params) { 
-			return gagaAgGrid.toDateTimeFormat(params.data.delvResDt); 
+			return gagaAgGrid.toDateTimeFormat(params.data.delvStDt); 
 		}
 	},
 	{headerName: "품절여부"		, field: "soldoutYn"	, width: 90		, cellClass: 'text-center', sortable: true},