상품상세 판매기간 설정

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

@@ -1022,6 +1022,11 @@ public class TsaGoodsService {
 				}
 			}
 		}
+		
+		// 판매기간설정 eskim
+		goods.setSellStdt(goods.getSellStYMD().replaceAll("-","") + goods.getSellStHH() + "0000");
+		goods.setSellEddt(goods.getSellEdYMD().replaceAll("-","") + goods.getSellEdHH() + "5959");
+		
 
 		// 기본정보 변경
 		if ("Y".equals(goods.getChDataYn())) {
@@ -1379,7 +1384,7 @@ public class TsaGoodsService {
 			}
 		}
 
-		this.createGoodsExtend(regGoods, goodsComposeList); // 딜상품 관련 정보 저장
+		this.createGoodsCompose(regGoods, goodsComposeList); // 딜상품 관련 정보 저장
 	}
 
 	/**
@@ -1460,7 +1465,7 @@ public class TsaGoodsService {
 		regGoods.setCostPrice(0);	// 원가 0원처리
 		regGoods.setDcRate((int)(this.getDcRate(listPriceSum, currPriceSum)));
 
-		this.createGoodsExtend(regGoods, goodsComposeList); // 세트상품 관련 정보 저장
+		this.createGoodsCompose(regGoods, goodsComposeList); // 세트상품 관련 정보 저장
 	}
 
 	/**
@@ -1471,7 +1476,7 @@ public class TsaGoodsService {
 	 * @author eskim
 	 * @since 2020. 10. 30
 	 */
