상품관련 수정(md요청 적용)

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

@@ -692,11 +692,11 @@
 		        </if>
 		        <if test='dateGbn != null and dateGbn == "S"'>
 		            <if test="stDate != null and stDate != ''">
-		        AND G.APPR_UPD_DT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
+		        AND G.FRST_CFRM_DT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
 		            </if>
 		            <if test="edDate != null and edDate != ''">
 		            <![CDATA[
-		        AND G.APPR_UPD_DT < DATE_FORMAT(DATE_ADD(#{edDate}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%S')
+		        AND G.FRST_CFRM_DT < DATE_FORMAT(DATE_ADD(#{edDate}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%S')
 		            ]]>
 		            </if>
 		        </if>

style24.admin/src/main/java/com/style24/persistence/mybatis/shop/TsaStock.xml

@@ -187,11 +187,11 @@
 		        </if>
 		        <if test='dateGbn != null and dateGbn == "S"'>
 		            <if test="stDate != null and stDate != ''">
-		        AND G.APPR_UPD_DT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
+		        AND G.FRST_CFRM_DT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
 		            </if>
 		            <if test="edDate != null and edDate != ''">
 		            <![CDATA[
-		        AND G.APPR_UPD_DT < DATE_FORMAT(DATE_ADD(#{edDate}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%S')
+		        AND G.FRST_CFRM_DT < DATE_FORMAT(DATE_ADD(#{edDate}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%S')
 		            ]]>
 		            </if>
 		        </if>

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

@@ -98,25 +98,39 @@
 								</ul>
 							</div>
 						</td>
-						<th>년도/시즌</th>
+						<th>정상/이월 구분</th>
 						<td>
-							<select  name="styleYear" id="styleYear">
-								<option value="">[전체]</option>
-								<option th:if="${styleYearList}" th:each="oneData, status : ${styleYearList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
-							</select>
-							<select  name="seasonCd" id="seasonCd">
+							<select  name="formalGb" id="formalGb">
 								<option value="">[전체]</option>
-								<option th:if="${seasonList}" th:each="oneData, status : ${seasonList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
+								<option th:if="${formalGbList}" th:each="oneData, status : ${formalGbList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
 							</select>
 						</td>
 					</tr>
 					<tr>
-						<th>정상/이월 구분</th>
+						<th>년도/시즌</th>
 						<td>
-							<select  name="formalGb" id="formalGb">
+							<!-- <select  name="styleYear" id="styleYear">
 								<option value="">[전체]</option>
-								<option th:if="${formalGbList}" th:each="oneData, status : ${formalGbList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
+								<option th:if="${styleYearList}" th:each="oneData, status : ${styleYearList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
 							</select>
+							<select  name="seasonCd" id="seasonCd">
+								<option value="">[전체]</option>
+								<option th:if="${seasonList}" th:each="oneData, status : ${seasonList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
+							</select> -->
+							<div class="multiCheckBox" style="width:140px;">
+								<button type="button" class="sltBtn">[전체]</button>
+								<ul style="overflow:auto; height:140px">
+									<li><label class="chkBox"><input type="checkbox" name="전체선택" id="multiStyleYear" onclick="uifnAllCheck('multiStyleYear')">전체선택</label></li>
+									<li th:if="${styleYearList}" th:each="oneData, status : ${styleYearList}"><label class="chkBox"><input type="checkbox" name="multiStyleYear" th:id="${'styleYear' + oneData.cd}" th:value="${oneData.cd}" ><th:block th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></th:block></label></li>
+								</ul>
+							</div>
+							<div class="multiCheckBox" style="width:170px;">
+								<button type="button" class="sltBtn">[전체]</button>
+								<ul style="overflow:auto; height:170px">
+									<li><label class="chkBox"><input type="checkbox" name="전체선택" id="multiSeasonCd" onclick="uifnAllCheck('multiSeasonCd')">전체선택</label></li>
+									<li th:if="${seasonList}" th:each="oneData, status : ${seasonList}"><label class="chkBox"><input type="checkbox" name="multiSeasonCd" th:id="${'seasonCd' + oneData.cd}" th:value="${oneData.cd}" ><th:block th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></th:block></label></li>
+								</ul>
+							</div>		
 						</td>
 						<th>연령대</th>
 						<td>
@@ -943,6 +957,7 @@
 		var selectCode = '<select  name="dateGbn" id="dateGbn">';
 		selectCode += '<option value="R" seledted>상품등록일</option>';
 		selectCode += '<option value="P">가격변경일</option>';
+		selectCode += '<option value="S">최초승인일</option>';
 		selectCode += '</select>';
 
 		$("#searchForm").find('#sellTerms').prepend(selectCode);

style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsMassRegisterForm.html

@@ -139,9 +139,9 @@
 					</div>
 					<!-- //아이콘 툴팁 -->
 				</li>
-				<li class="right">
+				<!-- <li class="right">
 					<button type="button" class="btn btn-default btn-lg" id="btnGoodsRegExcelDownLoad">엑셀다운로드</button>
-				</li>
+				</li> -->
 			</ul>
 			<!-- //상단버튼 영역  -->
 			<div id="gridList" style="width: 100%; height: 500px;" class="ag-theme-balham"></div>
@@ -227,9 +227,6 @@
 		{headerName: "시즌", field: "seasonCd", width: 80, cellClass: 'text-center'},
 		{headerName: "성별", field: "sexGb", width: 80, cellClass: 'text-center'},
 		{headerName: "품번", field: "goodsNum", width: 100, cellClass: 'text-center'},
-		{headerName: "형태", field: "shapeCd", width: 80, cellClass: 'text-center'},
-		{headerName: "색상", field: "colorCd", width: 80, cellClass: 'text-center'},
-		{headerName: "TAG가", field: "tagPrice", width: 100, cellClass: 'text-center'},
 		{headerName: "정상가", field: "listPrice", width: 100, cellClass: 'text-center'},
 		{headerName: "판매가", field: "currPrice", width: 100, cellClass: 'text-center'},
 		{headerName: "공급업체상품코드", field: "supplyGoodsCd", width: 130, cellClass: 'text-center'},
@@ -400,18 +397,17 @@
 		str = str + '<div class="mdPopContent">';
 		str = str + '<ul class="notice ">';
 		str = str + '- <em>상품미등록</em>';
-		str = str + '<li>상품코드 오류 : 빈값, 길이 11, \'_\'가 존재하는지</li>';
-		str = str + '<li>업체 오류 : 빈값, \'W\'나 \'F\' 가 아닌경우</li>';
+		str = str + '<li>상품코드 오류 : 빈값</li>';
+		str = str + '<li>업체 오류 : 빈값</li>';
 		str = str + '<li>상품명 오류 : 빈값</li>';
 		str = str + '<li>제조국 오류 : 빈값</li>';
 		str = str + '<li>제조년월일 오류 : 빈값, 날짜형식이 맞는지</li>';
-		str = str + '<li>ERP 미존재 상품코드 : ERP에 상품코드가 존재하는지</li>';
+		str = str + '<li>WMS 미존재 상품코드 : WMS에 상품코드가 존재하는지</li>';
 		str = str + '<li>스타일 연도 오류 : 온라인에서 관리되지 않는 스타일 연도</li>';
 		str = str + '<li>성별 오류 : 온라인에서 관리되지 않는 성별</li>';
-		str = str + '<li>컬러 오류 : 온라인에서 관리되지 않는 컬러</li>';
 		str = str + '<li>상품코드 중복등록요청 : 등록된 상품코드 등록요청</li>';
 		str = str + '<li>품목 오류 : 온라인에서 관리되지 않는 품목</li>';
-		str = str + '<li>ERP 브랜드 오류 : 온라인에서 관리되지 않는 ERP 브랜드</li>';
+		str = str + '<li>WMS 브랜드 오류 : 온라인에서 관리되지 않는 WMS 브랜드</li>';
 		str = str + '<li>이미지 유형 오류 : 온라인에서 관리되지 않는 이미지유형</li>';
 		str = str + '<li>상품이미지 필수 오류 : A타입 : IMG_PATH1: 정사각형이미지(앞면),IMG_PATH3: 작사각형이미지(정면),<br/></li>';
 		str = str + '<span style="padding-left:185px;"></span>';
@@ -420,7 +416,6 @@
 		str = str + '<li>품목의 고시정보 없음 : 품목의 고시분류 매핑이 안되어 있는 경우</li>';
 		str = str + '<li>고시분류 오류 : 등록요청 고시분류 와 온라인에서 품목과 매핑된 고시분류가 다른 경우</li>';
 		str = str + '- <em>상품등록</em>';
-		str = str + '<li>ERP 상품 사이즈 정보 없음 : ERP에 상품코드의 사이즈가 없을 경우</li>';
 		str = str + '</ul>';
 		str = str + '</div></div></div>';
 

style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsPopupListForm.html

@@ -14,7 +14,7 @@
  * 1.0  2020.10.26   eskim       최초 작성
  *******************************************************************************
  -->
-	<div class="modalPopup" data-width="1600">
+	<div class="modalPopup" data-width="1700">
 	<div class="panelStyle">
 		<!-- TITLE -->
 		<div class="panelTitle">
@@ -87,25 +87,40 @@
 							</ul>
 						</div>
 					</td>
-					<th>년도/시즌</th>
+					<th>정상/이월 구분</th>
 					<td>
-						<select  name="styleYear" id="styleYear">
-							<option value="">[전체]</option>
-							<option th:if="${styleYearList}" th:each="oneData, status : ${styleYearList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
-						</select>
-						<select  name="seasonCd" id="seasonCd">
+						<select  name="formalGb" id="formalGb">
 							<option value="">[전체]</option>
-							<option th:if="${seasonList}" th:each="oneData, status : ${seasonList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
+							<option th:if="${formalGbList}" th:each="oneData, status : ${formalGbList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
 						</select>
 					</td>
+					
 				</tr>
 				<tr>
-					<th>정상/이월 구분</th>
+					<th>년도/시즌</th>
 					<td>
-						<select  name="formalGb" id="formalGb">
+						<!-- <select  name="styleYear" id="styleYear">
 							<option value="">[전체]</option>
-							<option th:if="${formalGbList}" th:each="oneData, status : ${formalGbList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
+							<option th:if="${styleYearList}" th:each="oneData, status : ${styleYearList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
 						</select>
+						<select  name="seasonCd" id="seasonCd">
+							<option value="">[전체]</option>
+							<option th:if="${seasonList}" th:each="oneData, status : ${seasonList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
+						</select> -->
+						<div class="multiCheckBox" style="width:140px;">
+							<button type="button" class="sltBtn">[전체]</button>
+							<ul style="overflow:auto; height:140px">
+								<li><label class="chkBox"><input type="checkbox" name="전체선택" id="multiStyleYear" onclick="uifnAllCheck('multiStyleYear')">전체선택</label></li>
+								<li th:if="${styleYearList}" th:each="oneData, status : ${styleYearList}"><label class="chkBox"><input type="checkbox" name="multiStyleYear" th:id="${'styleYear' + oneData.cd}" th:value="${oneData.cd}" ><th:block th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></th:block></label></li>
+							</ul>
+						</div>
+						<div class="multiCheckBox" style="width:170px;">
+							<button type="button" class="sltBtn">[전체]</button>
+							<ul style="overflow:auto; height:170px">
+								<li><label class="chkBox"><input type="checkbox" name="전체선택" id="multiSeasonCd" onclick="uifnAllCheck('multiSeasonCd')">전체선택</label></li>
+								<li th:if="${seasonList}" th:each="oneData, status : ${seasonList}"><label class="chkBox"><input type="checkbox" name="multiSeasonCd" th:id="${'seasonCd' + oneData.cd}" th:value="${oneData.cd}" ><th:block th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></th:block></label></li>
+							</ul>
+						</div>
 					</td>
 					<th>연령대</th>
 					<td>
@@ -493,7 +508,7 @@
 		var selectCode = '<select  name="dateGbn" id="dateGbn"  class="w100">';
 		selectCode += '<option value="R" seledted>상품등록일</option>';
 		selectCode += '<option value="P">가격변경일</option>';
-		selectCode += '<option value="S">승인일</option>';
+		selectCode += '<option value="S">최초승인일</option>';
 		selectCode += '</select>';
 
 		$("#goodsPopupForm").find('#sellTermsP').prepend(selectCode);

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

@@ -172,14 +172,14 @@
 			,valueFormatter: function(params) {return params.value.addComma();}
 			,cellStyle : function(params){return { 'color': 'red'}}
 		},
-		{headerName: "예약시작일시", field: "applyStdt", width: 130, cellClass: 'text-center',
+		{headerName: "예약시작일시", field: "applyStdt", width: 150, cellClass: 'text-center',
 			cellRenderer: function(params) {
-				return !gagajf.isNull(params.value) ? params.value.toDate("YYYYMMDDHHmmss").format("YYYY-MM-DD") : '';
+				return !gagajf.isNull(params.value) ? params.value.toDate("YYYYMMDDHHmmss").format("YYYY-MM-DD HH:mm:ss") : '';
 			}
 		},
-		{headerName: "예약종료일시", field: "applyEddt", width: 130, cellClass: 'text-center',
+		{headerName: "예약종료일시", field: "applyEddt", width: 150, cellClass: 'text-center',
 			cellRenderer: function(params) {
-				return !gagajf.isNull(params.value) ? params.value.toDate("YYYYMMDDHHmmss").format("YYYY-MM-DD") : '';
+				return !gagajf.isNull(params.value) ? params.value.toDate("YYYYMMDDHHmmss").format("YYYY-MM-DD HH:mm:ss") : '';
 			}
 		},
 		{headerName: "등록일시", field: "regDt", width: 150, cellClass: 'text-center',

style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsPriceReservePopupForm.html

@@ -32,12 +32,22 @@
 					<tr>
 						<th>상품예약가격<em class="required" title="필수"></em></th>
 						<td><input type="text" class="w100p aR" id="resGoodsPrice" name="resGoodsPrice" maxlength="10" data-valid-type="numeric" /></td>
-						<th>예약일자<em class="required" title="필수"></em></th>
+						<th>예약일시<em class="required" title="필수"></em></th>
 						<td>
 							<input name="applyStYMD" id="applyStYMD" type="text" class="w80 schDate" maxlength="10" required="required" data-valid-name="예약시작일" />
+							<select name="applyStHH" id="applyStHH" required="required" data-valid-name="예약 시작시간">
+								<th:block th:each="num, index  : ${#numbers.sequence(0,23)}">
+								<option  th:value="${#numbers.formatInteger(num,2)}" th:text="|${#numbers.formatInteger(num,2)}시|" >시간</option>
+								</th:block>
+							</select>
 							<input name="applyStdt" id="applyStdt" type="hidden" />
 							~
 							<input name="applyEdYMD" id="applyEdYMD" type="text" class="w80 schDate" maxlength="10" required="required" data-valid-name="예약 종료일" />
+							<select name="applyEdHH" id="applyEdHH" required="required" data-valid-name="예약 종료시간">
+								<th:block th:each="num: ${#numbers.sequence(0,23)}">
+								<option  th:value="${#numbers.formatInteger(num,2)}"  th:text="|${#numbers.formatInteger(num,2)}시|" th:selected="${#numbers.formatInteger(num,2)}==23 ? 'true'">시간</option>
+								</th:block>
+							</select>
 							<input name="applyEddt" id="applyEddt" type="hidden" />
 						</td>
 					</tr>
@@ -188,10 +198,14 @@
 
 		if (optCheck) return false;
 		
-		var applyStdt = $('#goodsPriceRsvtForm input[name=applyStYMD]').val().replaceAll("-","") ;
-		var applyEddt = $('#goodsPriceRsvtForm input[name=applyEdYMD]').val().replaceAll("-","");
+		var applyStdt = $('#goodsPriceRsvtForm input[name=applyStYMD]').val().replaceAll("-","") +
+		$('#goodsPriceRsvtForm select[name=applyStHH]').val() + "0000";
 
-		
+		var applyEddt = $('#goodsPriceRsvtForm input[name=applyEdYMD]').val().replaceAll("-","") +
+		$('#goodsPriceRsvtForm select[name=applyEdHH]').val() +"5959";
+
+		$('#goodsPriceRsvtForm input[name=applyStdt]').val(applyStdt);
+		$('#goodsPriceRsvtForm input[name=applyEddt]').val(applyEddt);
 
 		if ($('#goodsPriceRsvtForm input[name=applyStdt]').val() > $('#goodsPriceRsvtForm input[name=applyEddt]').val()) {
 			mcxDialog.alertC("예약 시작일자는 종료일자 보다 클 수 없습니다.", {
@@ -203,7 +217,7 @@
 			return false;
 		}
 
-		var toDateStr = new Date().format("YYYYMMDD");
+		var toDateStr = new Date().format("YYYYMMDDHHmmss");
 
 		if (toDateStr >= applyStdt){
 			mcxDialog.alertC("예약 시작일자는 현재일자 보다 작거나 같을 수 없습니다.",  {
@@ -236,9 +250,6 @@
 					arrEndGoodsPrice.push(item.currPrice);
 				});
 				
-				$('#goodsPriceRsvtForm input[name=applyStdt]').val(applyStdt +"000000");
-				$('#goodsPriceRsvtForm input[name=applyEddt]').val(applyEddt +"235959");
-
 				var data = {resGoodsPrice : $('#goodsPriceRsvtForm input[name=resGoodsPrice]').val()
 							, applyStdt : $('#goodsPriceRsvtForm input[name=applyStdt]').val()
 							, applyEddt : $('#goodsPriceRsvtForm input[name=applyEddt]').val()
@@ -305,8 +316,8 @@
 
 	//창종료
 	var fnGoodsPriceRsvtListFormClose = function(){
-		uifnPopupClose('popupGoodsTitleReserve');
-		fnGoodsTnmResDeleteCollBack();
+		uifnPopupClose('popupGoodsPriceReserve');
+		fnGoodsPriceResDeleteCollBack();
 	}
 
 	$(document).ready(function() {