Merge branch 'style' into ST24PRJ-596

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

@@ -401,40 +401,12 @@ public class TsaDeliveryService {
 	 * @since 2021. 04. 19
 	 */
 	public Collection<Delivery> getAssignList(Delivery delivery) {
-		// multi row 검색관련 처리
-//		
-//		if (StringUtils.isNotBlank(delivery.getCondition())) {
-//			TsitUtil tsitUtil = new TsitUtil();
-//			String searchCondition = tsitUtil.replaceMultiSelectParamsArr(delivery.getCondition());
-//			delivery.setConditions(searchCondition.split(","));
-//		}
-
+		
 		// 외부몰권한일 때 외부몰벤더ID 설정
 		if (TsaSession.getInfo().getRoleCd().startsWith("G001_C")) {
 			delivery.setMallGb(TsaConstants.MallGb.EXTMALL.value());
 			delivery.setVendorId(TsaSession.getInfo().getVendorId());
 		}
-//		
-//		if (!StringUtils.isBlank(delivery.getBrandList())) {
-//			try {
-//				String [] arrBrandCd = mapper.readValue(delivery.getBrandList(), String[].class);
-//				delivery.setMultiBrand(arrBrandCd);
-//			} catch (Exception e) {
-//				e.printStackTrace();
-//				throw new IllegalStateException("브랜드코드 검색중 오류로 인해 조회되지 않았습니다.");
-//			}
-//		}
-//
-//		if (!StringUtils.isBlank(delivery.getSupplyCompList())) {
-//			try {
-//				String [] arrSupplyComp = mapper.readValue(delivery.getSupplyCompList(), String[].class);
-//				delivery.setMultiSupplyCompCd(arrSupplyComp);
-//			} catch (Exception e) {
-//				e.printStackTrace();
-//				throw new IllegalStateException("업체코드 검색중 오류로 인해 조회되지 않았습니다.");
-//			}
-//		}
-		
 		
 		return deliveryDao.getAssignList(delivery);
 	}	

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

@@ -1,6 +1,5 @@
 package com.style24.admin.biz.web;
 
-import java.util.ArrayList;
 import java.util.Collection;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -8,29 +7,30 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.servlet.ModelAndView;
 
-import com.style24.admin.biz.service.TsaRendererService;
+import com.gagaframework.web.parameter.GagaMap;
+import com.gagaframework.web.rest.server.GagaResponse;
 import com.style24.admin.biz.service.TsaDeliveryService;
+import com.style24.admin.biz.service.TsaOcmService;
+import com.style24.admin.biz.service.TsaRendererService;
 import com.style24.admin.support.controller.TsaBaseController;
 import com.style24.admin.support.security.session.TsaSession;
-import com.style24.core.support.session.TscSession;
+import com.style24.core.support.env.TscConstants;
 import com.style24.core.support.message.TscMessageByLocale;
+import com.style24.core.support.session.TscSession;
 import com.style24.persistence.TscPageRequest;
 import com.style24.persistence.domain.Delivery;
-
+import com.style24.persistence.domain.Extmall;
 
 import lombok.extern.slf4j.Slf4j;
 
-import com.gagaframework.web.parameter.GagaMap;
-import com.gagaframework.web.rest.server.GagaResponse;
-
 /**
  * 배송 Controller
  *
@@ -53,10 +53,10 @@ public class TsaDeliveryController extends TsaBaseController {
 
 	@Autowired
 	private TsaDeliveryService deliveryService;
-
-	
-	
 	
+	@Autowired
+	private TsaOcmService ocmService;
+
 	@Value("${upload.default.target.path}")
 	private String uploadTargetPath;
 
@@ -71,27 +71,28 @@ public class TsaDeliveryController extends TsaBaseController {
 		ModelAndView mav = new ModelAndView();
 
 		// 몰구분
-		//mav.addObject("mallGbList", rendererService.getMallGbCommonCodeList(TsaSession.getInfo().getRoleCd()));
 		mav.addObject("mallGbList", rendererService.getAvailCommonCodeList("G011"));
+		
 		// 주문상세상태코드
 		mav.addObject("ordDtlStatList", rendererService.getAvailCommonCodeList("G013"));
+		
 		// 출고처
 		mav.addObject("deliveryLocList", rendererService.getDeliveryLocAllList());
+		
 		// 사이트구분
 		mav.addObject("siteCdList", rendererService.getAvailCommonCodeList("G000"));
+		
 		// 택배사명 목록
 		mav.addObject("shipCompanyList", rendererService.getShipCompanyList());
-		// 출고처분류
-		// mav.addObject("delvTypeList", rendererService.getAvailCommonCodeList("G024"));
-		
-		String supplyCompCd = "";
-		if ("G001_B000".equals(TsaSession.getInfo().getRoleCd())) {
-			supplyCompCd = TsaSession.getInfo().getSupplyCompCd();
-		}
 		
 		// 공급업체
 		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList("","Y"));
-        //mav.addObject("vendorList", rendererService.getVendorCommonCodeList(TsaSession.getInfo().getRoleCd()));
+		
+		// 제휴몰
+		Extmall extmall = new Extmall();
+		extmall.setVendorId(TscConstants.VendorId.SHOPLINKER.value()); // 샵링커
+		mav.addObject("extmallList", ocmService.getExtmallList(extmall));
+		mav.addObject("vendorId", TscConstants.VendorId.SHOPLINKER.value());
 
 		mav.setViewName("delivery/DeliveryListForm");
 
@@ -181,11 +182,11 @@ public class TsaDeliveryController extends TsaBaseController {
 	@PostMapping("/list/soldout")
 	@ResponseBody
 	public GagaResponse soldoutDeliveryList(@RequestBody Collection<Delivery> deliveryList) throws Exception {
+		
 		if (deliveryList == null || deliveryList.isEmpty()) {
 			throw new IllegalStateException(message.getMessage("FAIL_1002"));
 		}
-		//deliveryService.cancelSoldout(deliveryList);
-
+		
 		return super.ok(message.getMessage("SUCC_0004"));
 	}
 	
@@ -306,6 +307,7 @@ public class TsaDeliveryController extends TsaBaseController {
 
 		// 공급업체
 		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList("","Y"));
+		
 		// 출고처 목록
 		mav.addObject("getDeliveryLocList", rendererService.getDeliveryLocAllList());
 		
@@ -413,15 +415,23 @@ public class TsaDeliveryController extends TsaBaseController {
 
 		// 몰구분
 		mav.addObject("mallGbList", rendererService.getAvailCommonCodeList("G011"));
+		
 		// 주문상세상태코드
 		mav.addObject("ordDtlStatList", rendererService.getAvailCommonCodeList("G013"));
+		
 		// 출고처
 		mav.addObject("deliveryLocList", rendererService.getDeliveryLocList(""));
+		
 		// 사이트구분
 		mav.addObject("siteCdList", rendererService.getAvailCommonCodeList("G000"));
-
-		
 		
+		// 제휴몰
+		Extmall extmall = new Extmall();
+		extmall.setVendorId(TscConstants.VendorId.SHOPLINKER.value()); // 샵링커
+		mav.addObject("extmallList", ocmService.getExtmallList(extmall));
+		mav.addObject("vendorId", TscConstants.VendorId.SHOPLINKER.value());
+		mav.setViewName("delivery/ExchangeDelvFailListForm");
+
 		mav.setViewName("delivery/AssignListForm");
 
 		return mav;
@@ -445,7 +455,6 @@ public class TsaDeliveryController extends TsaBaseController {
 		delivery.setPageable(new TscPageRequest(delivery.getPageNo() - 1, delivery.getPageSize()));
 		delivery.getPageable().setTotalCount(deliveryService.getAssignListCount(delivery));
 
-
 		if ("N".equals(delivery.getPageingYn())) {
 			delivery.setPageable(null);
 		}
@@ -457,7 +466,7 @@ public class TsaDeliveryController extends TsaBaseController {
 	}
 
 	/**
-	 * 출고처지정 팝업 화변
+	 * 출고처지정 팝업 화면
 	 *
 	 * @param
 	 * @return
@@ -551,9 +560,14 @@ public class TsaDeliveryController extends TsaBaseController {
 	@RequestMapping(value = "/exchangeDelvFail/list/form")
 	public ModelAndView deliveryExchangeDelvFailListForm() throws Exception {
 		ModelAndView mav = new ModelAndView();
-
+		
+		// 제휴몰
+		Extmall extmall = new Extmall();
+		extmall.setVendorId(TscConstants.VendorId.SHOPLINKER.value()); // 샵링커
+		mav.addObject("extmallList", ocmService.getExtmallList(extmall));
+		mav.addObject("vendorId", TscConstants.VendorId.SHOPLINKER.value());
 		mav.setViewName("delivery/ExchangeDelvFailListForm");
-
+		
 		return mav;
 	}
 	
@@ -585,27 +599,33 @@ public class TsaDeliveryController extends TsaBaseController {
 		ModelAndView mav = new ModelAndView();
 
 		// 몰구분
-		//mav.addObject("mallGbList", rendererService.getMallGbCommonCodeList(TsaSession.getInfo().getRoleCd()));
 		mav.addObject("mallGbList", rendererService.getAvailCommonCodeList("G011"));
+		
 		// 주문상세상태코드
 		mav.addObject("ordDtlStatList", rendererService.getAvailCommonCodeList("G013"));
+		
 		// 출고처
 		mav.addObject("deliveryLocList", rendererService.getDeliveryLocAllList());
+		
 		// 사이트구분
 		mav.addObject("siteCdList", rendererService.getAvailCommonCodeList("G000"));
+		
 		// 택배사명 목록
 		mav.addObject("shipCompanyList", rendererService.getShipCompanyList());
-		// 출고처분류
-		// mav.addObject("delvTypeList", rendererService.getAvailCommonCodeList("G024"));
 		
 		String supplyCompCd = "";
 		if ("G001_B000".equals(TsaSession.getInfo().getRoleCd())) {
 			supplyCompCd = TsaSession.getInfo().getSupplyCompCd();
 		}
 		
+		// 제휴몰
+		Extmall extmall = new Extmall();
+		extmall.setVendorId(TscConstants.VendorId.SHOPLINKER.value()); // 샵링커
+		mav.addObject("extmallList", ocmService.getExtmallList(extmall));
+		mav.addObject("vendorId", TscConstants.VendorId.SHOPLINKER.value());
+		
 		// 공급업체
 		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList("","Y"));
-        //mav.addObject("vendorList", rendererService.getVendorCommonCodeList(TsaSession.getInfo().getRoleCd()));
 
 		mav.setViewName("delivery/DeliveryListScmForm");
 

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

@@ -628,6 +628,17 @@ public class TsaGoodsController extends TsaBaseController {
 				throw new IllegalStateException("업체코드 검색중 오류로 인해 조회되지 않았습니다.");
 			}
 		}
+		
+		if (!StringUtils.isBlank(goodsSearch.getItemkindList())) {
+			try {
+				String[] arrItemkind = mapper.readValue(goodsSearch.getItemkindList(), String[].class);
+				goodsSearch.setMultiItemkindCd(arrItemkind);
+			} catch (Exception e) {
+				e.printStackTrace();
+				throw new IllegalStateException("품목 검색중 오류로 인해 조회되지 않았습니다.");
+			}
+		}
+		
 		log.info("[goodsSearch] ={}", goodsSearch);
 		goodsSearch.setRegNo(TsaSession.getInfo().getUserNo()); // 엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
 		goodsSearch.setPageable(new TscPageRequest(goodsSearch.getPageNo() - 1, goodsSearch.getPageSize()));

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

@@ -151,6 +151,23 @@ public class TsaOrderChangeController extends TsaBaseController {
 		mav.addObject("delvFeeCd"					, delvFeeCd);													// 배송지정책코드
 		mav.addObject("orderChangeDetailList"		, orderChangeDetailList);										// 변경신청목록 (취소/반품/교환)
 		mav.addObject("userId"						, userId);														// 관리자ID
+
+		// 2021.11.29 card007 교환배송비 취소가능 여부
+		String canDeliveryCancelYn = "";
+		String payMeans = "";
+		if (ordChgSq > 0) {
+			// 교환배송비 취소가능여부 조회
+			OrderChange orderChange = new OrderChange();
+			orderChange.setOrdChgSq(order.getOrdChgSq());
+			Collection<Order> paymentList = coreOrderChangeService.getAddDeliveryFeePayment(orderChange);
+
+			if (paymentList != null && paymentList.size() > 0) {
+				canDeliveryCancelYn = paymentList.iterator().next().getCanDeliveryCancelYn();
+				payMeans = paymentList.iterator().next().getPayMeans();
+			}
+		}
+		mav.addObject("canDeliveryCancelYn"			, canDeliveryCancelYn);
+		mav.addObject("payMeans"					, payMeans);
 		
 		String viewName = "";
 		
@@ -950,10 +967,21 @@ public class TsaOrderChangeController extends TsaBaseController {
 				wdGb = exchangeInfoList.iterator().next().getWdGb();
 			}
 
+			// 교환배송비 취소가능여부 조회
+			OrderChange orderChange = new OrderChange();
+			orderChange.setOrdChgSq(order.getOrdChgSq());
+			Collection<Order> paymentList = coreOrderChangeService.getAddDeliveryFeePayment(orderChange);
+			
+			String canDeliveryCancelYn = "";
+			if (paymentList != null && paymentList.size() > 0) {
+				canDeliveryCancelYn = paymentList.iterator().next().getCanDeliveryCancelYn();
+			}
+
 			mav.addObject("exchangeInfoList"		, exchangeInfoList);											// 교환정보
 			mav.addObject("chgOrdDtlStat"			, chgOrdDtlStat);												// 교환상품상세상태
 			mav.addObject("wdGb"					, wdGb);														// 회수방법
 			mav.addObject("recallExceptionInfo"		, coreOrderChangeService.getRecallExceptionInfo(order));		// 회수 예외 정보
+			mav.addObject("canDeliveryCancelYn"		, canDeliveryCancelYn);											// 교환배송비 취소가능 여부
 		}
 
 		mav.addObject("wdBfSendYn"					, wdBfSendYn);													// 선발송여부

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

@@ -21,14 +21,17 @@ import com.gagaframework.web.parameter.GagaMap;
 import com.gagaframework.web.rest.server.GagaResponse;
 import com.gagaframework.web.rest.server.GagaResponseStatus;
 import com.gagaframework.web.util.GagaFileUtil;
+import com.style24.admin.biz.service.TsaOcmService;
 import com.style24.admin.biz.service.TsaPgService;
 import com.style24.admin.biz.service.TsaRendererService;
 import com.style24.admin.support.controller.TsaBaseController;
 import com.style24.admin.support.env.TsaConstants;
 import com.style24.admin.support.security.session.TsaSession;
 import com.style24.core.biz.service.TscOrderService;
+import com.style24.core.support.env.TscConstants;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.persistence.TscPageRequest;
+import com.style24.persistence.domain.Extmall;
 import com.style24.persistence.domain.Goods;
 import com.style24.persistence.domain.Order;
 import com.style24.persistence.domain.OrderSample;
@@ -63,6 +66,9 @@ public class TsaOrderController extends TsaBaseController {
 
 	@Autowired
 	private ObjectMapper mapper;
+	
+	@Autowired
+	private TsaOcmService ocmService;
 
 	/**
 	 * 주문목록조회
@@ -92,6 +98,12 @@ public class TsaOrderController extends TsaBaseController {
 
 		// CTI 접속을 통해 접근 시
 		mav.addObject("cellPhnno", cellPhnno);
+		
+		// 제휴몰
+		Extmall extmall = new Extmall();
+		extmall.setVendorId(TscConstants.VendorId.SHOPLINKER.value()); // 샵링커
+		mav.addObject("extmallList", ocmService.getExtmallList(extmall));
+		mav.addObject("vendorId", TscConstants.VendorId.SHOPLINKER.value());
 
 		mav.setViewName("order/OrderListForm");
 

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

@@ -201,7 +201,8 @@ public class Delivery extends TscBaseDomain {
 		return TscSession.getAttribute("maskingYn").equals("Y") ? MaskingUtils.address(this.recipDtlAddr) : this.recipDtlAddr;
 	}
 
-	
-	
+	private String chgRegDt;
+	private String wdRegDt;
+	private int chgQty;
 	
 }

src/main/webapp/WEB-INF/views/common/layout/popup.html

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="ko"
+	xmlns:th="http://www.thymeleaf.org"
+	xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
+
+<head th:replace="~{common/fragments/header :: header}"></head>
+
+<body>
+
+<th:block th:replace="~{common/fragments/variables :: variables}"></th:block>
+
+<div id="wrapper" class="color-pastel">
+	<th:block layout:fragment="content"></th:block>
+</div>
+
+<script th:inline="javascript">
+/*<![CDATA[*/
+	$(document).ready(function() {
+		
+	});
+/*]]>*/
+</script>
+
+</body>
+</html>

src/main/webapp/WEB-INF/views/customer/OneToOneQnaDetailForm.html

@@ -14,7 +14,7 @@
  * 1.0  2020.12.24   gagamel     최초 작성
  *******************************************************************************
  -->
-<div class="modalPopup" data-width="1200" data-height="900" id="popupOneToOneQnaDetail">
+<div class="modelessPopup draggable" data-width="1200" data-height="900" id="popupOneToOneQnaDetail">
 	<div class="panelStyle">
 		<!-- TITLE -->
 		<div class="panelTitle">
@@ -127,7 +127,7 @@
 								<span id="dpLocAnsContent">0</span>/4,000Byte
 							</th>
 							<td>
-								<textarea class="textareaR4" style="resize: none;" name="ansContent" th:text="*{ansContent}" onkeyup="cfnGetTextLength(this, 4000, $('#dpLocAnsContent'));" required="required" data-valid-name="답변 내용"></textarea>
+								<textarea class="textareaR15" style="resize: none;" name="ansContent" th:text="*{ansContent}" onkeyup="cfnGetTextLength(this, 4000, $('#dpLocAnsContent'));" required="required" data-valid-name="답변 내용"></textarea>
 							</td>
 						</tr>
 					</tbody>
@@ -471,6 +471,8 @@
 		fnSearchOneToOneCustomerHistory();
 		
 		fnShowOrHideOneToOneQnaButton([[${counselInfo.ansStat}]]);
+		
+		$('#popupOneToOneQnaDetail .modelessPopup').draggable({'cancel':'.panelContent'});
 	});
 /*]]>*/
 </script>