-	private void createGoodsExtend(Goods regGoods, Collection<GoodsCompose> goodsComposeList) {
+	private void createGoodsCompose(Goods regGoods, Collection<GoodsCompose> goodsComposeList) {
 		// 브랜드 확인
 		Brand brand = new Brand();
 		brand.setBrandCd(regGoods.getBrandCd());
@@ -1485,7 +1490,7 @@ public class TsaGoodsService {
 		float pntMrate = 0f;
 		for (Brand tmpBrand : brandList) {
 
-			if ("10".equals(regGoods.getFormalGb())) {
+			if ("G009_10".equals(regGoods.getFormalGb())) {
 				pntPrate = tmpBrand.getPntPrate10();
 				pntMrate = tmpBrand.getPntMrate10();
 			} else {
@@ -1516,9 +1521,12 @@ public class TsaGoodsService {
 		}
 		regGoods.setDelvFeeCd(deliveryFeePolicyList.iterator().next().getDelvFeeCd());// 배송비정책코드
 
-
 		// 스타일 연도
 		regGoods.setStyleYear(regGoods.getStyleYear());
+		
+		// 판매기간설정
+		regGoods.setSellStdt(GagaDateUtil.getToday()+"000000");
+		regGoods.setSellEddt("30001231235959");
 
 		goodsDao.createGoods(regGoods); // 상품기본 저장
 		goodsDao.createGoodsSmmary(regGoods); // 상품통계 생성

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

@@ -602,7 +602,6 @@ public class TsaGoodsController extends TsaBaseController {
 		GagaMap result = new GagaMap();
 		result.set("status", GagaResponseStatus.SUCCESS.getCode()); // 200
 		result.set("procJob", goods.getProcJob());
-		// result.set("message", message.getMessage("SUCC_0001"));
 
 		String returnGoods = "";
 		String resultFlag = "SUCC";

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

@@ -76,6 +76,12 @@ public class Goods extends TscBaseDomain {
 	private String newCustOrdYn;		//신규고객 구매가능여부(Y:신규고객만 구매가능)
 	private int costPrice;		//원가
 	private String adultYn;		//성인용품여부
+	private String sellStdt;		//판매시작일시
+	private String sellStYMD;		//판매시작일
+	private String sellStHH;		//판매시작시
+	private String sellEddt;		//판매종료일시
+	private String sellEdYMD;		//판매종료일
+	private String sellEdHH;		//판매종료시
 
 	private String brandEnm;		//브랜드영문명
 	private String brandGroupNm;	//브랜드그룹명
@@ -192,5 +198,5 @@ public class Goods extends TscBaseDomain {
 	private int pageNo = 1;
 	private int pageSize = 50;
 	private int pageUnit = 10;
-
+	
 }

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

@@ -24,6 +24,8 @@ public class Option extends TscBaseDomain {
 	private String productCode;
 	private int baseStockQty;
 	private int currStockQty;
+	private int storeStockQty;
+	
 	private int addPrice;
 	private String soldoutYn;
 	private int dispOrd;

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

@@ -948,6 +948,8 @@
 		     , FN_GET_USER_NM(G.UPD_NO) AS UPD_NM
 		     , E.CERT_NUM
 		     , E.CERT_DT
+		     , DATE_FORMAT(G.SELL_STDT, '%Y%m%d%H%i%S') AS SELL_STDT
+		     , DATE_FORMAT(G.SELL_EDDT, '%Y%m%d%H%i%S') AS SELL_EDDT
 		FROM TB_GOODS G
 		INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
 		LEFT OUTER JOIN TB_DELV_FEE_POLICY D ON G.SUPPLY_COMP_CD = D.SUPPLY_COMP_CD
@@ -1068,6 +1070,8 @@
 		      , COST_PRICE
 		      , DC_RATE
 		      , GOODS_STAT
+		      , SELL_STDT
+		      , SELL_EDDT
 		      , SELF_MALL_YN
 		      , GOODS_GB
 		      , FOREIGN_BUY_YN
@@ -1126,6 +1130,8 @@
 		     , COST_PRICE
 		     , DC_RATE             
 		     , GOODS_STAT          
+		     , SELL_STDT
+		     , SELL_EDDT
 		     , SELF_MALL_YN             
 		     , GOODS_GB            
 		     , FOREIGN_BUY_YN
@@ -1233,7 +1239,12 @@
 		<if test="delvFeeCd != null and delvFeeCd != ''" >
 		    , DELV_FEE_CD = #{delvFeeCd}
 		</if>
-		
+		<if test="sellStdt != null and sellStdt != ''" >
+		    , SELL_STDT = STR_TO_DATE(#{sellStdt},'%Y%m%d%H%i%S')
+		</if>
+		<if test="sellEddt != null and sellEddt != ''" >
+		    , SELL_EDDT = STR_TO_DATE(#{sellEddt},'%Y%m%d%H%i%S')
+		</if>
 		WHERE GOODS_CD = #{goodsCd}
 	</update>
 	
@@ -1436,14 +1447,14 @@
 		SELECT #{goodsCd} AS GOODS_CD
 		     , A.GOODS_CD AS COMPS_GOODS_CD
 		     , A.OPT_CD
-		     --  , CONCAT(A.OPT_CD1,  COALESCE(A.OPT_CD2, '', CONCAT('/', A.OPT_CD2))) AS OPT_NM 
 		     , A.OPT_CD1
 		     , A.OPT_CD2
 		     , A.ADD_PRICE
 		     , A.BASE_STOCK_QTY
 		     , A.CURR_STOCK_QTY
-		     , IFNULL(B.STOCK_QTY,0) AS SALE_STOCK_QTY
-		     , GREATEST(GREATEST(A.CURR_STOCK_QTY - A.BASE_STOCK_QTY, 0) - IFNULL(B.STOCK_QTY, 0), 0) AS ABLE_STOCK_QTY
+		     , A.STORE_STOCK_QTY
+		     , IFNULL(B.STOCK_QTY,0) AS SALE_STOCK_QTY  /*출고대기*/
+		     , GREATEST(GREATEST((GREATEST(A.CURR_STOCK_QTY,0) + GREATEST(A.STORE_STOCK_QTY,0)) - A.BASE_STOCK_QTY, 0) - IFNULL(B.STOCK_QTY, 0), 0) AS ABLE_STOCK_QTY  /*판매가능재고*/
 		     , A.SOLDOUT_YN
 		     , A.DISP_ORD
 		     , A.DISP_YN
@@ -1684,6 +1695,8 @@
 		  , MAIN_COLOR_CD = #{mainColorCd}
 		  , NEW_CUST_ORD_YN = #{newCustOrdYn}
 		  , ADULT_YN = #{adultYn}
+		  , SELL_STDT = STR_TO_DATE(#{sellStdt},'%Y%m%d%H%i%S')
+		  , SELL_EDDT = STR_TO_DATE(#{sellEddt},'%Y%m%d%H%i%S')
 		  , UPD_NO = #{updNo}
 		  , UPD_DT = NOW()
 		WHERE GOODS_CD = #{goodsCd}
@@ -1800,6 +1813,7 @@
 		    , PRODUCT_CODE
 		    , BASE_STOCK_QTY
 		    , CURR_STOCK_QTY
+		    , STORE_STOCK_QTY
 		    , ADD_PRICE
 		    , SOLDOUT_YN
 		    , DISP_ORD
@@ -1819,6 +1833,7 @@
 		     , PRODUCT_CODE
 		     , BASE_STOCK_QTY
 		     , CURR_STOCK_QTY
+		     , STORE_STOCK_QTY
 		     , ADD_PRICE
 		     , SOLDOUT_YN
 		     , DISP_ORD
@@ -1844,6 +1859,7 @@
 		     , OPT_CD2
 		     , BASE_STOCK_QTY
 		     , CURR_STOCK_QTY
+		     , STORE_STOCK_QTY
 		     , ADD_PRICE
 		     , SOLDOUT_YN
 		     , DISP_ORD
@@ -1860,6 +1876,7 @@
 		     , #{optCd2}
 		     , #{baseStockQty}
 		     , #{currStockQty}
+		     , #{storeStockQty}
 		     , #{addPrice}
 		     , #{soldoutYn}
 		     , #{dispOrd}

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

@@ -14,7 +14,7 @@
  * 1.0  2020.10.23   eskim       최초 작성
  *******************************************************************************
  -->
-	<div class="modalPopup" data-width="1500" > <!-- data-width="1500" data-height="870" -->
+	<div class="modalPopup" data-width="1700"  data-height="870"> <!-- data-width="1500" data-height="870" -->
 		<div class="panelStyle">
 			<div class="panelTitle">
 				<h2>상품상세</h2>
@@ -42,9 +42,9 @@
 						<col/>
 						<col width="11%"/>
 						<col width="14%"/>
-						<col width="11%"/>
+						<col width="10%"/>
 						<col width="14%"/>
-						<col width="11%"/>
+						<col width="10%"/>
 						<col width="14%"/>
 					</colgroup>
 					<tr>
@@ -90,18 +90,18 @@
 							<div class="panelStyle">
 								<table class="frmStyle">
 									<colgroup>
-										<col width="10%"/>
-										<col width="15%"/>
-										<col width="15%"/>
-										<col width="15%"/>
-										<col width="15%"/>
-										<col width="15%"/>
 										<col/>
+										<col width="12%"/>
+										<col width="17%"/>
+										<col width="12%"/>
+										<col width="17%"/>
+										<col width="12%"/>
+										<col width="17%"/>
 									</colgroup>
 									<tbody>
 									<tr>
 										<td rowspan="4" style="text-align:center">
-										<img id="goodsImgUrl" src="" width="100px"/>
+										<img id="goodsImgUrl" src="" width="130px"/>
 										<input type="hidden" name="sysImgNm" id="sysImgNm" />
 										</td>
 										<th>상품타이틀</th>
@@ -362,11 +362,29 @@
 									</tr>
 									<tr>
 										<th>안전인증번호</th>
-										<td colspan="5">
+										<td>
 											<input type="text" class="w150" id="certNum" name="certNum"  maxlength="20"/>
 											<input type="hidden" id="certNumOrg" name="certNumOrg"/>
 											<button type="button" class="btn btn-success btn-lg" id="btnGoodsSafetyCertNum">안전인증</button>
 										</td>
+										<th>판매기간<em class="required" title="필수"></em></th>
+										<td colspan="3">
+											<input name="sellStYMD" id="sellStYMD" type="text" class="w80 schDate" maxlength="10" required="required" data-valid-name="판매시작일" />
+											<select name="sellStHH" id="sellStHH" 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="sellStdt" id="sellStdt" type="hidden" />
+											~
+											<input name="sellEdYMD" id="sellEdYMD" type="text" class="w80 schDate" maxlength="10" required="required" data-valid-name="판매 종료일" />
+											<select name="sellEdHH" id="sellEdHH" 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="sellEddt" id="sellEddt" type="hidden" />
+										</td>
 									</tr>
 									</tbody>
 								</table>
@@ -971,9 +989,14 @@
 			$('#goodsDetailForm input[name=maxOrdQtyOrg]').val(result.maxOrdQty);
 			$('#goodsDetailForm input[name=dayMaxOrdQty]').val(result.dayMaxOrdQty);
 			$('#goodsDetailForm input[name=dayMaxOrdQtyOrg]').val(result.dayMaxOrdQty);
-			
 			$('#goodsDetailForm input[name=goodsType]').val(result.goodsType);
 			$("#goodsDetailForm").find("#goodsTypeNm").html(result.goodsTypeNm);
+			$('#goodsDetailForm input[name=sellStdt]').val(result.sellStdt);
+			$('#goodsDetailForm input[name=sellStYMD]').val(result.sellStdt.toDate("YYYYMMDDHHmmss").format("YYYY-MM-DD") );
+			$('#goodsDetailForm input[name=sellStHH]').val(result.sellStdt.toDate("YYYYMMDDHHmmss").format("HH") );
+			$('#goodsDetailForm input[name=sellEddt]').val(result.sellEddt);
+			$('#goodsDetailForm input[name=sellEdYMD]').val(result.sellEddt.toDate("YYYYMMDDHHmmss").format("YYYY-MM-DD") );
+			$('#goodsDetailForm input[name=sellEdHH]').val(result.sellEddt.toDate("YYYYMMDDHHmmss").format("HH") );
 			
 			cfnCreateCombo('/renderer/delvFee/list/' + result.supplyCompCd, $('#goodsDetailForm select[name=delvFeeCd]'), "[선택]", result.delvFeeCd);
 			$('#goodsDetailForm input[name=delvFeeCdOrg]').val(result.delvFeeCd);
@@ -1608,6 +1631,26 @@
 			});
 			return false;
 		}
+		
+		if(isNaN(Date.parse($("#goodsDetailForm input[name=sellStYMD]").val()))){
+			mcxDialog.alertC('날짜형식이 아닙니다.', {
+				sureBtnText: "확인",
+				sureBtnClick: function() {
+					$("#goodsDealForm input[name=sellStYMD]").focus();
+				}
+			});	
+			return false;
+		}
+		
+		if(isNaN(Date.parse($("#goodsDetailForm input[name=sellEdYMD]").val()))){
+			mcxDialog.alertC('날짜형식이 아닙니다.', {
+				sureBtnText: "확인",
+				sureBtnClick: function() {
+					$("#goodsDealForm input[name=sellEdYMD]").focus();
+				}
+			});	
+			return false;
+		}
 
 		idx = 0;
 
@@ -1729,8 +1772,6 @@
 			if (addPrice != hidAddPrice){
 				$("#goodsDetailForm input[name=chStockDataYn]").val('Y');
 			}
-			
-			
 
 			idx++;
 		});
@@ -2073,27 +2114,37 @@
 			return true;
 		}
 		// 교환가능여부
-		if ($("#goodsDetailForm input[name=changeableYnOrg]").val() != $("input[name=changeableYn]:checked").val()){
+		if ($("#goodsDetailForm input[name=changeableYnOrg]").val() != $("#goodsDetailForm input[name=changeableYn]:checked").val()){
 			return true;
 		}
 		// 신규가입구매가능여부
-		if ($("#goodsDetailForm input[name=newCustOrdYnOrg]").val() != $("input[name=newCustOrdYn]:checked").val()){
+		if ($("#goodsDetailForm input[name=newCustOrdYnOrg]").val() != $("#goodsDetailForm input[name=newCustOrdYn]:checked").val()){
 			return true;
 		}
 		// 성인용품여부
-		if ($("#goodsDetailForm input[name=adultYnOrg]").val() != $("input[name=adultYn]:checked").val()){
+		if ($("#goodsDetailForm input[name=adultYnOrg]").val() != $("#goodsDetailForm input[name=adultYn]:checked").val()){
 			return true;
 		}
 		// 해외구매대행여부
-		if ($("#goodsDetailForm input[name=foreignBuyYnOrg]").val() != $("input[name=foreignBuyYn]:checked").val()){
+		if ($("#goodsDetailForm input[name=foreignBuyYnOrg]").val() != $("#goodsDetailForm input[name=foreignBuyYn]:checked").val()){
 			return true;
 		}
 		// 병행수입여부
-		if ($("#goodsDetailForm input[name=parallelImportYnOrg]").val() != $("input[name=parallelImportYn]:checked").val()){
+		if ($("#goodsDetailForm input[name=parallelImportYnOrg]").val() != $("#goodsDetailForm input[name=parallelImportYn]:checked").val()){
 			return true;
 		}
 		// 주문제작여부
-		if ($("#goodsDetailForm input[name=orderMadeYnOrg]").val() != $("input[name=orderMadeYn]:checked").val()){
+		if ($("#goodsDetailForm input[name=orderMadeYnOrg]").val() != $("#goodsDetailForm input[name=orderMadeYn]:checked").val()){
+			return true;
+		}
+		// 판매기간 시작일
+		if ($("#goodsDetailForm input[name=sellStdt]").val().toDate("YYYYMMDDHHmmss").format("YYYYMMDDHH") != 
+			($("#goodsDetailForm input[name=sellStYMD]").val().replaceAll('-', '')+ $("#goodsDetailForm select[name=sellStHH]").val())){
+			return true;
+		}
+		// 판매기간 종료일
+		if ($("#goodsDetailForm input[name=sellEddt]").val().toDate("YYYYMMDDHHmmss").format("YYYYMMDDHH") != 
+			($("#goodsDetailForm input[name=sellEdYMD]").val().replaceAll('-', '')+ $("#goodsDetailForm select[name=sellEdHH]").val())){
 			return true;
 		}
 		

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

@@ -57,14 +57,15 @@
 			<col width="10%"/>
 			<col width="15%"/>
 			<col/>
-			<col width="10%"/>
-			<col width="7%"/>
 			<col width="7%"/>
 			<col width="7%"/>
+			<col width="5%"/>
 			<col width="7%"/>
 			<col width="7%"/>
+			<col width="5%"/>
 			<col width="7%"/>
 			<col width="7%"/>
+			<col width="5%"/>
 		</colgroup>
 		<tr th:if="${goods.selfGoodsYn == 'Y' and goods.goodsType == 'G056_N'}">
 			<th colspan="2">WMS재고연동여부<em class="required" title="필수"></em></th>
@@ -73,7 +74,7 @@
 				<label class="rdoBtn"><input type="radio" name="erpStockLinkYn" id="erpStockLinkYnN" value="N" th:checked="${goods.erpStockLinkYn == 'N'}"/>N</label>
 				<input type="hidden" id="erpStockLinkYnOrg" name="erpStockLinkYnOrg" th:value="${goods.erpStockLinkYn}"/>
 			</td>
-			<td colspan="7"></td>
+			<td colspan="8"></td>
 		</tr>
 		<th:block th:if="${goods.selfGoodsYn == 'N' or goods.goodsType != 'G056_N'}">
 			<input type="hidden" id="erpStockLinkYnOrg" name="erpStockLinkYnOrg" th:value="${goods.erpStockLinkYn}"/>
@@ -87,6 +88,7 @@
 			<th>노출순서</th>
 			<th>노출여부</th>
 			<th>가용재고</th>
+			<th>매장재고(자사)</th>
 			<th>안전재고</th>
 			<th>출고대기</th>
 			<th>판매가능재고</th>
@@ -118,6 +120,9 @@
 			<td><input type="text" class="w100p aC" name="editCurrStockQty" th:value="${goodsSize.currStockQty}" maxlength="10" data-valid-type="numeric" th:disabled="${goods.selfGoodsYn == 'Y'}"/>
 				<input type="hidden" name="currStockQty" th:value="${goodsSize.currStockQty}"/>
 			</td>
+			<td><input type="text" class="w100p aC" name="editCurrStockQty" th:value="${goodsSize.storeStockQty}" maxlength="10" data-valid-type="numeric" disabled="disabled"/>
+				<input type="hidden" name="storeStockQty" th:value="${goodsSize.storeStockQty}"/>
+			</td>
 			<td><input type="text" class="w100p aC"  name="baseStockQty" th:value="${goodsSize.baseStockQty}" maxlength="7" data-valid-type="integer">
 				<input type="hidden" name="hidBaseStockQty" th:value="${goodsSize.baseStockQty}"/>
 			</td>

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

@@ -396,6 +396,26 @@
 								<button type="button" class="btn btn-dark btn-sm" onclick="fnChangeGoodsState('newCustOrdYn')" >적용</button>
 							</td>
 						</tr>
+						<tr>
+							<th>선물 주문가능</th>
+							<td colspan="7">
+								<input name="sellStYMD" id="sellStYMD" type="text" class="w80 schDate" maxlength="10" required="required" data-valid-name="판매시작일" />
+								<select name="sellStHH" id="sellStHH" 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)}시|" th:selected="${#numbers.formatInteger(num,2)}==0 ? 'true'">시간</option>
+									</th:block>
+								</select>
+								<input name="sellStdt" id="sellStdt" type="hidden" />
+								~
+								<input name="sellEdYMD" id="sellEdYMD" type="text" class="w80 schDate" maxlength="10" required="required" data-valid-name="판매 종료일" />
+								<select name="sellEdHH" id="sellEdHH" 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="sellEddt" id="sellEddt" type="hidden" />
+								<button type="button" class="btn btn-dark btn-sm" onclick="fnChangeGoodsState('sellDate')" >적용</button>
+							</td>
 					</table>
 				</li>
 			</ul>
@@ -780,6 +800,27 @@
 				});
 				return;
 			}
+		}else if (proc == "sellDate"){
+			if(isNaN(Date.parse($("#searchForm input[name=sellStYMD]").val()))){
+				mcxDialog.alertC('날짜형식이 아닙니다.', {
+					sureBtnText: "확인",
+					sureBtnClick: function() {
+						$("#searchForm input[name=sellStYMD]").focus();
+					}
+				});	
+				return false;
+			}
+			
+			if(isNaN(Date.parse($("#searchForm input[name=sellEdYMD]").val()))){
+				mcxDialog.alertC('날짜형식이 아닙니다.', {
+					sureBtnText: "확인",
+					sureBtnClick: function() {
+						$("#searchForm input[name=sellEdYMD]").focus();
+					}
+				});	
+				return false;
+			}
+
 		}else{
 			if (gagajf.isNull($(objId).val())){
 				mcxDialog.alertC('적용하실 항목을 선택(입력)해주세요.', {
@@ -814,6 +855,8 @@
 		var giftPackYnVal = '';
 		var delvFeeCdVal = '';
 		var newCustOrdYnVal = '';
+		var sellStdtVal = '';
+		var sellEddtVal = '';
 
 		if (proc == "goodsStat") {
 			goodsStatVal = $(objId).val();
@@ -897,6 +940,9 @@
 				return;
 			}
 			delvFeeCdVal = $(objId).val();
+		}else if (proc == "sellDate") {debugger;
+			sellStdtVal = $("#searchForm input[name=sellStYMD]").val().replaceAll('-', '')+ $("#searchForm select[name=sellStHH]").val()+"0000";
+			sellEddtVal = $("#searchForm input[name=sellEdYMD]").val().replaceAll('-', '')+ $("#searchForm select[name=sellEdHH]").val()+"5959";
 		}else{
 			return;
 		}
@@ -927,6 +973,8 @@
 							,giftPackYn : giftPackYnVal
 							,delvFeeCd : delvFeeCdVal
 							,newCustOrdYn : newCustOrdYnVal
+							,sellStdt : sellStdtVal
+							,sellEddt : sellEddtVal
 							,procJob : proc
 							};
 

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

@@ -82,7 +82,7 @@
 							<button type="button" class="sltBtn">[전체]</button>
 							<ul style="overflow:auto; height:170px;">
 								<li><label class="chkBox"><input type="checkbox" name="전체선택" id="multiItemkindCd" onclick="uifnAllCheck('multiItemkindCd')">전체선택</label></li>
-								<li th:if="${itemkindList}" th:each="oneData, status : ${itemkindList}"><label class="chkBox"><input type="checkbox" name="multiItemkindCd" th:id="${'itemkindCd' + oneData.cd}" th:value="${oneData.cd}" ><th:block th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></th:block></label></li>
+								<li th:if="${itemkindList}" th:each="oneData, status : ${itemkindList}"><label class="chkBox"><input type="checkbox" name="multiItemkindCd" th:id="${'pitemkindCd' + oneData.cd}" th:value="${oneData.cd}" ><th:block th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></th:block></label></li>
 							</ul>
 						</div>
 					</td>
@@ -91,8 +91,8 @@
 						<div class="multiCheckBox"  style="width:200px">
 							<button type="button" class="sltBtn">[전체]</button>
 							<ul style="overflow:auto; height:170px">
-								<li><label class="chkBox"><input type="checkbox" name="전체선택" id="multiGoodsStat" onclick="uifnAllCheck('multiGoodsStat')">전체선택</label></li>
-								<li th:if="${goodsStatList}" th:each="oneData, status : ${goodsStatList}"><label class="chkBox"><input type="checkbox" name="multiGoodsStat" th:id="${'goodsStat' + oneData.cd}" th:value="${oneData.cd}" ><th:block th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></th:block></label></li>
+								<li><label class="chkBox" onclick="uifnAllCheck('multiGoodsStat')"><input type="checkbox" name="전체선택" id="multiGoodsStat" >전체선택</label></li>
+								<li th:if="${goodsStatList}" th:each="oneData, status : ${goodsStatList}"><label class="chkBox"><input type="checkbox" name="multiGoodsStat" th:id="${'pgoodsStat' + oneData.cd}" th:value="${oneData.cd}" ><th:block th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></th:block></label></li>
 							</ul>
 						</div>
 					</td>
@@ -120,14 +120,14 @@
 							<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>
+								<li th:if="${styleYearList}" th:each="oneData, status : ${styleYearList}"><label class="chkBox"><input type="checkbox" name="multiStyleYear" th:id="${'pstyleYear' + 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>
+								<li th:if="${seasonList}" th:each="oneData, status : ${seasonList}"><label class="chkBox"><input type="checkbox" name="multiSeasonCd" th:id="${'pseasonCd' + oneData.cd}" th:value="${oneData.cd}" ><th:block th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></th:block></label></li>
 							</ul>
 						</div>
 					</td>