Merge branch 'develop' into bin2107

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

@@ -64,7 +64,7 @@ public class TsaShoplinkerService {
 	 */
 	public GagaMap createShoplinkerXml(Collection<GagaMap> ecxelGoodsList, ShoplinkerGoods shoplinkerGoods)throws IOException {
 		// 파일명 추가 네이밍 규칙
-		fileAddNm = shoplinkerGoods.getRegNo() +"_"+ GagaDateUtil.getTodayDateTime();
+		fileAddNm = shoplinkerGoods.getRegNo() +"_"+ GagaDateUtil.getToday("yyMMddHHmmss");
 
 		GagaMap rtnMap = new GagaMap();
 		int optionAll=0, optionSucc=0;
@@ -271,7 +271,7 @@ public class TsaShoplinkerService {
 				// 품목매핑정보 없음. 전송 안함
 				regMap.setXmlTxt(sbRequest.toString());
 				regMap.setApiResult("error");
-				regMap.setApiMessage("API 전송안함=>샵링커 품목매핑정보가 없습니다. (자사품목코드: "+goodsMap.getItemkindCd()+")");
+				regMap.setApiMessage("API 전송안함 : 샵링커 품목매핑정보가 없습니다. (자사품목코드: "+goodsMap.getItemkindCd()+")");
 				tscShoplinkerDao.insertShoplinerApiHst(regMap);
 			}
 
@@ -804,6 +804,7 @@ public class TsaShoplinkerService {
 	private int callGoodsRegApi(ShoplinkerGoods map, StringBuilder sbRequest, String fileNm) throws IOException {
 
 		int succCnt = 0;
+		map.setApiProductId(null);
 		com.gagaframework.shoplinker.domain.goods.result.Shoplinker shoplinkerResult;
 		com.gagaframework.shoplinker.domain.goods.result.ResultMessage resultMsg;
 
@@ -814,7 +815,7 @@ public class TsaShoplinkerService {
 
 			// XML 파일 생성
 			xmlFileName = new StringBuilder();
-			xmlFileName.append(fileNm+"_"+fileAddNm).append(".xml");
+			xmlFileName.append(fileNm+"_"+map.getGoodsCd()+"_"+fileAddNm).append(".xml");
 			String xmlPath = GagaFileUtil.getConcatenationPath(map.getXmlPath(), xmlFileName.toString());
 			shoplinkerUtil.makeRequestXmlFile(sbRequest.toString(), xmlPath);
 			String xmlUrl = GagaFileUtil.getConcatenationPath(map.getDomainUrl(), xmlFileName.toString());
@@ -850,12 +851,12 @@ public class TsaShoplinkerService {
 			map.setApiMessage("API 통신오류");
 		}
 
-		// 생성 파일삭제
-		GagaFileUtil.deleteFile(GagaFileUtil.getConcatenationPath(map.getXmlPath(), xmlFileName.toString()));
-
 		// 전송이력 저장
 		tscShoplinkerDao.insertShoplinerApiHst(map);
 
+		// 생성 파일삭제
+		GagaFileUtil.deleteFile(GagaFileUtil.getConcatenationPath(map.getXmlPath(), xmlFileName.toString()));
+
 		return succCnt;
 	}
 

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

@@ -2112,11 +2112,22 @@ public class TsaGoodsController extends TsaBaseController {
 		GagaMap result = new GagaMap();
 
 		// 입점업체담당자는 업체코드 설정
-		if ("G001-B000".equals(TsaSession.getInfo().getRoleCd())) {
+		if ("G001_B000".equals(TsaSession.getInfo().getRoleCd())) {
 			goodsSearch.setSupplyCompCd(TsaSession.getInfo().getSupplyCompCd());
 			goodsSearch.setMdNo(TsaSession.getInfo().getUserNo().toString());
 		}
 
+		// multi row 검색관련 처리
+		if (!StringUtils.isBlank(goodsSearch.getCondition())) {
+			goodsSearch.setConditionList(goodsSearch.getCondition().replaceAll("\r", "").trim().split("\n"));
+
+			if ("searchExtendGoodsCd".equals(goodsSearch.getSearch())) {
+				goodsSearch.setSearchGb("EXTEND");
+			} else if ("searchMasterGoodsCd".equals(goodsSearch.getSearch())) {
+				goodsSearch.setSearchGb("MASTER");
+			}
+		}
+		
 		goodsSearch.setRegNo(TsaSession.getInfo().getUserNo()); // 엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
 		goodsSearch.setPageable(new TscPageRequest(goodsSearch.getPageNo() - 1, goodsSearch.getPageSize()));
 		goodsSearch.getPageable().setTotalCount(goodsService.getGoodsResSellCount(goodsSearch));

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

@@ -55,6 +55,7 @@ public class CardPromotion extends TscBaseDomain {
 	private int minPayAmt;	// 최소결제금액
 	private String dcWay;	// 할인구분할인방식(공통코드G240, 프로모션구분이 A:할인인 경우)
 	private int dcVal;	// 할인값(프로모션구분이 A:할인인 경우, 할인방식이 금액이면 할인금액, 율이면 할인율)
+	private String dcValNm;
 	private int maxDcAmt;	// 최대할인금액(프로모션구분이 A:할인인 경우)
 	private String minNoItrt;	// 최소무이자월수(프로모션구분이 B:무이자 인경우)
 	private String maxNoItrt;	// 최대무이자월수(프로모션구분이 B:무이자 인경우)

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

@@ -316,6 +316,10 @@
 		         , B.MIN_PAY_AMT
 		         , B.DC_WAY
 		         , B.DC_VAL
+		         , (CASE WHEN B.DC_WAY = 'G240_10' THEN CONCAT(B.DC_VAL, '원')
+		                 WHEN B.DC_WAY = 'G240_11' THEN CONCAT(B.DC_VAL, '%')
+		                 ELSE '' END
+		            ) DC_VAL_NM
 		         , B.MAX_DC_AMT
 		         , B.MIN_NO_ITRT
 		         , B.MAX_NO_ITRT

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

@@ -4784,7 +4784,7 @@
 		                ,B.TOTALQTY
 		                ,B.SKUMODELNO
 		                , (CASE WHEN INSTR(REPLACE(B.SKUMODELNO, ' ' , ''), 'F20') = 1 THEN LEFT(REPLACE(B.SKUMODELNO, ' ' , ''),12)
-		                        WHEN INSTR(REPLACE(B.SKUMODELNO, ' ' , ''), '-') > 0 AND INSTR(REPLACE(B.SKUMODELNO, ' ' , ''), '-') <![CDATA[<]]> 10THEN LEFT(REPLACE(B.SKUMODELNO, ' ' , ''),11)
+		                        WHEN INSTR(REPLACE(B.SKUMODELNO, ' ' , ''), '-') > 0 AND INSTR(REPLACE(B.SKUMODELNO, ' ' , ''), '-') <![CDATA[<]]> 10 THEN LEFT(REPLACE(B.SKUMODELNO, ' ' , ''),11)
 		                        ELSE LEFT(REPLACE(B.SKUMODELNO, ' ' , ''),10) END) AS GOODS_CD
 		                FROM TB_IF_INCOMELOT A
 		                INNER JOIN TB_IF_INCOMELOTITEM B ON A.LOTNO = B.LOTNO

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

@@ -98,10 +98,10 @@
 			<!-- 상단영역 START -->
 			<ul class="panelBar">
 				<li>
-					<span style="padding:5.5px 15px; background:#e9ecfb !important; border-top:1px solid #ddd; border-bottom:0.5px solid #dae0fd; font-weight: bold;">미리보기위치</span>
-					<select name="viewPage" id="viewPageView" onchange="fnChangeViewPage('View')" >
+					<span style="padding:5.5px 15px; background:#e9ecfb !important; border-top:1px solid #ddd; border-bottom:0.5px solid #dae0fd; font-weight: bold;">미리보기</span>
+					<!-- <select name="viewPage" id="viewPageView" onchange="fnChangeViewPage('View')" >
 						<option th:if="${viewPageList}" th:each="oneData, status : ${viewPageList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
-					</select>
+					</select> -->
 					<select name="cateNo" id="cateNoView" class='off' data-valid-name="대카테고리">
 						<option value="">[선택]</option>
 						<option th:if="${cateNoList}" th:each="oneData, status : ${cateNoList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
@@ -405,6 +405,35 @@
 	 * 조회
 	 */
 	$('#btnSearch').on('click', function (){
+		
+		if (!gagajf.isNull($("#searchForm input[name=dispStdt]").val()) || !gagajf.isNull($("#searchForm input[name=dispEddt]").val())){
+			
+			if (gagajf.isNull($("#searchForm input[name=dispStdt]").val()) || gagajf.isNull($("#searchForm input[name=dispEddt]").val())){
+				mcxDialog.alertC("전시기간 조회시 시작일자와 종료일자를 입력하세요.", {
+					sureBtnText: "확인",
+					sureBtnClick: function() {
+						$('#searchForm input[name=dispStdt]').focus();
+					}
+				});
+				return false;
+			}
+			
+		
+			var fromDate = $("#searchForm input[name=dispStdt]").val().replaceAll('-', '')+ $("#searchForm select[name=schStTimeHour]").val()+ $("#searchForm select[name=schStTimeMin]").val();
+			var toDate = $("#searchForm input[name=dispEddt]").val().replaceAll('-', '')+ $("#searchForm select[name=schEdTimeHour]").val()+ $("#searchForm select[name=schEdTimeMin]").val();
+	
+			if (fromDate > toDate) {
+				mcxDialog.alertC("전시기간의 시작일시는 종료일시 보다 클 수 없습니다.", {
+					sureBtnText: "확인",
+					sureBtnClick: function() {
+						$('#searchForm input[name=dispStdt]').focus();
+					}
+				});
+				return false;
+			}
+		}
+		
+		
 		$("#searchForm input[name=dispStTime]").val($('#searchForm #schStTimeHour').val()+$('#searchForm #schStTimeMin').val()+'00');
 		$("#searchForm input[name=dispEdTime]").val($('#searchForm #schEdTimeHour').val()+$('#searchForm #schEdTimeMin').val()+'59');
 		fnSearch();
@@ -483,6 +512,40 @@
 		imgDivLen = 1;
 	});
 
+	// 미리보기
+	$("#btnView").on("click", function(){
+		if($("#viewDate").val()==""){
+			mcxDialog.alert("미리보기 일시를 입력해 주세요")
+			return;
+		}
+		
+		var selectRowData = gagaAgGrid.selectedRowData(gridOptions);
+		
+		if (selectRowData.length == 0) {
+			mcxDialog.alert('미리보기 할 팝업을 선택하세에요.');
+			return;
+		}else if (selectRowData.length > 1) {
+			mcxDialog.alert('미리보기 할 팝업만 선택하세에요.');
+			return;
+		}
+		
+		var viewPage = selectRowData[0].viewPage;
+		var cateNo = selectRowData[0].cateNo;
+		var brandCd = selectRowData[0].brandCd;
+		var planSq = selectRowData[0].planSq;
+		
+		var uriMap = new Map();
+		uriMap.set("G037_10", "/display/mall/main/form?");
+		uriMap.set("G037_20", "/display/mall/main/form?");
+		uriMap.set("G037_30", "/display/category/main/form?cateGb=G032_101&cate1No="+cateNo);
+		uriMap.set("G037_31", "/display/brand/main/form?brandGroupNo="+brandCd);
+		uriMap.set("G037_32", "/display/outlet/main/form?cateGb=G032_103");
+		uriMap.set("G037_40", "/planning/detail/form?planSq="+planSq);
+		_mall = [[${@environment.getProperty('domain.front')}]];
+		window.open("about:blank").location.href= _mall + uriMap.get(viewPage) + "&viewPage=" + viewPage + "&preview=Y&viewDt="+$("#viewDate").val().replace(/-/gi, '')+$("#viewTimeHour").val()+$("#viewTimeMin").val()+"00";
+	});
+	
+	
 	// 데이터 validation 체크
 	function dataValidation(){
 		// 날짜체크

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

@@ -55,7 +55,6 @@
 								<option value="searchGoodsNm">상품명</option>
 								<option value="searchGoodsNum">품번</option>
 								<option value="searchSupplyGoodsCd">업체상품코드</option>
-								<option value="searchRegId">등록자</option>
 							</select>
 							<input type="text" class="w50p" name="condition" id="condition" maxlength="50"/>
 						</td>

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

@@ -26,9 +26,9 @@
 		<input type="hidden" id="prmtGb" name="prmtGb" value="B" /> <!-- 무이자 -->
  		<!-- 패널 영역1 -->
 		<div class="panelStyle" >
-			<div class="panelTitle">
+			<!-- <div class="panelTitle">
 				<h3><i class="fa fa-info-circle"></i>아래 검색조건 중 하나를 꼭 입력해 주세요.</h3>
-			</div>
+			</div> -->
 			<div class="panelContent">
 				<table class="frmStyle">
 					<colgroup>
@@ -169,7 +169,7 @@
 		var searchFlag = false;
 		var cnt = 0;
 		
-		for (i = 0; i < form.elements.length; i++ ) {
+		/* for (i = 0; i < form.elements.length; i++ ) {
 			var el = form.elements[i];
 			if ($(el).prop("type") == "text" || $(el).prop("type") == "textarea" || ($(el).prop("type") == "select-one" && 
 					el.name != "search" && el.name != "pageSize" && el.name != "beforSkipFlag")) {
@@ -179,13 +179,13 @@
 			}
 		}
 		
-		if(cnt > 0) searchFlag = true;
+		if(cnt > 0) searchFlag = true; 
 		
 		if(searchFlag == false){
 			mcxDialog.alert("검색조건을 입력하세요.");
 			return false;
 		}
-		
+		*/
 		var fromDate = $('#cardInterestSearchForm input[name=stDate]').val();
 		var toDate = $('#cardInterestSearchForm input[name=edDate]').val();
 		
@@ -345,7 +345,7 @@
 		cfnCreateCalendar('#sellTerms', 'stDate', 'edDate', true, '기간', 'X');
 		var chkBeforSkipFlag = '&nbsp;&nbsp;<label class="chkBox"><input type="checkbox" name="beforSkipFlag" value="Y" >이전데이터 제외</label>';
 		$("#cardInterestSearchForm").find('#sellTerms').append(chkBeforSkipFlag);
-		gagajf.setDate('#sellTerms','stDate', 'edDate', '7d');
+		//gagajf.setDate('#sellTerms','stDate', 'edDate', '7d');
 		
 		// Create a agGrid
 		gagaAgGrid.createGrid('gridList', gridOptions);

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

@@ -206,6 +206,30 @@
 		if (!gagajf.validation('#cardInterestForm'))
 			return false;
 		
+		if (gagajf.isNull($("#cardInterestForm input[name=prmtStd]").val()) || gagajf.isNull($("#cardInterestForm input[name=prmtEdd]").val())){
+			mcxDialog.alertC("행사기간의 시작일자와 종료일자를 바르게 입력하세요.", {
+				sureBtnText: "확인",
+				sureBtnClick: function() {
+					$('#cardInterestForm input[name=prmtStd]').focus();
+				}
+			});
+			return false;
+		}
+		
+	
+		var fromDate = $("#cardInterestForm input[name=prmtStd]").val().replaceAll('-', '');
+		var toDate = $("#cardInterestForm input[name=prmtEdd]").val().replaceAll('-', '');
+
+		if (fromDate > toDate) {
+			mcxDialog.alertC("전시기간의 시작일시는 종료일시 보다 클 수 없습니다.", {
+				sureBtnText: "확인",
+				sureBtnClick: function() {
+					$('#cardInterestForm input[name=prmtStd]').focus();
+				}
+			});
+			return false;
+		}
+		
 		var idx = 0;
 		$('#cardInterestForm').find('#cardContionList tr').each(function() {
 			var minNoItrt = $(this).find("input[name=arrMinNoItrt]").val();

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

@@ -26,9 +26,9 @@
 		<input type="hidden" id="prmtGb" name="prmtGb" value="B" /> <!-- 무이자 -->
  		<!-- 패널 영역1 -->
 		<div class="panelStyle" >
-			<div class="panelTitle">
+			<!-- <div class="panelTitle">
 				<h3><i class="fa fa-info-circle"></i>아래 검색조건 중 하나를 꼭 입력해 주세요.</h3>
-			</div>
+			</div> -->
 			<div class="panelContent">
 				<table class="frmStyle">
 					<colgroup>
@@ -112,7 +112,7 @@
 			valueFormatter: function (params) { return gagaAgGrid.lookupValue(dcGbList, params.value); }
 		},
 		{headerName: "할인조건", field: "minPayAmt", width: 150, cellClass: 'text-center'},
-		{headerName: "할인액", field: "dcVal", width: 150, cellClass: 'text-center'},
+		{headerName: "할인(원, %)", field: "dcValNm", width: 150, cellClass: 'text-center'},
 		{headerName: "노출여부", field: "dispYn", width: 100, cellClass: 'text-center'},
 		{headerName: "시작일", field: "prmtStd", width: 120, cellClass: 'text-center'},
 		{headerName: "종료일", field: "prmtEdd", width: 120, cellClass: 'text-center'},
@@ -176,7 +176,7 @@
 		var searchFlag = false;
 		var cnt = 0;
 		
-		for (i = 0; i < form.elements.length; i++ ) {
+		/* for (i = 0; i < form.elements.length; i++ ) {
 			var el = form.elements[i];
 			if ($(el).prop("type") == "text" || $(el).prop("type") == "textarea" || ($(el).prop("type") == "select-one" && 
 					el.name != "search" && el.name != "pageSize" && el.name != "beforSkipFlag")) {
@@ -192,7 +192,7 @@
 			mcxDialog.alert("검색조건을 입력하세요.");
 			return false;
 		}
-		
+		 */
 		var fromDate = $('#cardPromotionSearchForm input[name=stDate]').val();
 		var toDate = $('#cardPromotionSearchForm input[name=edDate]').val();
 		
@@ -352,7 +352,7 @@
 		cfnCreateCalendar('#sellTerms', 'stDate', 'edDate', true, '기간', 'X');
 		var chkBeforSkipFlag = '&nbsp;&nbsp;<label class="chkBox"><input type="checkbox" name="beforSkipFlag" value="Y" >이전데이터 제외</label>';
 		$("#cardPromotionSearchForm").find('#sellTerms').append(chkBeforSkipFlag);
-		gagajf.setDate('#sellTerms','stDate', 'edDate', '7d');
+		//gagajf.setDate('#sellTerms','stDate', 'edDate', '7d');
 		
 		// Create a agGrid
 		gagaAgGrid.createGrid('gridList', gridOptions);

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

@@ -203,6 +203,30 @@
 		// 입력 값 체크
 		if (!gagajf.validation('#cardPromotionForm'))
 			return false;
+			
+		if (gagajf.isNull($("#cardPromotionForm input[name=prmtStd]").val()) || gagajf.isNull($("#cardPromotionForm input[name=prmtEdd]").val())){
+			mcxDialog.alertC("행사기간의 시작일자와 종료일자를 바르게 입력하세요.", {
+				sureBtnText: "확인",
+				sureBtnClick: function() {
+					$('#cardPromotionForm input[name=prmtStd]').focus();
+				}
+			});
+			return false;
+		}
+		
+	
+		var fromDate = $("#cardPromotionForm input[name=prmtStd]").val().replaceAll('-', '');
+		var toDate = $("#cardPromotionForm input[name=prmtEdd]").val().replaceAll('-', '');
+
+		if (fromDate > toDate) {
+			mcxDialog.alertC("전시기간의 시작일시는 종료일시 보다 클 수 없습니다.", {
+				sureBtnText: "확인",
+				sureBtnClick: function() {
+					$('#cardPromotionForm input[name=prmtStd]').focus();
+				}
+			});
+			return false;
+		}
 		
 		var idx = 0;
 		$('#cardPromotionForm').find('#cardContionList tr').each(function() {

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

@@ -837,34 +837,25 @@ var columnDefsOrderChangeInfo = [
 			return (params.value == 'N') ? '미전송' : '전송';
 		}
 	},
-	/*
-	{
-		headerName		: "요청취소"
-		, field			: "ordDtlNo"
-		, width			: 100
-		, cellClass		: 'text-center'
-		, cellRenderer	: function (params) {
-			var retStr = "";
-			
-			if (params.data.chgGb == "G680_30" && params.data.chgStat == "G685_40") {
-				retStr = ' <button type="button" class="btn btn-success" onclick="fnReturnReqeustCancel(\'' + params.data.ordChgSq + '\',\'' + params.value + '\',\'' + params.node.rowIndex + '\');">반품취소</button>';
-			} else if (params.data.chgGb == "G680_40" && params.data.chgStat == "G685_30") {
-				retStr = ' <button type="button" class="btn btn-success" onclick="fnExchangeReqeustCancel(\'' + params.data.ordChgSq + '\',\'' + ordNo + '\',\'' + params.value + '\',\'' + params.node.rowIndex + '\');">교환취소</button>';
-			} else if (params.data.chgGb == "G680_20" && params.data.chgStat == "G685_20") {
-				retStr = '<button type="button" class="btn btn-success" onclick="fnCancelConfirmRequestCancel(\'' + params.data.ordChgSq + '\')">요청철회</button>';
-			}
-
-			return retStr;
-		}
-	},
-	*/
 	{
 		headerName		: "회수지시전송"
 		, field			: "wdInvoiceSendYn"
 		, width			: 120
 		, cellClass		: 'text-center'
 	},
-	{headerName: "회수송장번호", field: "wdInvoiceNo", width: 90, cellClass: 'text-center'}
+	{
+		headerName		: "회수송장번호"
+		, field			: "wdInvoiceNo"
+		, width			: 150
+		, cellClass		: 'text-center'
+		, cellRenderer	: function (params) {
+			var retStr = '';
+			if (!gagajf.isNull(params.value)) {
+				retStr = '<a href="javascript:void(0);" onclick="fnSweetTracker(\'' + params.data.shipCompCd + '\',\'' + params.data.wdInvoiceNo + '\');">' + params.value + '</a>';
+			}
+			return retStr;
+		}
+	}
 ];
 var gridOptionsOrderChangeInfo = gagaAgGrid.getGridOptions(columnDefsOrderChangeInfo);
 

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

@@ -363,15 +363,7 @@ var columnDefsOrderList = [
 			return gagaAgGrid.lookupValue(payMeansList, params.data.payMeans); 
 		}
 	},
-	{
-		headerName		: "신규/교환"
-		, field			: "ordExchGb"
-		, width			: 100
-		, cellClass		: 'text-center',
-		valueGetter 	: function (params) {
-			return params.data.ordExchGb === 'O' ? '신규' : '교환';
-		}
-	},
+	{headerName: "원주문/교환"	, field: "exchGbNm"		, width: 100	, cellClass: 'text-center'	, sortable: true},
 	{
 		headerName		: "주문상태"
 		, field			: "ordDtlStatNm"

src/main/webapp/WEB-INF/views/shoplinker/ShoplinkerGoodsSendForm.html

@@ -367,7 +367,7 @@
 				cfnExcelUploadPopup('shoplinkerUploadGoods', 'shoplinkerUploadGoods');
 
 			}else{
-				mcxDialog.alert(result.runStdt+"에 호출한 건이 현재 실행중입니다.<br>"+result.txt);
+				mcxDialog.alert(result.runStdt+"에 호출한 건이 현재 실행중입니다.");
 			}
 		});
 	});

src/main/webapp/WEB-INF/views/shoplinker/ShoplinkerInvoiceSendForm.html

@@ -313,7 +313,7 @@
 						$.post(actionUrl, null, null, 'json');
 
 					}else{
-						mcxDialog.alert(result.runStdt+"에 호출한 건이 현재 실행중입니다.<br>"+result.txt);
+						mcxDialog.alert(result.runStdt+"에 호출한 건이 현재 실행중입니다.");
 					}
 
 				});

src/main/webapp/WEB-INF/views/shoplinker/ShoplinkerOrderForm.html

@@ -29,7 +29,7 @@
 
 			<div class="panelStyle">
 				<div class="panelTitle">
-					<h3><i class="fa fa-info-circle"></i>[배치주기] 평일: 7시~15시 한시간 단위 / 7시: 전날 15 ~ 금일 6시 / 월요일 7시: 전주 금요일 15 ~ 금일 6시 T3</h3>
+					<h3><i class="fa fa-info-circle"></i>[배치주기] 평일: 5시~15시 한시간 단위 | (월) 5시: 전주 금요일 15 ~ 금일 5시 / (화~금) 5시: 전날 15 ~ 금일 5시 //T0</h3>
 					<span class="panelControl">
 						<i class="fa fa-chevron-up"></i>
 					</span>