src/main/webapp/WEB-INF/views/customer/OneToOneQnaForm.html

@@ -14,7 +14,7 @@
  * 1.0  2020.12.24   gagamel     최초 작성
  *******************************************************************************
  -->
-	<div id="main">
+<div id="main">
 	<form id="searchForm" name="searchForm" action="#" th:action="@{'/customer/onetoone/qna/list'}" onsubmit="$('#btnSearch').trigger('click'); return false;">
 		<!-- 메인타이틀 영역 -->
 		<div class="main-title">
@@ -132,8 +132,8 @@
 			</ul>
 		</div>
 		<!-- //리스트 영역 -->
-		</form>
-	</div>
+	</form>
+</div>
 
 <script type="text/javascript" src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">

src/main/webapp/WEB-INF/views/delivery/AssignListForm.html

@@ -51,7 +51,7 @@
 						<tr>
 							<th>주문자명</th>
 							<td>
-								<input type="text" class="" name="orderNm" placeholder="" maxlength="20" />
+								<input type="text" class="" name="ordNm" placeholder="" maxlength="20" />
 							</td>
 							<th>주문번호</th>
 							<td>
@@ -61,19 +61,12 @@
 							<td>
 								<input type="text" class="" name="ordDtlNo" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');"  placeholder="" maxlength="9" />
 							</td>
