Merge branch 'develop' into style

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

@@ -4043,13 +4043,7 @@ public class TsaGoodsService {
 			throw new IllegalStateException(message.getMessage("FAIL_1001"));
 		}
 
-		GoodsSearch search = new GoodsSearch();
-		search.setConditionList(goods.getArrGoodsCd());
-		search.setSearch("searchGoodsCd");
-		int cnt = getGoodsListCount(search);
-		if (cnt < goods.getArrGoodsCd().length) {
-			throw new IllegalStateException("상품코드를 확인해주세요.");
-		}
+		
 
 		goods.setRegNo(TsaSession.getInfo().getUserNo());
 		goods.setUpdNo(TsaSession.getInfo().getUserNo());
@@ -4101,18 +4095,12 @@ public class TsaGoodsService {
 			throw new IllegalStateException("엑셀 파일의 건수를 " + EXCEL_ROW_COUNT + "건 이하로 사용하세요.");
 		}
 
-		// 검증
-		GoodsSearch search = new GoodsSearch();
-		search.setSearch("searchGoodsCd");
+
 
 		int index = 0;
 		for (Goods goods : goodsList) {
 
-			search.setGoodsCd(goods.getGoodsCd());
-			int cnt = getGoodsListCount(search);
-			if (cnt == 0) {
-				throw new IllegalStateException("상품코드를 확인해주세요.");
-			}
+
 
 			goods.setRegNo(TsaSession.getInfo().getUserNo());
 

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

@@ -5049,12 +5049,12 @@
 		/* TsaGoods.getGoodsQuikDeleverySkipCount */
 		SELECT COUNT(*)
 		FROM TB_GOODS_SHOT_DELV_SKIP A
-		INNER JOIN TB_GOODS G ON A.GOODS_CD = G.GOODS_CD
-		INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
-		INNER JOIN TB_BRAND_GROUP D ON B.BRAND_GROUP_NO  = D.BRAND_GROUP_NO
-		INNER JOIN TB_SUPPLY_COMPANY S ON G.SUPPLY_COMP_CD = S.SUPPLY_COMP_CD
+		LEFT JOIN TB_GOODS G ON A.GOODS_CD = G.GOODS_CD
+		LEFT JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
+		LEFT JOIN TB_BRAND_GROUP D ON B.BRAND_GROUP_NO  = D.BRAND_GROUP_NO
+		LEFT JOIN TB_SUPPLY_COMPANY S ON G.SUPPLY_COMP_CD = S.SUPPLY_COMP_CD
 		<if test="searchGb != null and searchGb =='EXCEL'">
-		INNER JOIN (
+		LEFT JOIN (
 		            SELECT SEARCH_CD
 		                 , TMP_DISP_ORD
 		            FROM (
@@ -5097,7 +5097,7 @@
 		FROM (
 		    SELECT A.*
 		    FROM (
-		SELECT G.GOODS_CD
+		SELECT A.GOODS_CD
 		     , G.GOODS_NM
 		     , G.GOODS_STAT
 		     , G.SUPPLY_COMP_CD
@@ -5115,12 +5115,12 @@
 		         </otherwise>
 		     </choose>
 		FROM TB_GOODS_SHOT_DELV_SKIP A
-		INNER JOIN TB_GOODS G ON A.GOODS_CD = G.GOODS_CD
-		INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
-		INNER JOIN TB_BRAND_GROUP D ON B.BRAND_GROUP_NO  = D.BRAND_GROUP_NO
-		INNER JOIN TB_SUPPLY_COMPANY S ON G.SUPPLY_COMP_CD = S.SUPPLY_COMP_CD
+		LEFT JOIN TB_GOODS G ON A.GOODS_CD = G.GOODS_CD
+		LEFT JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
+		LEFT JOIN TB_BRAND_GROUP D ON B.BRAND_GROUP_NO  = D.BRAND_GROUP_NO
+		LEFT JOIN TB_SUPPLY_COMPANY S ON G.SUPPLY_COMP_CD = S.SUPPLY_COMP_CD
 		<if test="searchGb != null and searchGb =='EXCEL'">
-		INNER JOIN (
+		LEFT JOIN (
 		            SELECT SEARCH_CD
 		                 , TMP_DISP_ORD
 		            FROM (

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

@@ -387,6 +387,7 @@
 		                     , OD.SUPPLY_COMP_CD              /*공급업체코드*/
 		                     , ODIH.ORD_NO                    /*주문번호*/
 		                     , ODIH.ORD_DTL_STAT AS SETTLE_GB /*정산구분*/
+		                     , OD.DELV_FEE_CD
 		                FROM   TB_ORDER_DETAIL_ITEM_HST ODIH
 		                     , TB_ORDER_DETAIL OD
 		                     , TB_GOODS G
@@ -397,9 +398,14 @@
 		                AND    ODIH.ORD_DTL_STAT IN ('G720_20','G720_50','G720_60') /*판매-배송중,환입-반품완료,환입-교환완료*/
 		               ) OD
 		             , TB_DELIVERY_FEE DF
-		        WHERE  OD.SUPPLY_COMP_CD = DF.SUPPLY_COMP_CD
-		        AND    OD.ORD_NO = DF.ORD_NO
-		        AND    OD.OCCUR_DT >= DF.REG_DT /*출고기준의 일자 보다 배송비 발생일자가 적은 넘만*/
+		       		 , TB_SUPPLY_COMPANY SC
+                     , TB_SUPPLY_VENDOR SV
+                WHERE  OD.SUPPLY_COMP_CD = DF.SUPPLY_COMP_CD
+                AND    OD.ORD_NO = DF.ORD_NO
+                AND    OD.OCCUR_DT >= DF.REG_DT /*출고기준의 일자 보다 배송비 발생일자가 적은 넘만*/
+                AND    OD.SUPPLY_COMP_CD = SC.SUPPLY_COMP_CD
+                AND    SC.SUPPLY_VENDOR_CD = SV.SUPPLY_VENDOR_CD
+                AND    OD.DELV_FEE_CD = DF.DELV_FEE_CD
 		        GROUP  BY DATE_FORMAT(OD.OCCUR_DT,'%Y%m%d')
 		                , OD.SUPPLY_COMP_CD
 		       ) ODIH

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

@@ -947,7 +947,12 @@
 			mcxDialog.alert("행사 기간은 1년을 초과 할 수 없습니다.");
 			return false;
 		}
-
+		
+		if (!$("#extmallYn").is(":checked") && !$("#selfYn").is(":checked")) {
+			mcxDialog.alert("적용몰을 선택해주세요.");
+			return false;
+		}
+		
 		if ($("#extmallYn").is(":checked") && extmallCnt < 1) {
 			mcxDialog.alert("제휴몰을 선택해주세요.");
 			return false;

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

@@ -13,7 +13,7 @@
  * 1.0  2020.12.12   jsh77b       최초 작성
  *******************************************************************************
  -->
-<div class="modalPopup" data-width="1400" data-height="600">
+<div class="modalPopup"  data-height="800">
 	<div class="panelStyle">
 		<div class="panelTitle">
 			<h2>취소요청</h2>
@@ -318,7 +318,7 @@ var columnCancelReqList = [
 	{headerName: "주문상세상태"	, field: "ordDtlStatNm"		, width: 100	, cellClass: 'text-center'	, hide: temp1},
 	{headerName: "상품코드"		, field: "goodsCd"			, width: 100	, cellClass: 'text-left'	, hide: temp2},
 	{headerName: "SKUCODE"		, field: "optCd"			, width: 100	, cellClass: 'text-center'	, hide: temp2},
-	{headerName: "상품명"			, field: "goodsNm"			, width: 200	, cellClass: 'text-left'	, hide: temp2},
+	{headerName: "상품명"			, field: "goodsNm"			, width: 330	, cellClass: 'text-left'	, hide: temp2},
 	{headerName: "상품타입"		, field: "goodsTypeNm"		, width: 100	, cellClass: 'text-center'	,
 		cellRenderer: function (params) {
 			var option;
@@ -331,7 +331,10 @@ var columnCancelReqList = [
 		},
 		hide: temp2
 	},
-	{headerName: "옵션1"			, field: "colorNm"			, width: 80		, cellClass: 'text-center'	, hide: temp2},
+	{headerName: "옵션1"			, field: "colorNm"			, width: 100		, cellClass: 'text-center'	, hide: temp2
+		, cellRenderer	: function (params) {
+		 return  params.data.colorNm + "[" + params.data.optCd1 +"]" ;
+	}},
 	{headerName: "옵션2"			, field: "optCd2"			, width: 80		, cellClass: 'text-center'	, hide: temp2},
 	{
 		headerName		: "옵션금액"

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

@@ -13,7 +13,7 @@
  * 1.0  2021.01.15   card007     최초 작성
  *******************************************************************************
  -->
-<div class="modalPopup" data-width="1400" data-height="600">
+<div class="modalPopup"  data-height="800">
 	<div class="panelStyle">
 		<div class="panelTitle">
 			<h2>교환요청</h2>
@@ -245,6 +245,7 @@
 <script th:inline="javascript">
 /*<![CDATA[*/
 var cancelRequestTargetList = [[${cancelRequestTargetList}]];				// 교환대상목록
+var cancelRequestTargetCnt 	= [[${cancelRequestTargetList.size()}]];		// 교환대상건수
 var ordNo 					= [[${ordNo}]];									// 주문번호
 var ordChgSq 				= [[${ordChgSq}]];								// 주문변경번호
 var chgStat					= [[${chgStat}]];								// 변경상태
@@ -318,8 +319,12 @@ var columnExchangeReqList = [
 			{headerName: "단품번호"		, field: "ordDtlItemSq"		, width: 100	, cellClass: 'text-center', hide: temp2},
 			{headerName: "단품코드"		, field: "itemCd"			, width: 100	, cellClass: 'text-center'},
 			{headerName: "SKUCODE"		, field: "optCd"			, width: 100	, cellClass: 'text-center'},
-			{headerName: "단품명"			, field: "itemNm"			, width: 130	, cellClass: 'text-center'},
-			{headerName: "옵션1"			, field: "optCd1"			, width: 60		, cellClass: 'text-center'},
+			{headerName: "단품명"			, field: "itemNm"			, width: 330	, cellClass: 'text-left'},
+			{headerName: "옵션1"			, field: "optCd1"			, width: 100		, cellClass: 'text-center',
+				cellRenderer	: function (params) {
+					 return  params.data.colorNm + "[" + params.data.optCd1 +"]" ;
+					}
+			},
 			{headerName: "옵션2"			, field: "optCd2"			, width: 60		, cellClass: 'text-center'},
 			{
 				headerName		: "단품수량"
@@ -1594,6 +1599,8 @@ $(document).ready(function() {
 		$('#chgerButton').css('display', 'none');						// 회수지 수정 버튼
 		$('#recipButton').css('display', 'none');						// 교환지 수정 버튼
 	}
+	var cancelRequestTargetHeight = 80 + (40 * cancelRequestTargetCnt);
+	$("#gridOrderCancelRequestList").css("height" , cancelRequestTargetHeight+"px");
 	
 	// 글자수 제한 byte 표기
 	cfnGetTextLength($('#chgMemo'), 1000, $('#chgMemoCount'));
@@ -1603,7 +1610,7 @@ $(document).ready(function() {
 	// 수량체크
 	fnChangeQty();
 	
-	if (orderChangeDetailList != null) {
+	if ( orderChangeDetailList != null && orderChangeDetailList.length > 0) {
 		$('#exchRequestRegNm').text(orderChangeDetailList[0].regNm);
 		$('#exchRequestUpdNm').text(orderChangeDetailList[0].updNm);
 	}

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

@@ -14,7 +14,7 @@
  *******************************************************************************
  -->
  
-<div class="modalPopup" data-width="1500" data-height="700"> <!-- data-width="1500" data-height="870" -->
+<div class="modalPopup"  data-height="870"> <!-- data-width="1500" data-height="870" -->
 	<div class="panelStyle">
 		<div class="panelTitle">
 			<h2>주문상세내역</h2>
@@ -294,7 +294,7 @@ var columnDefsGoodsInfo = [
 			{
 				headerName		: "상품명"
 				, field			: "goodsNm"
-				, width			: 200
+				, width			: 330
 				, cellClass		: 'text-left'
 				, cellRenderer: function (params) {
 					return '<a href="javascript:void(0);" onclick="cfnOpenFrontGoodsPopup(\'' + params.data.goodsCd + '\',\'' + params.data.siteCd + '\');">' + params.value + '</a>';
@@ -313,7 +313,11 @@ var columnDefsGoodsInfo = [
 			},
 			{ headerName: "배송구분"	, field: "shotDelvGb"	, width: 80, cellClass: 'text-center' },
 			{headerName: "브랜드"		, field: "brandGroupNm"	, width: 80, cellClass: 'text-center'},
-			{headerName: "옵션1"		, field: "colorNm"		, width: 60, cellClass: 'text-center'},
+			{headerName: "옵션1"		, field: "colorNm"		, width: 100, cellClass: 'text-center'
+				, cellRenderer	: function (params) {
+					 return  params.data.colorNm + "[" + params.data.optCd1 +"]" ;
+				}
+			},
 			{headerName: "옵션2"		, field: "optCd2"		, width: 60, cellClass: 'text-center'},
 			{headerName: "주문상태"	, field: "ordDtlStat"	, width: 100, cellClass: 'text-center', hide: true},
 			{
@@ -1047,7 +1051,7 @@ var columnDefsOrderMemoInfo = [
 	{
 		headerName		: "관리메모"
 		, field			: "memo"
-		, width			: 150
+		, width			: 1200
 		, cellClass		: 'text-left'
 		, cellRenderer	: function (params) {
 			var retStr = '';

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

@@ -13,7 +13,7 @@
  * 1.0  2020.11.16   jsh77b       최초 작성
  *******************************************************************************
  -->
-<div class="modalPopup" data-width="900">
+<div class="modalPopup" data-width="900" data-height="500" >
 	<div class="panelStyle">
 		<div class="panelTitle">
 			<h2>주문메모등록</h2>
@@ -39,8 +39,8 @@
 						<tr>
 							<th>관리자 메모<br/><span id="dpLocAnsContent">0</span>/4,000Byte</th>
 							<td>
-								<textarea th:if="${orderMemo != null and orderMemo != ''}" name="memo" style="height:100px;" th:text="${orderMemo.memo}" onkeyup="cfnGetTextLength(this, 4000, $('#dpLocAnsContent'));"></textarea>
-								<textarea th:unless="${orderMemo != null and orderMemo != ''}" name="memo" style="height:100px;" text="" onkeyup="cfnGetTextLength(this, 4000, $('#dpLocAnsContent'));"></textarea>
+								<textarea th:if="${orderMemo != null and orderMemo != ''}" name="memo" style="height:300px;" th:text="${orderMemo.memo}" onkeyup="cfnGetTextLength(this, 4000, $('#dpLocAnsContent'));"></textarea>
+								<textarea th:unless="${orderMemo != null and orderMemo != ''}" name="memo" style="height:300px;" text="" onkeyup="cfnGetTextLength(this, 4000, $('#dpLocAnsContent'));"></textarea>
 							</td>
 						</tr>
 						<tr id="imageFileTr">

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

@@ -13,7 +13,7 @@
  * 1.0  2020.12.12   jsh77b       최초 작성
  *******************************************************************************
  -->
-<div class="modalPopup" data-width="1400" data-height="600">
+<div class="modalPopup"  data-height="800">
 	<div class="panelStyle">
 		<div class="panelTitle">
 			<h2>반품요청</h2>
@@ -339,7 +339,7 @@ var columnCancelReqList = [
 	{headerName: "주문상세상태"	, field: "ordDtlStatNm"		, width: 100	, cellClass: 'text-center'	, hide: temp1},
 	{headerName: "상품코드"		, field: "goodsCd"			, width: 110	, cellClass: 'text-left'	, hide: temp2},
 	{headerName: "SKUCODE"		, field: "optCd"			, width: 100	, cellClass: 'text-center'	, hide: temp2},
-	{headerName: "상품명"			, field: "goodsNm"			, width: 200	, cellClass: 'text-left'	, hide: temp2},
+	{headerName: "상품명"			, field: "goodsNm"			, width: 330	, cellClass: 'text-left'	, hide: temp2},
 	{headerName: "상품타입"		, field: "goodsTypeNm"		, width: 80		, cellClass: 'text-center',
 		cellRenderer: function (params) {
 			var option;
@@ -352,7 +352,11 @@ var columnCancelReqList = [
 		},
 		hide: temp2
 	},
-	{headerName: "옵션1"			, field: "colorNm"			, width: 60		, cellClass: 'text-center'	, hide: temp2},
+	{headerName: "옵션1"			, field: "colorNm"			, width: 100		, cellClass: 'text-center'	, hide: temp2,
+		cellRenderer	: function (params) {
+			 return  params.data.colorNm + "[" + params.data.optCd1 +"]";
+			}
+	},
 	{headerName: "옵션2"			, field: "optCd2"			, width: 60		, cellClass: 'text-center'	, hide: temp2},
 	{
 		headerName		: "옵션금액"

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

@@ -19,9 +19,7 @@ function uifnPopupOpen(id){
 		}
 		$firstPanel.css({width:popW});
 	} else { //auto
-		popW = $fisrtChild.width();
-		let maxW = $(window).width()-100;
-		$firstPanel.css({maxWidth:maxW});
+		$firstPanel.css({width:'100%'});
 	};
 
 	//높이