-							<th>외부몰주문번호</th>
+							<th>제휴몰주문번호</th>
 							<td>
-								<input type="text" class="" name="extmallOrderId" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');"  placeholder="" maxlength="20" />
+								<input type="text" class="" name="extmallOrderId" placeholder="" maxlength="40" />
 							</td>
 						</tr>
 						<tr>
-							<th>사이트</th>
-							<td>
-								<select name="siteCd" id="siteCd">
-									<option value="">[전체]</option>
-									<option th:if="${siteCdList}" th:each="oneData, status : ${siteCdList}" th:value="${oneData.cd}" th:text="${oneData.cdNm}"></option>
-								</select>
-							</td>
 							<th>몰구분</th>
 							<td>
 								<select name="mallGb" id="mallGb">
@@ -81,10 +74,24 @@
 									<option th:if="${mallGbList}" th:each="oneData, status : ${mallGbList}" th:value="${oneData.cd}" th:text="${oneData.cdNm}"></option>
 								</select>
 							</td>
+							<th>제휴몰명</th>
+							<td>
+								<input type="hidden" name="vendorId" placeholder="" maxlength="20" th:value="${vendorId}"/>
+								<select name="extmallId">
+									<option value="">선택안함</option>
+									<option th:if="${extmallList}" th:each="oneData, status : ${extmallList}" th:value="${oneData.extmallId}" th:text="${'[' + oneData.extmallId + '] ' + oneData.extmallNm}"></option>
+								</select>
+							</td>
 							<th>상품코드</th>
 							<td>
 								<input type="text" class="" name="goodsCd" placeholder="" maxlength="20" />
 							</td>
+							<th>SKU-CODE</th>
+							<td>
+								<input type="text" class="" name="optCd" placeholder="" maxlength="40" />
+							</td>
+						</tr>
+						<tr>
 							<th>주문교환</th>
 							<td>
 								<select name="ordExchGb" id="ordExchGb">
@@ -93,8 +100,6 @@
 									<option value="N">주문</option>
 								</select>
 							</td>
-						</tr>
-						<tr>
 							<th>출고처지정상태</th>
 							<td>
 								<select name="delvAssignStat" id="delvAssignStat">
@@ -104,14 +109,16 @@
 								</select>
 							</td>
 							<th>출고처</th>
-							<td>
+							<td colspan="3">
 								<select name="delvLocCd" id="delvLocCd">
 									<option value="">[전체]</option>
 									<option th:if="${deliveryLocList}" th:each="oneData, status : ${deliveryLocList}" th:value="${oneData.cd}" th:text="${oneData.cdNm}"></option>
 								</select>
 							</td>
+						</tr>
+						<tr>
 							<th>주문등록일</th>
-							<td colspan="3">
+							<td colspan="7">
 								<span id="terms"></span>
 							</td>
 						</tr>
@@ -159,37 +166,38 @@
 	
 	var columnDefs = [
 		// group cell renderer needed for expand / collapse icons
-		{headerName: "사이트", 		field: "siteNm", 		width: 120,	cellClass: 'text-center'},
-		{headerName: "주문번호", 		field: "ordNo", 	width: 85,	cellClass: 'text-center'
+		{headerName: "사이트", 			field: "siteNm", 			width: 120,	cellClass: 'text-center', hide: true},
+		{headerName: "몰구분", 			field: "mallNm", 			width: 70, cellClass: 'text-center'},
+		{headerName: "제휴몰명", 			field: "extmallNm",			width: 120,	cellClass: 'text-center'},
+		{headerName: "제휴몰주문번호", 		field: "extmallOrderId",	width: 140,	cellClass: 'text-center'},
+		{headerName: "주문번호", 			field: "ordNo", 			width: 85,	cellClass: 'text-center'
 			, cellRenderer: function(params) {
 				return "<a href=\"javascript:void(0);\" onclick=\"cfnOpenOrderDetailPopup('" + params.value + "');\">" + params.value + "</a>";
 			}
 		},
-		{headerName: "주문상세번호", 	field: "ordDtlNo", 			width: 100,	cellClass: 'text-center'},
-		{headerName: "출고처지정취소", 	field: "delvLocCd", 		width: 140,	cellClass: 'text-center',
+		{headerName: "주문상세번호", 		field: "ordDtlNo", 			width: 100,	cellClass: 'text-center'},
+		{headerName: "출고처지정취소", 		field: "delvLocCd", 		width: 140,	cellClass: 'text-center',
 			cellRenderer: function(params) {
 				return gagajf.isNull(params.value) ? "" : '<button type="button" class="btn btn-danger btn-sm" onclick="fnCancelAssignDelvLoc(\'' + params.data.ordNo + '\',\'' + params.data.ordDtlNo + '\',\''+params.data.delvLocClsf+'\');">&nbsp;출고처지정취소&nbsp;</button>';
 			}
 		},		
-		{headerName: "출고처", 		field: "delvLocNm",			width: 200, cellClass: 'text-center'
+		{headerName: "출고처", 			field: "delvLocNm",			width: 200, cellClass: 'text-center'
 			, cellRenderer: function(params) {
 				return !gagajf.isNull(params.value) ? params.value : "<a href=\"javascript:void(0);\" onclick=\"fnOpenDeliveryAssignPopup('" + params.data.ordDtlNo + "');\">[출고처 지정]</a>";
 			}},
-		{headerName: "주문일시", 		field: "ordDt", 			width: 150, cellClass: 'text-center',
+		{headerName: "주문일시", 			field: "ordDt", 			width: 150, cellClass: 'text-center',
 				cellRenderer: function(params) {
 				return !gagajf.isNull(params.value) ? params.value.toDate("YYYY-MM-DD HH:mm:ss").format("YYYY-MM-DD HH:mm:ss") : '';
 			}
 		},
-		{headerName: "결제일시", 		field: "ordDt", 			width: 150, cellClass: 'text-center',
+		{headerName: "결제일시", 			field: "payDt", 			width: 150, cellClass: 'text-center',
 			cellRenderer: function(params) {
 				return !gagajf.isNull(params.value) ? params.value.toDate("YYYY-MM-DD HH:mm:ss").format("YYYY-MM-DD HH:mm:ss") : '';
 			}
 		},
-		{headerName: "몰구분", 		field: "mallNm", 			width: 70, cellClass: 'text-center'},
-		{headerName: "외부몰", 		field: "extmallNm",			width: 150,	cellClass: 'text-center'},
-		{headerName: "주문자", 		field: "ordNm",				width: 100, cellClass: 'text-center'},
-		{headerName: "상품코드", 		field: "goodsCd", 			width: 120, cellClass: 'text-center'},
-		{headerName: "구성유형", field: "goodsTypeNm", 			width: 130, cellClass: 'text-center',
+		{headerName: "주문자", 			field: "ordNm",				width: 100, cellClass: 'text-center'},
+		{headerName: "상품코드", 			field: "goodsCd", 			width: 120, cellClass: 'text-center'},
+		{headerName: "구성유형", 			field: "goodsTypeNm", 		width: 130, cellClass: 'text-center',
 			cellRenderer: function (params) {
 				var option;
 				if (params.data.goodsType == 'G056_S') {
@@ -202,33 +210,33 @@
 		},
 		{headerName: "옵션", 			field: "optCd",				width: 100,	cellClass: 'text-center'},
 		{headerName: "색상", 			field: "optCd1",			width: 70, 	cellClass: 'text-center'},
-		{headerName: "사이즈", 		field: "optCd2",			width: 70, 	cellClass: 'text-center'},
-		{headerName: "주문수량",		field: "ordQty", 			width: 80,	cellClass: 'text-center'},
-		{headerName: "현재고",		field: "currStockQty", 		width: 80,	cellClass: 'text-center',
+		{headerName: "사이즈", 			field: "optCd2",			width: 70, 	cellClass: 'text-center'},
+		{headerName: "주문수량",			field: "ordQty", 			width: 80,	cellClass: 'text-center'},
+		{headerName: "현재고",			field: "currStockQty", 		width: 80,	cellClass: 'text-center',
 			cellRenderer: function (params) {
 				var option;
 				if (params.data.goodsType == 'G056_S') {
 					option = "-";
 				} else {
-					option = params.value
+					option = params.value;
 				}
 				return option;
 			}		
 		},
-		{headerName: "안전재고",		field: "baseStockQty", 		width: 80,	cellClass: 'text-center',
+		{headerName: "안전재고",			field: "baseStockQty", 		width: 80,	cellClass: 'text-center',
 			cellRenderer: function (params) {
 				var option;
 				if (params.data.goodsType == 'G056_S') {
 					option = "-";
 				} else {
-					option = params.value
+					option = params.value;
 				}
 				return option;
 			}				
 		},
-		{headerName: "주문금액", 		field: "ordAmt", 			width: 80, 	cellClass: 'text-center', valueFormatter: function (params) { return params.value.addComma(); }	},
-		{headerName: "주문상세상태", 	field: "ordDtlStatNm",		width: 100, cellClass: 'text-center'},
-		{headerName: "주문교환", 		field: "ordExchNm",			width: 80,  cellClass: 'text-center'}
+		{headerName: "주문금액", 			field: "ordAmt", 			width: 80, 	cellClass: 'text-center', valueFormatter: function (params) { return params.value.addComma(); }	},
+		{headerName: "주문상세상태", 		field: "ordDtlStatNm",		width: 100, cellClass: 'text-center'},
+		{headerName: "주문교환", 			field: "ordExchNm",			width: 80,  cellClass: 'text-center'}
 	];
 	
 	//Get GridOptions
@@ -242,23 +250,27 @@
 	
 	/*************************************************************************
 	* init
-	**************************************************************************/		
-	$(document).ready(function() {
-	    gagaAgGrid.createGrid('gridAssignList', gridOptions);
-	    var hideList = ["btnThisWeek", "btnYesterWeek", "btnRecentMonth", "btnThisMonth", "btnYesterMonth", "btnRecent3Month"];
-		cfnCreateCalendar('#terms', 'stDate', 'edDate', true, '주문', '', hideList);
-		$(".btnToday").trigger('click');
-
-		
-	});
-
+	**************************************************************************/
+	
 	/*************************************************************************
 	* 초기화 
-	**************************************************************************/		
+	**************************************************************************/
 	var fnInitCalendar = function() {
 		$(".btnToday").trigger('click');
 	}
 	
+	$(document).ready(function() {
+	    gagaAgGrid.createGrid('gridAssignList', gridOptions);
+	    
+	    //var hideList = ["btnThisWeek", "btnYesterWeek", "btnRecentMonth", "btnThisMonth", "btnYesterMonth", "btnRecent3Month"];
+		//cfnCreateCalendar('#terms', 'stDate', 'edDate', true, '주문', '', hideList);
+		
+		cfnCreateCalendar('#terms', 'stDate', 'edDate', true, '주문');
+		fnInitCalendar();
+		
+		$(".btnToday").trigger('click');
+	});
+
 	/*************************************************************************
 	* 조회 클릭
 	**************************************************************************/

src/main/webapp/WEB-INF/views/delivery/DeliveryListForm.html

@@ -36,7 +36,6 @@
 		</div>
 		<!-- //TITLE -->
 		<div class="panelContent">
-
 				<table class="frmStyle">
 					<colgroup>
 						<col style="width:8%;"/>
@@ -47,18 +46,8 @@
 						<col style="width:12%;"/>
 						<col style="width:8%;"/>
 						<col style="width:12%;"/>
-
 					</colgroup>
 					<tr>
-						<!--
-						<th>사이트</th>
-						<td>
-							<select name="siteCd" id="siteCd">
-								<option value="">[전체]</option>
-								<option th:if="${siteCdList}" th:each="oneData, status : ${siteCdList}" th:value="${oneData.cd}" th:text="${oneData.cdNm}"></option>
-							</select>
-						</td>
-						-->
 						<th>몰구분</th>
 						<td>
 							<select name="mallGb" style="width: 100px;">
@@ -66,17 +55,15 @@
 								<option th:if="${mallGbList}" th:each="oneData, status : ${mallGbList}" th:value="${oneData.cd}" th:text="${oneData.cdNm}"></option>
 							</select>
 						</td>
-
 						<th>업체/브랜드</th>
 						<td colspan="3">
-								<select name="supplyCompCd" id="supplyCompCd">
-									<option value="">[전체]</option>
-									<option th:if="${supplyCompList}" th:each="oneData, status : ${supplyCompList}" th:value="${oneData.cd}" th:text="${oneData.cdNm}"></option>
-								</select>
-								/
-								<span id="multiBrand"></span>
+							<select name="supplyCompCd" id="supplyCompCd">
+								<option value="">[전체]</option>
+								<option th:if="${supplyCompList}" th:each="oneData, status : ${supplyCompList}" th:value="${oneData.cd}" th:text="${oneData.cdNm}"></option>
+							</select>
+							/
+							<span id="multiBrand"></span>
 						</td>
-
 						<th>주문상세상태</th>
 						<td>
 							<div class="multiCheckBox" style="width:270px">
@@ -136,7 +123,6 @@
 								<option value="N">일반배송</option>
 								<option value="Y">총알배송</option>
 							</select>
-
 						</td>
 						<th>출고처</th>
 						<td>
@@ -164,9 +150,24 @@
 					</tr>
 					<tr>
 						<th>고객ID</th>
-						<td colspan="8">
-							<input type="text" class="w200" name="custId" placeholder="" maxlength="20" />
-
+						<td>
+							<input type="text" name="custId" placeholder="" maxlength="20"/>
+						</td>
+						<th>제휴몰명</th>
+						<td>
+							<input type="hidden" name="vendorId" placeholder="" maxlength="20" th:value="${vendorId}"/>
+							<select name="extmallId">
+								<option value="">선택안함</option>
+								<option th:if="${extmallList}" th:each="oneData, status : ${extmallList}" th:value="${oneData.extmallId}" th:text="${'[' + oneData.extmallId + '] ' + oneData.extmallNm}"></option>
+							</select>
+						</td>
+						<th>제휴몰주문번호</th>
+						<td>
+							<input type="text" class="" name="extmallOrderId" placeholder="" maxlength="40" />
+						</td>
+						<th>SKU-CODE</th>
+						<td>
+							<input type="text" class="" name="optCd" placeholder="" maxlength="40" />
 						</td>
 					</tr>
 				</table>
@@ -186,9 +187,6 @@
 	<div class="panelStyle">
 		<ul class="panelBar">
 			<li class="left">
-				<!--  <button type="button" id="btnSoldout" class="btn btn-danger btn-lg">품절처리</button> -->
-				<!-- <button type="button" id="btnSave" class="btn btn-success btn-lg btnRight" onclick="deliveryInfoSave();">저장</button>
-				<button type="button" id="btnWith" class="btn btn-success btn-lg btnRight">T</button> -->
 			</li>
 			<li class="right">
 				검색결과 : <strong><span id="gridRowTotalCount">0</span> 건</strong>&nbsp;
@@ -221,26 +219,15 @@
 	/*************************************************************************
 	* AG-GRID 영역
 	**************************************************************************/
-	var shipCompanyList =  gagajf.convertToArray([[${shipCompanyList}]]);
+	var shipCompanyList = gagajf.convertToArray([[${shipCompanyList}]]);
 	var roleCd          = [[${sessionInfo.roleCd}]];
 	var currOrdNo       = 0;
 	var columnDefs = [
-		/*
-		{
-			headerName: "결품",
-			field: "soldout",
-			width: 50,
-			cellClass: 'text-center',
-			headerCheckboxSelection: true,
-			headerCheckboxSelectionFilteredOnly: true
-			,
-			checkboxSelection: function (params) {
-				return (params.data.ordDtlStat == 'G013_20') ? true : false;
-			}
-		},
-		*/
-		{headerName: "지연일",	field: "delvDelayDays", 	width: 70, cellClass: 'text-center'},
-		{headerName: "주문번호",	field: "ordNo", width: 95, cellClass: 'text-center',
+		{headerName: "지연일",		field: "delvDelayDays", 		width: 70, cellClass: 'text-center', hide: true},
+		{headerName: "몰구분", 		field: "mallGbNm", 				width: 70, cellClass: 'text-center'},
+		{headerName: "제휴몰명", 		field: "extmallNm", 			width: 120, cellClass: 'text-center'},
+		{headerName: "제휴몰주문번호", 	field: "extmallOrderId",		width: 140, cellClass: 'text-center'},
+		{headerName: "주문번호",		field: "ordNo", 				width: 95, cellClass: 'text-center',
 			cellRenderer: function (params) {
 				if (roleCd.indexOf("C") < 0) {
 					return "<a href=\"javascript:void(0);\" onclick=\"fnOrderDetailPopup('" + params.data.ordNo + "');\">" + params.data.ordNo + "</a>";
@@ -249,9 +236,9 @@
 				}
 			}
 		},
-		{headerName: "주문상세번호", 	field: "ordDtlNo", 		width: 90, cellClass: 'text-center'},
-		{headerName: "주문상세상태", 	field: "ordDtlStatNm", 	width: 120, cellClass: 'text-center'},
-		{headerName: "주문교환", 		field: "ordExchGb", 	width: 80, cellClass: 'text-center',
+		{headerName: "주문상세번호", 	field: "ordDtlNo", 				width: 90, cellClass: 'text-center'},
+		{headerName: "주문상세상태", 	field: "ordDtlStatNm", 			width: 120, cellClass: 'text-center'},
+		{headerName: "주문교환", 		field: "ordExchGb", 			width: 80, cellClass: 'text-center',
 			cellRenderer: function (params) {
 				if (params.value == "Y") {
 					return "교환";
@@ -260,21 +247,18 @@
 				}
 			}
 		},
-		// {headerName: "사이트", field: "siteNm", width: 120, cellClass: 'text-center'},
-		// {headerName: "판매몰", field: "sellStoreNm", width: 150, cellClass: 'text-left'},
-		{headerName: "판매몰명", 		field: "extmallNm", 	width: 150, cellClass: 'text-left'},
-		{headerName: "주문일시", 		field: "ordDt", 		width: 150, cellClass: 'text-center',
+		{headerName: "판매몰명", 		field: "siteNm", 				width: 120, cellClass: 'text-center'},
+		{headerName: "주문일시", 		field: "ordDt", 				width: 150, cellClass: 'text-center',
 			cellRenderer: function (params) {
 				return !gagajf.isNull(params.value) ? gagaAgGrid.toDateTimeFormat(params.value) : '';
 			}
 		},
-		{headerName: "결제일시", 		field: "ordDt", 		width: 150, cellClass: 'text-center',
+		{headerName: "결제일시", 		field: "payDt", 				width: 150, cellClass: 'text-center',
 			cellRenderer: function (params) {
 				return !gagajf.isNull(params.value) ? gagaAgGrid.toDateTimeFormat(params.value) : '';
 			}
 		},
-		{headerName: "몰구분", 		field: "mallGbNm", 		width: 70, cellClass: 'text-center'},
-		{headerName: "주문자", 		field: "maskingOrdNm", 		width: 100, cellClass: 'text-center',
+		{headerName: "주문자", 		field: "maskingOrdNm", 			width: 100, cellClass: 'text-center',
 			cellRenderer: function (params) {
 				if (roleCd.indexOf("C") < 0 && !gagajf.isNull(params.value) && params.data.mallGb === 'G011_10' && params.data.custNo > 0) {
 					return '<a href="javascript:void(0);" onclick=\"cfnOpenCustDetailPopup(' + params.data.custNo + ');\">' + params.data.maskingOrdNm + '</a>';
@@ -283,19 +267,19 @@
 				}
 			}
 		},
-		{headerName: "고객ID", 			field: "custId", 		width: 100, cellClass: 'text-center'},
+		{headerName: "고객ID", 		field: "custId", 				width: 100, cellClass: 'text-center'},
 		{headerName: "휴대번호", 		field: "maskingOrdPhnno", 		width: 100, cellClass: 'text-center',
 			valueGetter: function (params) { return params.data.maskingOrdPhnno; }
 		},
-		{headerName: "LMS", 			field: "maskingOrdPhnno", 	width: 80, cellClass: "text-center",
+		{headerName: "LMS", 		field: "maskingOrdPhnno", 		width: 80, cellClass: "text-center",
 			cellRenderer: function(params) {
 				return '<button type="button" class="btn btn-base btn-sm" onclick="fnLms(\'' + params.data.ordPhnno + '\',\'' + params.data.custNo + '\');">&nbsp;LMS&nbsp;</button>';
 			}
 		},
 		{headerName: "수령인", 		field: "maskingRecipNm", 		width: 100, cellClass: 'text-center'},
-		{headerName: "공급업체", 		field: "supplyCompNm", 	width: 150, cellClass: 'text-center'},
-		{headerName: "브랜드", 		field: "brandNm", 	width: 150, cellClass: 'text-center'},
-		{headerName: "상품코드", 		field: "goodsCd", 		width: 120, cellClass: 'text-center',
+		{headerName: "공급업체", 		field: "supplyCompNm", 			width: 150, cellClass: 'text-center'},
+		{headerName: "브랜드", 		field: "brandNm", 				width: 150, cellClass: 'text-center'},
+		{headerName: "상품코드", 		field: "goodsCd", 				width: 120, cellClass: 'text-center',
 			cellRenderer: function (params) {
 				if (roleCd.indexOf("C") < 0) {
 					return "<a href=\"javascript:void(0);\" onclick=\"cfnOpenGoodsDetailPopup('U','" + params.value + "');\">" + params.value + "</a>";
@@ -304,7 +288,7 @@
 				}
 			}
 		},
-		{headerName: "구성유형", 		field: "goodsTypeNm",	 width: 130, cellClass: 'text-center',
+		{headerName: "구성유형", 		field: "goodsTypeNm",	 		width: 130, cellClass: 'text-center',
 			cellRenderer: function (params) {
 				var option;
 				if (params.data.goodsType == 'G056_S') {
@@ -315,29 +299,29 @@
 				return option;
 			}
 		},
-		{headerName: "상품명", 		field: "goodsNm", 		width: 280, cellClass: 'text-left'},
-		{headerName: "옵션코드", 		field: "optCd", 		width: 100, cellClass: 'text-left'},
-		{headerName: "옵션코드1", 		field: "optCd1", 		width: 100, cellClass: 'text-center'},
-		{headerName: "옵션코드2", 		field: "optCd2", 		width: 100, cellClass: 'text-center'},
-		{headerName: "주문수량", 		field: "ordQty", 		width: 80, cellClass: 'text-center'},
-		{headerName: "취소수량", 		field: "cnclRtnQty", 	width: 80, cellClass: 'text-center'},
-		{headerName: "판매수량", 		field: "saleQty", 		width: 80, cellClass: 'text-right'},
-		{headerName: "판매금액", 		field: "saleAmt", 		width: 100, cellClass: 'text-right'
+		{headerName: "상품명", 		field: "goodsNm", 				width: 280, cellClass: 'text-left'},
+		{headerName: "옵션코드", 		field: "optCd", 				width: 100, cellClass: 'text-left'},
+		{headerName: "옵션코드1", 	field: "optCd1", 				width: 100, cellClass: 'text-center'},
+		{headerName: "옵션코드2", 	field: "optCd2", 				width: 100, cellClass: 'text-center'},
+		{headerName: "주문수량", 		field: "ordQty", 				width: 80, cellClass: 'text-center'},
+		{headerName: "취소수량", 		field: "cnclRtnQty", 			width: 80, cellClass: 'text-center'},
+		{headerName: "판매수량", 		field: "saleQty", 				width: 80, cellClass: 'text-right'},
+		{headerName: "판매금액", 		field: "saleAmt", 				width: 100, cellClass: 'text-right'
 			, valueFormatter: function (params) {
 				return params.value.addComma();
 			}
 		},
-		{headerName: "실결제금액", 	field: "realOrdAmt", 	width: 100, cellClass: 'text-right'
+		{headerName: "실결제금액", 	field: "realOrdAmt", 			width: 100, cellClass: 'text-right'
 			, valueFormatter: function (params) {
 				return params.value.addComma();
 			}
 		},
-		{headerName: "출고유형", 		field: "shotDelvYn", 	width: 80, cellClass: 'text-center'},
-		{headerName: "출고처", 		field: "delvLocNm", 	width: 100, cellClass: 'text-center'},
-		{headerName: "출고택배사", 	field: "shipCompCd", 	width: 170, cellClass: 'text-center'
+		{headerName: "출고유형", 		field: "shotDelvYn", 			width: 80, cellClass: 'text-center'},
+		{headerName: "출고처", 		field: "delvLocNm", 			width: 100, cellClass: 'text-center'},
+		{headerName: "출고택배사", 	field: "shipCompCd", 			width: 170, cellClass: 'text-center'
 			, valueGetter: function (params) { return gagaAgGrid.lookupValue(shipCompanyList, params.data.shipCompCd); }
 		},
-		{headerName: "배송추적", 		field: "invcTracking", 	width: 80, cellClass: 'text-center',
+		{headerName: "배송추적", 		field: "invcTracking", 			width: 80, cellClass: 'text-center',
 			cellRenderer: function (params) {
 				if (params.value == "Y") {
 					return "요청";
@@ -346,8 +330,8 @@
 				}
 			}
 		},
-		{headerName: "출고송장", 		field: "invoiceNo", 	width: 150, cellClass: 'text-left'},
-		{headerName: "송장등록수정", 	field: "invoiceNo", 	width: 120, cellClass: 'text-center'
+		{headerName: "출고송장", 		field: "invoiceNo", 			width: 150, cellClass: 'text-left'},
+		{headerName: "송장등록수정", 	field: "invoiceNo", 			width: 120, cellClass: 'text-center'
 			, cellRenderer : function (params) {
 				var buttonTag = '';
 				if (params.data.ordDtlStat == 'G013_30' || params.data.ordDtlStat == 'G013_40' || params.data.ordDtlStat == 'G013_50' || params.data.ordDtlStat == 'G013_55') {
@@ -357,25 +341,22 @@
 				return buttonTag;
 			}
 		},
-		{headerName: "배송완료처리", 	field: "ordDtlStat", width: 120, cellClass: 'text-center'
+		{headerName: "배송완료처리", 	field: "ordDtlStat", 			width: 120, cellClass: 'text-center'
 			, cellRenderer: function(params) {
 				var buttonTag = '';
 				if (params.value == 'G013_50' || params.value == 'G013_55'  ) {
 					buttonTag = '<button type="button"class="btn btn-success" onClick="deliveryComplete(\''+params.data.ordNo+ '\' , \''+params.data.ordDtlNo+'\' , \'' + params.data.ordDtlStat + '\');">배송완료</button>';
-
 				}
 				return buttonTag;
 			}
 		},
-		{headerName: "제휴몰주문번호", 	field: "extmallOrderId",width: 150, cellClass: 'text-left'},
-		{headerName: "샵링커주문번호", field: "agentOrderId", 	width: 150, cellClass: 'text-left'},
-		{headerName: "배송메모", 		field: "delvMemo", 		width: 200, cellClass: 'text-left'},
-		{headerName: "우편번호", 		field: "recipZipcode", 		width: 80, cellClass: 'text-center'},
-		{headerName: "기본주소", 		field: "recipBaseAddr", 	width: 200, cellClass: 'text-left'},
-		{headerName: "상세주소", 		field: "maskingRecipDtlAddr", 		width: 200, cellClass: 'text-left'},
-		{headerName: "product_no", 	field: "productNo", 	width: 100, cellClass: 'text-center'},
-		{headerName: "product_code",field: "productCode", 	width: 100, cellClass: 'text-center'}
-
+		{headerName: "샵링커주문번호", 	field: "agentOrderId", 			width: 150, cellClass: 'text-left'},
+		{headerName: "배송메모", 		field: "delvMemo", 				width: 200, cellClass: 'text-left'},
+		{headerName: "우편번호", 		field: "recipZipcode", 			width: 80, cellClass: 'text-center'},
+		{headerName: "기본주소", 		field: "recipBaseAddr", 		width: 200, cellClass: 'text-left'},
+		{headerName: "상세주소", 		field: "maskingRecipDtlAddr", 	width: 200, cellClass: 'text-left'},
+		{headerName: "product_no", 	field: "productNo", 			width: 100, cellClass: 'text-center'},
+		{headerName: "product_code",field: "productCode", 			width: 100, cellClass: 'text-center'}
 	];
 
 	//Get GridOptions

src/main/webapp/WEB-INF/views/delivery/ExchangeDelvFailListForm.html

@@ -51,11 +51,11 @@
 						<tr>
 							<th class="dashR">주문자명</th>
 							<td class="dashR">
-								<input type="text" class="w40p" name="ordNm" placeholder="" maxlength="20" />
+								<input type="text" name="ordNm" placeholder="" maxlength="20" />
 							</td>
 							<th class="dashR">주문번호</th>
 							<td class="dashR">
-								<input type="text" class="w40p" name="ordNo" placeholder="" maxlength="20" data-valid-type="numeric"/>
+								<input type="text" name="ordNo" placeholder="" maxlength="20" data-valid-type="numeric"/>
 							</td>
 							<th class="dashR">처리상태</th>
 							<td class="dashR" colspan="2">
@@ -82,7 +82,7 @@
 							</td>
 							<th class="dashR">주문자휴대폰번호</th>
 							<td class="dashR">
-								<input type="text" name="ordPhnno" placeholder="" maxlength="40"/>
+								<input type="text" name="ordPhnno" placeholder="" maxlength="20"/>
 							</td>
 						</tr>
 						<tr>
@@ -126,10 +126,30 @@
 <script th:inline="javascript">
 /*<![CDATA[*/ 
 var columnDefs = [
+	{headerName: "클레임접수일",		field: "chgRegDt",				width: 100,	cellClass: 'text-center'},
+	{headerName: "몰구분",			field: "mallGbNm",				width: 100,	cellClass: 'text-center'},
+	{headerName: "제휴몰명",			field: "extmallNm",				width: 120,	cellClass: 'text-center'},
+	{headerName: "제휴몰주문번호",		field: "extmallOrderId",		width: 140,	cellClass: 'text-center'},
 	{headerName: "교환배송취소번호",	field: "exchangeDelvFailSq",	width: 50,	cellClass: 'text-center', hide: true},
 	{headerName: "변경요청번호",		field: "ordChgSq",				width: 100,	cellClass: 'text-center', hide: true},
+	{headerName: "고객고유번호", 		field: "custNo", 				width: 120, cellClass: 'text-center', hide: true},
 	{
-		headerName		: "변경요청"
+		headerName		: "주문번호"
+		, field			: 'ordNo'
+		, width			: 80
+		, cellClass		: 'text-center'
+		, sortable		: true
+		, cellRenderer	: function (params) {
+			var roleCd = [[${sessionInfo.roleCd}]];
+			if (!roleCd.startsWith("C")) {
+				return "<a href=\"javascript:void(0);\" onclick=\"fnOpenOrderDetailPopup('" + params.value + "');\">" + params.value + "</a>";
+			} else {
+				return params.value;
+			}
+		}
+	},
+	{
+		headerName		: "주문변경번호"
 		, field			: "ordChgSq"
 		, width			: 100
 		, cellClass		: 'text-center'
@@ -150,17 +170,35 @@ var columnDefs = [
 			return rtnStr;
 		}
 	},
-	{headerName: "주문번호",			field: "ordNo",					width: 100,	cellClass: 'text-center'},
 	{headerName: "주문상세번호",		field: "ordDtlNo",				width: 100,	cellClass: 'text-center'},
-	{headerName: "교환배송취소여부",	field: "delvCnclYn",			width: 120,	cellClass: 'text-center'},
-	{headerName: "출고가능수량",		field: "ordQty",				width: 100,	cellClass: 'text-center'},
-	{headerName: "품절취소수량",		field: "cnclRtnQty",			width: 100,	cellClass: 'text-center'},
-	{headerName: "품절취소사유",		field: "delvFailReason",		width: 120,	cellClass: 'text-center'},
+	{
+		headerName		: "주문자명"
+		, field			: "maskingOrdNm"
+		, width			: 120
+		, cellClass		: 'text-center'
+		, sortable		: true
+		, cellRenderer	: function (params) {
+			if (params.data.custNo > 0) {
+				return '<a href="javascript:void(0);" onclick=\"cfnOpenCustDetailPopup(' + params.data.custNo + ');\">' + params.value + '</a>';
+			} else {
+				return params.value;
+			}
+		}
+	},
+	{headerName: "핸드폰번호",			field: "ordPhnno",				width: 120,	cellClass: 'text-center'},
+	{headerName: "교환배송취소여부",	field: "delvCnclYn",			width: 120,	cellClass: 'text-center', hide: true},
+	{headerName: "품절취소사유",		field: "delvFailReason",		width: 120,	cellClass: 'text-center', hide: true},
+	{headerName: "상품타입",			field: "goodsTypeNm",			width: 130,	cellClass: 'text-center'},
 	{headerName: "상품코드",			field: "goodsCd",				width: 130,	cellClass: 'text-center'},
+	{headerName: "SKU-CODE",		field: "optCd",					width: 130,	cellClass: 'text-center'},
 	{headerName: "상품명",			field: "goodsNm",				width: 180,	cellClass: 'text-center'},
-	{headerName: "주문자",			field: "ordNm",					width: 120,	cellClass: 'text-center'},
-	{headerName: "핸드폰번호",			field: "ordPhnno",				width: 120,	cellClass: 'text-center'},
-	{headerName: "이메일",			field: "ordEmail",				width: 160,	cellClass: 'text-center'}
+	{headerName: "옵션1",			field: "optCd1",				width: 130,	cellClass: 'text-center'},
+	{headerName: "옵션2",			field: "optCd2",				width: 130,	cellClass: 'text-center'},
+	{headerName: "요청수량",			field: "ordQty",				width: 100,	cellClass: 'text-center'},
+	{headerName: "품절취소수량",		field: "cnclRtnQty",			width: 100,	cellClass: 'text-center'},
+	{headerName: "회수등록일",			field: "wdRegDt",				width: 100,	cellClass: 'text-center'},
+	{headerName: "이메일",			field: "ordEmail",				width: 160,	cellClass: 'text-center', hide: true},
+	{headerName: "변경상태",			field: "chgStat",				width: 100,	cellClass: 'text-center', hide: true},
 ];
 
 var gridOptions = gagaAgGrid.getGridOptions(columnDefs);
@@ -229,13 +267,16 @@ var fnCancelRequest = function (paramData, ordChgSq) {
 	if (paramArr[4] == "Y") {
 		actionUrl = "/orderChange/cnclRtn/complete/view?" + param;	
 	}
-	
-	
-	
+
 	cfnOpenModalPopup(actionUrl, 'popupCancelRequestForm');
 	
 	return false;
 };
+
+var fnOpenOrderDetailPopup = function (ordNo) {
+	currOrdNo = ordNo;
+	cfnOpenOrderDetailPopup(ordNo);
+};
 /*]]>*/
 </script>
 </html>

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

@@ -238,7 +238,8 @@
 						<option value="50" selected="selected">50개씩 보기</option>
 						<option value="100">100개씩 보기</option>
 						<option value="500">500개씩 보기</option>
-						<!-- <option value="1000">1000개씩 보기</option> -->
+						<option value="1000">1000개씩 보기</option>
+						<option value="2000">2000개씩 보기</option>
 					</select>
 					<input type="hidden" name="pageNo" id="pageNo" value ="1"/>
 				</li>

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

@@ -121,7 +121,7 @@
 					<button type="button" class="btn btn-success btn-lg" id="btnGoodsExcelSave" th:if="${sessionInfo.roleCd == 'G001_0000' OR sessionInfo.roleCd == 'G001_A000' OR sessionInfo.roleCd == 'G001_A101' OR sessionInfo.roleCd == 'G001_A100' OR sessionInfo.roleCd == 'G001_A001'}">상품가격예약등록</button>
 					<button type="button" class="btn btn-success  btn-lg" id="btnGoodsPriceResSave">예약등록</button>
 					<button type="button" class="btn btn-danger btn-lg" id="btnGoodsPriceResDelete">예약삭제</button>
-					<!-- <button type="button" class="btn btn-danger btn-lg" id="btnGoodsPriceResClose">종료</button> -->
+					<button type="button" class="btn btn-danger btn-lg" id="btnGoodsPriceResClose">종료</button>
 				</li>
 				<li class="right">
 					검색결과 : <strong><span id="gridRowTotalCount">0</span> 건</strong>&nbsp;

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

@@ -342,6 +342,8 @@ var chgMemo						= "";											// 변경사유메모
 var chgStat						= cancelRequestTargetList[0].chgStat			// 변경상태(교환출고실패 취소처리)
 var wdGb						= cancelRequestTargetList[0].wdGb				// 회수구분(교환출고실패 취소처리)
 var addPayCost					= cancelRequestTargetList[0].addPayCost			// 추가결제비용(교환출고실패 취소처리)
+var canDeliveryCancelYn 		= [[${canDeliveryCancelYn}]];					// 교환배송비 취소가능여부
+var delvPayMeans				= [[${payMeans}]];								// 교환배송비 결제수단
 
 // 변경요청정보 승인, 철회
 if (ordChgSq > 0 && chgStat != 'G685_40') {
@@ -1323,6 +1325,13 @@ var fnCnclReq = function (reqGbn) {
 	else if (reqGbn == "cnclComplete") {
 		confirmStr 		= "취소완료하시겠습니까?";
 		cnclUrl 		= '/orderChange/cnclComplete/';
+
+		// 2021.11.30 card007 교환배송비 취소 불가 시 PG점프 처리
+		if (wdGb == 'W' && delvPayMeans == 'G014_60') {
+			confirmStr = '교환배송비 [' + (addPayCost / 2).addComma() + '원] 취소불가로 PG점프 처리 됩니다. <br /> 요청번호 [' + ordChgSq + '] 에 대한 취소승인 처리를 하시겠습니까?';
+		} else if (wdGb == 'D' && canDeliveryCancelYn == 'N') {
+			confirmStr = '교환배송비 [' + addPayCost.addComma() + '원] 취소불가로 PG점프 처리 됩니다. <br /> 요청번호 [' + ordChgSq + '] 에 대한 취소승인 처리를 하시겠습니까?';
+		}
 	}
 	// 취소신청승인
 	else if (reqGbn == "cnclReqComplete") {

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

@@ -248,7 +248,8 @@ var chgOrdDtlStat;															// 교환상품상세상태값
 var delvAddrSq;																// 교환상품배송지일련번호
 var npayChangeHoldYn		= '';											// 네이버페이 주문형 반품/교환 보류 여부
 var selfGoodsYn 			= cancelRequestTargetList[0].selfGoodsYn;		// 자사,입점여부
-var wdBfSendYn				= ""; 
+var wdBfSendYn				= "";
+var canDeliveryCancelYn		= "";
 
 var temp1 = true;
 var temp2 = true;
@@ -277,6 +278,7 @@ if (ordChgSq > 0) {
 	}
 	
 	wdBfSendYn				= orderChangeDetailList[0].wdBfSendYn;			// 선발송여부
+	canDeliveryCancelYn		= [[${canDeliveryCancelYn}]];
 }
 
 // 1. 주문정보(교환대상)
@@ -955,9 +957,15 @@ var fnExchangeCancel = function() {
 	data.ordChgSq = ordChgSq;
 	data.ordNo = ordNo;
 
+	// 교환배송비 철회 가능여부 체크
+	let message = '요청번호 [' + ordChgSq + '] 에 대한 요청철회 처리를 하시겠습니까?';
+	if (canDeliveryCancelYn == 'N') {
+		message = '교환배송비 [' + addPayCost.addComma() + '원] 취소불가로 PG점프 처리 됩니다. <br /> 요청번호 [' + ordChgSq + '] 에 대한 요청철회 처리를 하시겠습니까?';
+	}
+
 	let jsonData = JSON.stringify(data);
 
-	mcxDialog.confirm('요청번호 [' + ordChgSq + '] 에 대한 요청철회 처리를 하시겠습니까?', {
+	mcxDialog.confirm(message, {
 		cancelBtnText		: "취소",
 		sureBtnClick		: function(){
 			// 교환 실행
@@ -1439,12 +1447,17 @@ $(document).ready(function() {
 		}
 
 		// 네이버페이 주문형 보류 버튼 처리
-		if (!gagajf.isNull(npayChangeHoldYn)) {
-			if (npayChangeHoldYn == 'Y') {
-				$('#fnExchangeHold').css('display', 'none');
-			} else {
-				$('#fnReleaseExchangeHold').css('display', 'none');
+		if (pgGb == 'NAVER_ORDER') {
+			if (!gagajf.isNull(npayChangeHoldYn)) {
+				if (npayChangeHoldYn == 'Y') {
+					$('#fnExchangeHold').css('display', 'none');
+				} else {
+					$('#fnReleaseExchangeHold').css('display', 'none');
+				}
 			}
+		} else {
+			$('#fnExchangeHold').css('display', 'none');
+			$('#fnReleaseExchangeHold').css('display', 'none');
 		}
 	} else {
 		$('#chgerButton').css('display', 'none');						// 회수지 수정 버튼

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

@@ -132,8 +132,8 @@
 										th:text="|[${oneData.cd}] ${oneData.cdNm}|"></option>
 							</select>
 						</td>
-						<th rowspan="5">키워드<i class="star"></i></th>
-						<td rowspan="5">
+						<th rowspan="6">키워드<i class="star"></i></th>
+						<td rowspan="6">
 							<select name="search" id="search">
 								<option value="searchOrdNo">주문번호</option>
 								<option value="searchCustId">고객ID</option>
@@ -203,6 +203,24 @@
 							</select>
 						</td>
 					</tr>
+					<tr>
+						<th>제휴몰명</th>
+						<td>
+							<input type="hidden" class="w40p" name="vendorId" placeholder="" maxlength="20" th:value="${vendorId}"/>
+							<select name="extmallId">
+								<option value="">선택안함</option>
+								<option th:if="${extmallList}" th:each="oneData, status : ${extmallList}" th:value="${oneData.extmallId}" th:text="${'[' + oneData.extmallId + '] ' + oneData.extmallNm}"></option>
+							</select>
+						</td>
+						<th>제휴몰 주문번호</th>
+						<td>
+							<input type="text" name="extmallOrderId" placeholder="" maxlength="40"/>
+						</td>
+						<th>SKU-CODE</th>
+						<td>
+							<input type="text" name="optCd" placeholder="" maxlength="40"/>
+						</td>
+					</tr>
 					<tr>
 						<th>조회일자</th>
 						<td colspan="7">
@@ -405,7 +423,7 @@ var columnDefsOrderList = [
 			return gagaAgGrid.lookupValue(vendorList, params.data.vendorId);
 		}
 	},
-	{headerName: "외부몰주문번호"	, field: "extmallOrderId"	, width: 120, cellClass: 'textFormat', sortable: true},
+	{headerName: "제휴몰주문번호"	, field: "extmallOrderId"	, width: 120, cellClass: 'textFormat', sortable: true},
 	{headerName: "샵링커주문번호"	, field: "agentOrderId"		, width: 120, cellClass: 'textFormat', sortable: true},
 	{
 		headerName		: "주문수량"

src/main/webapp/WEB-INF/views/withdraw/RefundRegisterListForm.html

@@ -243,7 +243,7 @@
 				}
 			}
 		},
-		{headerName: "고객고유번호", field: "custNo"				, width: 120, cellClass: 'text-center', hide: true},
+		{headerName: "고객고유번호", 		field: "custNo", 			width: 120, cellClass: 'text-center', hide: true},
 		{headerName: "주문자연락처", 		field: "maskingOrdPhnno",	width: 120, cellClass: 'text-center'},
 		{headerName: "회수송장번호", 		field: "wdInvoiceNo", 		width: 100, cellClass: 'text-center'},
 		{headerName: "도착일", 			field: "arrivalDt", 		width: 100,  cellClass: 'text-center'},

src/main/webapp/ux/css/admin.ui.css

@@ -28,6 +28,7 @@ textarea {overflow:auto; resize:vertical; width:100%; margin:4px 0; vertical-ali
 .textareaR2 {min-height:60px; line-height:26px;}
 .textareaR3 {min-height:96px; line-height:26px;}
 .textareaR4 {min-height:134px; line-height:26px;}
+.textareaR15 {min-height:400px; line-height:26px;}
 .byteChk {line-height:20px; padding-left:20px; display:inline-block; vertical-align:middle;}
 select {margin:0 3px 1px 0; padding:3px 10px 3px 3px; color:inherit; border-radius:1px; vertical-align:middle;}
 select, input[type=text], input[type=file], input[type=date], input[type=password], textarea {border:1px solid #dbdbdb;}