상품관리화면 멀티 조회 처리

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

@@ -533,12 +533,6 @@ public class TsaGoodsController extends TsaBaseController {
 		// multi row 검색관련 처리
 		if (!StringUtils.isBlank(goodsSearch.getCondition())) {
 			goodsSearch.setConditionList(goodsSearch.getCondition().replaceAll("\r", "").trim().split("\n"));
-
-			if ("searchExtendGoodsCd".equals(goodsSearch.getSearch())) {
-				goodsSearch.setSearchGb("EXTEND");
-			} else if ("searchMasterGoodsCd".equals(goodsSearch.getSearch())) {
-				goodsSearch.setSearchGb("MASTER");
-			}
 		}
 		if (!StringUtils.isBlank(goodsSearch.getBrandList())) {
 			try {
@@ -609,11 +603,6 @@ public class TsaGoodsController extends TsaBaseController {
 		if (!StringUtils.isBlank(goodsSearch.getCondition())) {
 			goodsSearch.setConditionList(goodsSearch.getCondition().replaceAll("\r", "").trim().split("\n"));
 
-			if ("searchExtendGoodsCd".equals(goodsSearch.getSearch())) {
-				goodsSearch.setSearchGb("EXTEND");
-			} else if ("searchMasterGoodsCd".equals(goodsSearch.getSearch())) {
-				goodsSearch.setSearchGb("MASTER");
-			}
 		}
 
 		if (!StringUtils.isBlank(goodsSearch.getBrandList())) {
@@ -2037,11 +2026,6 @@ public class TsaGoodsController extends TsaBaseController {
 		if (!StringUtils.isBlank(goodsSearch.getCondition())) {
 			goodsSearch.setConditionList(goodsSearch.getCondition().replaceAll("\r", "").trim().split("\n"));
 
-			if ("searchExtendGoodsCd".equals(goodsSearch.getSearch())) {
-				goodsSearch.setSearchGb("EXTEND");
-			} else if ("searchMasterGoodsCd".equals(goodsSearch.getSearch())) {
-				goodsSearch.setSearchGb("MASTER");
-			}
 		}
 		goodsSearch.setPageable(new TscPageRequest(goodsSearch.getPageNo() - 1, goodsSearch.getPageSize()));
 		goodsSearch.getPageable().setTotalCount(goodsService.getReinboundInformCount(goodsSearch));
@@ -2176,11 +2160,6 @@ public class TsaGoodsController extends TsaBaseController {
 		if (!StringUtils.isBlank(goodsSearch.getCondition())) {
 			goodsSearch.setConditionList(goodsSearch.getCondition().replaceAll("\r", "").trim().split("\n"));
 
-			if ("searchExtendGoodsCd".equals(goodsSearch.getSearch())) {
-				goodsSearch.setSearchGb("EXTEND");
-			} else if ("searchMasterGoodsCd".equals(goodsSearch.getSearch())) {
-				goodsSearch.setSearchGb("MASTER");
-			}
 		}
 
 		goodsSearch.setRegNo(TsaSession.getInfo().getUserNo()); // 엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
@@ -2280,6 +2259,25 @@ public class TsaGoodsController extends TsaBaseController {
 		if (!StringUtils.isBlank(goodsSearch.getCondition())) {
 			goodsSearch.setConditionList(goodsSearch.getCondition().replaceAll("\r", "").trim().split("\n"));
 		}
+		if (!StringUtils.isBlank(goodsSearch.getBrandList())) {
+			try {
+				String[] arrBrandCd = mapper.readValue(goodsSearch.getBrandList(), String[].class);
+				goodsSearch.setMultiBrand(arrBrandCd);
+			} catch (Exception e) {
+				e.printStackTrace();
+				throw new IllegalStateException("브랜드코드 검색중 오류로 인해 조회되지 않았습니다.");
+			}
+		}
+
+		if (!StringUtils.isBlank(goodsSearch.getSupplyCompList())) {
+			try {
+				String[] arrSupplyComp = mapper.readValue(goodsSearch.getSupplyCompList(), String[].class);
+				goodsSearch.setMultiSupplyCompCd(arrSupplyComp);
+			} catch (Exception e) {
+				e.printStackTrace();
+				throw new IllegalStateException("업체코드 검색중 오류로 인해 조회되지 않았습니다.");
+			}
+		}
 
 		return goodsService.getNoticeList(goodsSearch);
 	}
@@ -2403,11 +2401,6 @@ public class TsaGoodsController extends TsaBaseController {
 		if (!StringUtils.isBlank(goodsSearch.getCondition())) {
 			goodsSearch.setConditionList(goodsSearch.getCondition().replaceAll("\r", "").trim().split("\n"));
 
-			if ("searchExtendGoodsCd".equals(goodsSearch.getSearch())) {
-				goodsSearch.setSearchGb("EXTEND");
-			} else if ("searchMasterGoodsCd".equals(goodsSearch.getSearch())) {
-				goodsSearch.setSearchGb("MASTER");
-			}
 		}
 		if (!StringUtils.isBlank(goodsSearch.getBrandList())) {
 			try {
@@ -2509,12 +2502,6 @@ public class TsaGoodsController extends TsaBaseController {
 		// multi row 검색관련 처리
 		if (!StringUtils.isBlank(goodsSearch.getCondition())) {
 			goodsSearch.setConditionList(goodsSearch.getCondition().replaceAll("\r", "").trim().split("\n"));
-
-			if ("searchExtendGoodsCd".equals(goodsSearch.getSearch())) {
-				goodsSearch.setSearchGb("EXTEND");
-			} else if ("searchMasterGoodsCd".equals(goodsSearch.getSearch())) {
-				goodsSearch.setSearchGb("MASTER");
-			}
 		}
 
 		if (!StringUtils.isBlank(goodsSearch.getBrandList())) {
@@ -2679,10 +2666,25 @@ public class TsaGoodsController extends TsaBaseController {
 		if (!StringUtils.isBlank(goodsSearch.getCondition())) {
 			goodsSearch.setConditionList(goodsSearch.getCondition().replaceAll("\r", "").trim().split("\n"));
 
-			if ("searchExtendGoodsCd".equals(goodsSearch.getSearch())) {
-				goodsSearch.setSearchGb("EXTEND");
-			} else if ("searchMasterGoodsCd".equals(goodsSearch.getSearch())) {
-				goodsSearch.setSearchGb("MASTER");
+		}
+
+		if (!StringUtils.isBlank(goodsSearch.getBrandList())) {
+			try {
+				String[] arrBrandCd = mapper.readValue(goodsSearch.getBrandList(), String[].class);
+				goodsSearch.setMultiBrand(arrBrandCd);
+			} catch (Exception e) {
+				e.printStackTrace();
+				throw new IllegalStateException("브랜드코드 검색중 오류로 인해 조회되지 않았습니다.");
+			}
+		}
+
+		if (!StringUtils.isBlank(goodsSearch.getSupplyCompList())) {
+			try {
+				String[] arrSupplyComp = mapper.readValue(goodsSearch.getSupplyCompList(), String[].class);
+				goodsSearch.setMultiSupplyCompCd(arrSupplyComp);
+			} catch (Exception e) {
+				e.printStackTrace();
+				throw new IllegalStateException("업체코드 검색중 오류로 인해 조회되지 않았습니다.");
 			}
 		}
 
@@ -2731,11 +2733,6 @@ public class TsaGoodsController extends TsaBaseController {
 		if (!StringUtils.isBlank(goodsSearch.getCondition())) {
 			goodsSearch.setConditionList(goodsSearch.getCondition().replaceAll("\r", "").trim().split("\n"));
 
-			if ("searchExtendGoodsCd".equals(goodsSearch.getSearch())) {
-				goodsSearch.setSearchGb("EXTEND");
-			} else if ("searchMasterGoodsCd".equals(goodsSearch.getSearch())) {
-				goodsSearch.setSearchGb("MASTER");
-			}
 		}
 
 		log.info("[goodsSearch] ={}", goodsSearch);
@@ -2777,6 +2774,13 @@ public class TsaGoodsController extends TsaBaseController {
 	@PostMapping("/ad/keyword/list")
 	@ResponseBody
 	public Collection<AdKeyword> getAdKeywordList(@RequestBody AdKeyword adKeyword) {
+
+		// multi row 검색관련 처리
+		if (!StringUtils.isBlank(adKeyword.getCondition())) {
+			adKeyword.setConditionList(adKeyword.getCondition().replaceAll("\r", "").trim().split("\n"));
+
+		}
+
 		return goodsService.getAdKeywordList(adKeyword);
 	}
 

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

@@ -63,7 +63,7 @@ public class TsaStockController extends TsaBaseController {
 
 	@Autowired
 	private ObjectMapper mapper;
-	
+
 	private static final int EXCEL_ROW_COUNT = 500;
 
 	/**
@@ -94,7 +94,7 @@ public class TsaStockController extends TsaBaseController {
 		mav.addObject("seasonList", rendererService.getAvailCommonCodeList("G006"));
 		// 년도
 		int toYear = Integer.parseInt(GagaDateUtil.getToday("yyyy")) - 4;
-		mav.addObject("styleYearList", rendererService.getYearList(toYear,0,5));
+		mav.addObject("styleYearList", rendererService.getYearList(toYear, 0, 5));
 		// 사용여부
 		mav.addObject("useYnList", rendererService.getAvailCommonCodeList("G002"));
 		// 품목
@@ -135,7 +135,7 @@ public class TsaStockController extends TsaBaseController {
 		// multi row 검색관련 처리
 		if (!StringUtils.isBlank(goodsSearch.getBrandList())) {
 			try {
-				String [] arrBrandCd = mapper.readValue(goodsSearch.getBrandList(), String[].class);
+				String[] arrBrandCd = mapper.readValue(goodsSearch.getBrandList(), String[].class);
 				goodsSearch.setMultiBrand(arrBrandCd);
 			} catch (Exception e) {
 				e.printStackTrace();
@@ -145,14 +145,24 @@ public class TsaStockController extends TsaBaseController {
 
 		if (!StringUtils.isBlank(goodsSearch.getSupplyCompList())) {
 			try {
-				String [] arrSupplyComp = mapper.readValue(goodsSearch.getSupplyCompList(), String[].class);
+				String[] arrSupplyComp = mapper.readValue(goodsSearch.getSupplyCompList(), String[].class);
 				goodsSearch.setMultiSupplyCompCd(arrSupplyComp);
 			} catch (Exception e) {
 				e.printStackTrace();
 				throw new IllegalStateException(message.getMessage("업체코드 검색중 오류로 인해 조회되지 않았습니다."));
 			}
 		}
-		
+
+		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);
 		goodsSearch.setRegNo(TsaSession.getInfo().getUserNo());	//엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
 		goodsSearch.setPageable(new TscPageRequest(goodsSearch.getPageNo() - 1, goodsSearch.getPageSize()));
@@ -190,7 +200,7 @@ public class TsaStockController extends TsaBaseController {
 		// multi row 검색관련 처리
 		if (!StringUtils.isBlank(goodsSearch.getBrandList())) {
 			try {
-				String [] arrBrandCd = mapper.readValue(goodsSearch.getBrandList(), String[].class);
+				String[] arrBrandCd = mapper.readValue(goodsSearch.getBrandList(), String[].class);
 				goodsSearch.setMultiBrand(arrBrandCd);
 			} catch (Exception e) {
 				e.printStackTrace();
@@ -200,7 +210,7 @@ public class TsaStockController extends TsaBaseController {
 
 		if (!StringUtils.isBlank(goodsSearch.getSupplyCompList())) {
 			try {
-				String [] arrSupplyComp = mapper.readValue(goodsSearch.getSupplyCompList(), String[].class);
+				String[] arrSupplyComp = mapper.readValue(goodsSearch.getSupplyCompList(), String[].class);
 				goodsSearch.setMultiSupplyCompCd(arrSupplyComp);
 			} catch (Exception e) {
 				e.printStackTrace();
@@ -210,7 +220,7 @@ public class TsaStockController extends TsaBaseController {
 		goodsSearch.setRegNo(TsaSession.getInfo().getUserNo());	//엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
 		goodsSearch.setPageable(new TscPageRequest(goodsSearch.getPageNo() - 1, goodsSearch.getPageSize()));
 		goodsSearch.getPageable().setTotalCount(stockService.getGoodsSizeStockCount(goodsSearch));
-		
+
 		// 대용량엑셀파일다운로드는 이런 식으로 ...
 		stockService.getGoodsSizeStockExcelList(goodsSearch, excelFilenameWithPath);
 
@@ -234,17 +244,17 @@ public class TsaStockController extends TsaBaseController {
 
 		String targetPath = GagaFileUtil.getConcatenationPath(env.getProperty("upload.excel.target.path"), "excel");
 		// DB 처리 시 사용되는 파라미터명(셀명) 설정
-		String[] cellName = { "brandEnm", "goodsNm", "itemkindCd","goodsStat","goodsCd", "optCd", "optCd1", "optCd2",  "soldoutYn",
-								"currStockQty", "baseStockQty","saleStockQty", "ableStockQty"};
+		String[] cellName = {"brandEnm", "goodsNm", "itemkindCd", "goodsStat", "goodsCd", "optCd", "optCd1", "optCd2", "soldoutYn",
+			"currStockQty", "baseStockQty", "saleStockQty", "ableStockQty"};
 		//log.info("[saveGoodsSizeSoldoutExcelupload]targetPath = >{}", targetPath);
 		//log.info("[saveGoodsSizeSoldoutExcelupload]getExcelFileNm = >{}", GagaFileUtil.getConcatenationPath(targetPath, goods.getExcelFileNm()));
 		Collection<GagaMap> ecxelGoodsList = GagaExcelUtil.getList(GagaFileUtil.getConcatenationPath(targetPath, goods.getExcelFileNm()), 0, cellName, 0);
 
 		//건수
 		if (ecxelGoodsList != null && ecxelGoodsList.size() > EXCEL_ROW_COUNT) {
-			throw new IllegalStateException("엑셀 파일의 건수를 " +EXCEL_ROW_COUNT + "건 이하로 사용하세요.");
+			throw new IllegalStateException("엑셀 파일의 건수를 " + EXCEL_ROW_COUNT + "건 이하로 사용하세요.");
 		}
-		
+
 		Collection<Option> goodsSizeList = new ArrayList<>();
 		for (GagaMap map : ecxelGoodsList) {
 			Option tmpGoods = mapper.convertValue(map, Option.class);

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

@@ -2,6 +2,7 @@ package com.style24.persistence.domain;
 
 import java.util.Collection;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.style24.persistence.TscBaseDomain;
 
 import lombok.Data;
@@ -26,6 +27,10 @@ public class AdKeyword extends TscBaseDomain {
 	private String stDate;
 	private String edDate;
 
+	private String condition; // 키워드 종류별 값
+	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+	private String[] conditionList;
+
 	private String goodsList;
 	private Collection<AdKeywordGoods> goodsListNew;
 }

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

@@ -2636,18 +2636,35 @@
 		                                            )
 		                                      )
 		                   )
+		                   
 		</if>
-		<if test="supplyCompCd != null and supplyCompCd  != ''">
+		<if test="multiSupplyCompCd != null and multiSupplyCompCd != ''">
 		AND A.NOTICE_SQ IN (
 		                    SELECT NOTICE_SQ
 		                    FROM TB_NOTICE_GOODS
 		                    WHERE GOODS_CD IN (
 		                                       SELECT GOODS_CD 
 		                                       FROM TB_GOODS 
-		                                       WHERE SUPPLY_COMP_CD = #{supplyCompCd}
-		                                       <if test="brandCd != null and brandCd  != ''">
-		                                       AND BRAND_CD = #{brandCd} 
-		                                       </if>
+		                                       WHERE 1 = 1
+		                                       AND SUPPLY_COMP_CD IN
+		                                       <foreach collection="multiSupplyCompCd" item="item" index="index"  open="(" close=")" separator=",">
+		                                       #{item}
+		                                       </foreach>
+		                                      )
+		                   )
+		</if>
+		<if test="multiBrand != null and multiBrand != ''">
+		AND A.NOTICE_SQ IN (
+		                    SELECT NOTICE_SQ
+		                    FROM TB_NOTICE_GOODS
+		                    WHERE GOODS_CD IN (
+		                                       SELECT GOODS_CD 
+		                                       FROM TB_GOODS 
+		                                       WHERE 1 = 1
+		                                       AND BRAND_CD IN
+		                                       <foreach collection="multiBrand" item="item" index="index"  open="(" close=")" separator=",">
+		                                       #{item}
+		                                       </foreach>
 		                                      )
 		                   )
 		</if>
@@ -3324,13 +3341,6 @@
 		                   )
 		        </if>
 		        WHERE 1=1
-		        <if test="mdNo != null and mdNo != ''">
-		        AND G.BRAND_CD IN (
-		                           SELECT DISTINCT BRAND_CD
-		                           FROM TB_BRAND_MD
-		                           WHERE MD_NO = CAST(#{mdNo} AS UNSIGNED)
-		                          )
-		        </if>
 		        <if test="searchGb == null or searchGb =='BASIC' " >
 		        <include refid="getGoodsListCondition_sql"/>
 		        ORDER BY GE.REQ_YMD, G.GOODS_CD
@@ -3542,12 +3552,15 @@
 		<if test="adKeyword != null and adKeyword !=''">
 		AND LOWER(A.AD_KEYWORD) LIKE CONCAT(LOWER(#{adKeyword}),'%')
 		</if>
-		<if test='goodsCd != null and goodsCd != "" '>
+		<if test='conditionList != null and conditionList.length>0'>
 		AND A.AD_KEYWORD_SQ IN (
-		                    SELECT AD_KEYWORD_SQ
-		                    FROM TB_AD_KEYWORD_GOODS
-		                    WHERE GOODS_CD = #{goodsCd}
-		                        )
+		                        SELECT AD_KEYWORD_SQ
+		                        FROM TB_AD_KEYWORD_GOODS
+		                        WHERE GOODS_CD IN
+		                           <foreach collection="conditionList" item="item" index="index"  open="(" close=")" separator=",">
+		                       #{item}
+		                           </foreach>
+		                       )
 		</if>
 		ORDER  BY A.AD_KEYWORD_SQ DESC
 	</select>
@@ -3899,6 +3912,7 @@
 		     , DATE_FORMAT(G.UPD_DT,'%Y%m%d%H%i%S') AS UPD_DT
 		FROM TB_FREE_GOODS G
 		INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD 
+		INNER JOIN TB_BRAND_SUPPLY BS ON G.BRAND_CD = BS.BRAND_CD
 		WHERE 1 = 1
 		<if test='conditionList != null and conditionList.length>0'>
 		    <choose>
@@ -3921,8 +3935,8 @@
 		      </otherwise>
 		    </choose>
 		</if>
-		<if test="brandCd != null and brandCd != ''">
-		AND B.BRAND_CD = #{brandCd}
+		<if test="supplyCompCd != null and supplyCompCd != ''">
+		AND BS.SUPPLY_COMP_CD = #{supplyCompCd}
 		</if>
 		<if test="multiBrand != null and multiBrand != ''">
 		AND B.BRAND_CD IN

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

@@ -34,13 +34,14 @@
 			<!-- //TITLE -->
 			<form id="searchForm" name="searchForm" action="#" th:action="@{'/goods/ad/keyword/list'}" >
 				<input type="hidden" id="searchGb" name="searchGb" />
+				<input type="hidden" id="search" name="search" value="searchGoodsCd"/>
 			<div class="panelContent">	
 				<table class="frmStyle" aria-describedby="검색조건">
 					<colgroup>
 						<col width="10%"/>
 						<col width="30%"/>
 						<col width="10%"/>
-						<col width="20%"/>
+						<col width="30%"/>
 						<col width="10%"/>
 						<col/>
 					</colgroup>
@@ -49,10 +50,6 @@
 						<td>
 							<input type="text" class="w200" name="adKeyword" id="adKeyword" maxlength="20"/>
 						</td>
-						<th>상품코드</th>
-						<td>
-							<input type="text" class="w200" name="goodsCd" id="goodsCd" maxlength="20"/>
-						</td>
 						<th>사용여부</th>
 						<td>
 							<select name="useYn">
@@ -61,10 +58,14 @@
 								<option value="N">[N] No</option>
 							</select>
 						</td>
+						<th rowspan="2">상품코드</th>
+						<td rowspan="2">
+							<textarea class="textareaR2 w150" name="condition" id="condition"></textarea>
+						</td>
 					</tr>
 					<tr>
 						<th>기간</th>
-						<td colspan="5" id="sellTerms">
+						<td colspan="3" id="sellTerms">
 						</td>
 					</tr>
 				</table>
@@ -244,16 +245,22 @@
 		var searchFlag = false;
 		var cnt = 0;
 
-		for (i = 0; i < form.elements.length; i++ ) {
-			var el = form.elements[i];
-
-			if ($(el).prop("type") == "text" || ($(el).prop("type") == "select-one" && el.name != "search" && el.name != "pageSize")) {
-				if (!(el.value == null || el.value == "")) {
-					cnt++;
+		if( !gagajf.isNull($("#searchForm textarea[name=condition]").val())
+			|| (!gagajf.isNull($("#searchForm input[name=stDate]").val()) && !gagajf.isNull($("#searchForm input[name=edDate]").val()))
+			){
+			searchFlag = true;
+		}else{
+			for (i = 0; i < form.elements.length; i++ ) {
+				var el = form.elements[i];
+	
+				if ($(el).prop("type") == "text" || ($(el).prop("type") == "select-one" && el.name != "search" && el.name != "pageSize")) {
+					if (!(el.value == null || el.value == "")) {
+						cnt++;
+					}
 				}
 			}
 		}
-			
+		
 		if(cnt > 0) searchFlag = true;
 
 		if(searchFlag == false){

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

@@ -34,13 +34,11 @@
 			<div class="panelContent">
 				<table class="frmStyle">
 					<colgroup>
-						<col width="8%"/>
-						<col width="17%"/>
-						<col width="8%"/>
-						<col width="17%"/>
-						<col width="8%"/>
-						<col width="17%"/>
-						<col width="8%"/>
+						<col width="10%"/>
+						<col width="23%"/>
+						<col width="10%"/>
+						<col width="23%"/>
+						<col width="10%"/>
 						<col />
 					</colgroup>
 					<tr>
@@ -59,18 +57,20 @@
 							<span id="brandText"></span>
 							<input type="hidden" name="brandList"/>
 						</td>
-						<th>키워드</th>
-						<td>
+						<th rowspan="2">키워드</th>
+						<td rowspan="2">
 							<select name="search" id="search">
 								<option value="searchGoodsCd">상품코드</option>
 								<option value="searchGoodsNm">상품명</option>
 								<option value="searchGoodsNum">품번</option>
 								<option value="searchSupplyGoodsCd">업체상품코드</option>
 							</select>
-							<input type="text" class="w50p" name="condition" id="condition" maxlength="50"/>
+							<textarea class="textareaR2 w50p" name="condition" id="condition"></textarea>
 						</td>
+					</tr>
+					<tr>	
 						<th>시즌/년도</th>
-						<td>
+						<td colspan="3">
 							<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>
@@ -83,7 +83,7 @@
 					</tr>
 					<tr>
 						<th>비노출예약일</th>
-						<td colspan="7" id="sellTerms"></td>
+						<td colspan="5" id="sellTerms"></td>
 					</tr>
 				</table>
 				<ul class="panelBar">
@@ -256,6 +256,7 @@
 
 		if( !gagajf.isNull($("#goodsEpSkipListForm input[name=supplyCompList]").val())
 				|| !gagajf.isNull($("#goodsEpSkipListForm input[name=brandList]").val())
+				|| !gagajf.isNull($("#goodsEpSkipListForm textarea[name=condition]").val())
 			){
 			searchFlag = true;
 		}else{

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

@@ -30,7 +30,7 @@
 		<div class="panelStyle" >
 			<!-- TITLE -->
 			<div class="panelTitle">
-				<h3><i class="fa fa-info-circle"></i>아래 검색조건 중 하나를 꼭 입력해 주세요.</h3>
+				<!-- <h3><i class="fa fa-info-circle"></i>아래 검색조건 중 하나를 꼭 입력해 주세요.</h3> -->
 				<span class="panelControl">
 					<i class="fa fa-chevron-up"></i>
 				</span>
@@ -40,32 +40,35 @@
 				<table class="frmStyle">
 					<colgroup>
 						<col width="10%"/>
-						<col width="40%"/>
+						<col width="23%"/>
+						<col width="10%"/>
+						<col width="23%"/>
 						<col width="10%"/>
 						<col/>
 					</colgroup>
 					<tr>
+						<th>업체</th>
+						<td>
+							<input type="text" class="w100" name="supplyCompSearchTxt" id="supplyCompSearchTxt" maxlength="20" />
+							<button type="button" class="btn icn" id="btnSearchSupplyComp"><i class="fa fa-search"></i></button>
+							<span id="supplyCompText"></span>
+							<input type="hidden" name="supplyCompList"/>
+						</td>
 						<th>브랜드</th>
 						<td>
-							<select name="supplyCompCd" id="supplyCompCd">
-								<option value="" th:if="${sessionInfo.roleCd} != 'G001_B000'">[전체]</option>
-								<option th:if="${supplyCompList}" th:each="oneData, status : ${supplyCompList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
-							</select>
-							<select name="brandCd" id="brandCd">
-								<option value="">[전체]</option>
-							</select>
+							<input type="text" class="w100" name="searchTxt" id="searchTxt" maxlength="20" />
+							<button type="button" class="btn icn" id="btnSearchBrand"><i class="fa fa-search"></i></button>
+							<span id="brandText"></span>
+							<input type="hidden" name="brandList"/>
 						</td>
-						<th rowspan="3">키워드</th>
-						<td rowspan="3">
-							<!-- <select name="search" id="search">
-								<option value="searchGoodsCd">상품코드</option>
-							</select> -->
-							<textarea class="textareaR3 w150" name="condition" id="condition"></textarea>
+						<th rowspan="2">상품코드</th>
+						<td rowspan="2">
+							<textarea class="textareaR2 w150" name="condition" id="condition"></textarea>
 						</td>
 					</tr>
 					<tr>
-						<th rowspan="2">년도/시즌</th>
-						<td rowspan="2">
+						<th>년도/시즌</th>
+						<td colspan="3">
 							<div class="multiCheckBox" style="width:140px;">
 							<button type="button" class="sltBtn" data-name="[전체]">[전체]</button>
 								<ul style="overflow:auto; height:140px" id="grpStyle">
@@ -197,7 +200,7 @@
 	// Row Click
 	gridOptions.onCellClicked = function(event) {
 		var goodsCd = event.data.goodsCd;
-		if (event.colDef.field == "goodsCd"){
+		if (event.colDef.field == "goodsNm"){
 			cfnOpenGoodsDetailPopup('U',goodsCd);
 			//cfnOpenFrontGoodsPopup(goodsCd, event.data.siteCd);
 		}else if (event.colDef.field == "mallLink"){
@@ -216,6 +219,11 @@
 		$("#searchForm input[type=checkbox]").parent("label").removeClass("checked");
 		$("#searchForm input[type=radio][checked]").parent("label").addClass("checked");
 		
+		$('#searchForm input[name=brandList]').val('');
+		$('#searchForm').find('#brandText').html('');
+		$('#searchForm input[name=supplyCompList]').val('');
+		$('#searchForm').find('#supplyCompText').html('');
+		
 		$(document).find('#searchForm').find(".multiCheckBox").each(function(i, e){
 			let btnNm = $(this).find(".sltBtn").attr("data-name");
 			$(this).find(".sltBtn").text(btnNm);
@@ -254,15 +262,23 @@
 		var searchFlag = false;
 		var cnt = 0;
 
-		for (i = 0; i < form.elements.length; i++ ) {
-			var el = form.elements[i];
-
-			if ($(el).prop("type") == "text"  || $(el).prop("type") == "textarea"  || ($(el).prop("type") == "select-one" && el.name != "search" && el.name != "pageSize")) {
-				if (!(el.value == null || el.value == "")) {
-					cnt++;
+		if( !gagajf.isNull($("#searchForm input[name=supplyCompList]").val()) 
+				|| !gagajf.isNull($("#searchForm textarea[name=condition]").val())
+				|| (!gagajf.isNull($("#searchForm input[name=stDate]").val()) && !gagajf.isNull($("#searchForm input[name=edDate]").val()))
+				|| !gagajf.isNull($("#searchForm input[name=brandList]").val())
+			){
+			searchFlag = true;
+		}else{
+			for (i = 0; i < form.elements.length; i++ ) {
+				var el = form.elements[i];
+	
+				if ($(el).prop("type") == "text"  || $(el).prop("type") == "textarea"  || ($(el).prop("type") == "select-one" && el.name != "search" && el.name != "pageSize")) {
+					if (!(el.value == null || el.value == "")) {
+						cnt++;
+					}
 				}
 			}
-		}
+		}	
 		
 		var mulYearSize = $('input:checkbox[name="multiStyleYear"]:checked').length;
 		var mulSeasonSize = $('input:checkbox[name="multiSeasonCd"]:checked').length;
@@ -281,6 +297,66 @@
 		return true;
 	}
 
+	// 업체 조회 선택시
+	$('#btnSearchSupplyComp').on('click', function() {
+		cfnOpenCompanyListPopup('fnSetSupplyCompInfo', 'M');
+	});
+	
+	// 업체 조회 팝업에서 호출
+	var fnSetSupplyCompInfo = function(result) {
+		var arrSupplyComp = [];
+		var supplyCompText = "";
+		var sIndex = 0;
+		$('#searchForm').find('#supplyCompText').html('');
+		$('#searchForm input[name=supplyCompSearchTxt]').val('');
+		result.forEach(function(supplyComp){
+			sIndex++; 
+			arrSupplyComp.push(supplyComp.supplyCompCd);
+		});
+
+		// 조회값이 하나일 경우 화면에 코드 노출 그외는 갯수 처리 
+		if (sIndex == 1) {
+			$('#searchForm input[name=supplyCompSearchTxt]').val(arrSupplyComp[0]);
+		}else{
+			supplyCompText = sIndex + " 개";
+			$('#searchForm').find('#supplyCompText').html(supplyCompText);	
+		}
+		var jsonData = JSON.stringify(arrSupplyComp);
+		$("#searchForm input[name=supplyCompList]").val(jsonData);
+	}
+	
+	// 브랜드 조회 팝업에서 호출
+	var fnSetBrandInfo = function(result) {
+		var arrbrandCd = [];
+		var brandText = "";
+		var bIndex = 0;
+		$('#searchForm').find('#brandText').html('');
+		$('#searchForm input[name=searchTxt]').val('');
+		result.forEach(function(brand){
+			bIndex++; 
+			arrbrandCd.push(brand.brandCd);
+		});
+
+		// 조회값이 하나일 경우 화면에 코드 노출 그외는 갯수 처리 
+		if (bIndex == 1) {
+			$('#searchForm input[name=searchTxt]').val(arrbrandCd[0]);
+		}else{
+			brandText = bIndex + " 개";
+			$('#searchForm').find('#brandText').html(brandText);	
+		}
+		var jsonData = JSON.stringify(arrbrandCd);
+		$("#searchForm input[name=brandList]").val(jsonData);
+	}
+	
+	// 브랜드 조회 선택시
+	$('#btnSearchBrand').on('click', function() {
+		/* if (gagajf.isNull($("#searchForm input[name=searchTxt]").val())){
+			mcxDialog.alert('브랜드 검색어를 입력하세요.');
+			return false;
+		} */
+		cfnOpenBrandListPopup('fnSetBrandInfo', 'M');
+	});
+	
 	//엑셀다운로드
 	var fnGoodsExcelDownLoad = function(flag){
 		var formId = '#searchForm';

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

@@ -39,30 +39,36 @@
 				<table class="frmStyle" aria-describedby="검색조건">
 					<colgroup>
 						<col width="10%"/>
-						<col width="40%"/>
+						<col width="23%"/>
+						<col width="10%"/>
+						<col width="23%"/>
 						<col width="10%"/>
 						<col/>
 					</colgroup>
 					<tr>
-						<th>업체/브랜드</th>
+						<th>업체</th>
 						<td>
-							<select name="supplyCompCd" id="supplyCompCd">
-								<option value="" th:if="${sessionInfo.roleCd} != 'B000'">[전체]</option>
-								<option th:if="${supplyCompList}" th:each="oneData, status : ${supplyCompList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
-							</select>
-							<select name="brandCd" id="brandCd">
-								<option value="">[전체]</option>
-							</select>
+							<input type="text" class="w100" name="supplyCompSearchTxt" id="supplyCompSearchTxt" maxlength="20" />
+							<button type="button" class="btn icn" id="btnSearchSupplyComp"><i class="fa fa-search"></i></button>
+							<span id="supplyCompText"></span>
+							<input type="hidden" name="supplyCompList"/>
 						</td>
-						<th>키워드</th>
+						<th>브랜드</th>
 						<td>
+							<input type="text" class="w100" name="searchTxt" id="searchTxt" maxlength="20" />
+							<button type="button" class="btn icn" id="btnSearchBrand"><i class="fa fa-search"></i></button>
+							<span id="brandText"></span>
+							<input type="hidden" name="brandList"/>
+						</td>
+						<th rowspan="2">키워드</th>
+						<td rowspan="2">
 							<select name="search" id="search">
 								<option value="searchGoodsCd">상품코드</option>
 								<option value="searchGoodsNm">상품명</option>
 								<option value="searchGoodsNum">품번</option>
 								<option value="searchSupplyGoodsCd">업체상품코드</option>
 							</select>
-							<input type="text" class="w50p" name="condition" id="condition" maxlength="50"/>
+							<textarea class="textareaR2 w50p" name="condition" id="condition"></textarea>
 						</td>
 					</tr>
 					<tr>
@@ -81,13 +87,13 @@
 					</tr>
 					<tr>
 						<th>공지기간</th>
-						<td colspan="3" id="sellTerms">
+						<td colspan="5" id="sellTerms">
 						</td>
 					</tr>
 				</table>
 				<ul class="panelBar">
 					<li class="center">
-						<button type="button" class="btn btn-gray btn-lg" onclick="$('#searchForm')[0].reset();">초기화</button>
+						<button type="button" class="btn btn-gray btn-lg" id="btnInit">초기화</button>
 						<button type="button" class="btn btn-base btn-lg" id="btnSearch">조회</button>
 					</li>
 				</ul>
@@ -251,6 +257,28 @@
 		fnGetNoticeGoodsList(event.data.noticeSq);
 	}
 
+	// 초기화 클릭시
+	$('#btnInit').on('click', function() {
+
+		$('#searchForm')[0].reset();
+		//$("#searchForm input[type=radio]").removeClass("checked");
+		$("#searchForm input[type=checkbox]").removeClass("checked");
+		//$("#searchForm input[type=radio]").parent("label").removeClass("checked");
+		$("#searchForm input[type=checkbox]").parent("label").removeClass("checked");
+		$("#searchForm input[type=radio][checked]").parent("label").addClass("checked");
+		$("#multiBrand").empty();
+		$('#searchForm input[name=brandList]').val('');
+		$('#searchForm').find('#brandText').html('');
+		$('#searchForm input[name=supplyCompList]').val('');
+		$('#searchForm').find('#supplyCompText').html('');
+		
+		$(document).find('#searchForm').find(".multiCheckBox").each(function(i, e){
+			let btnNm = $(this).find(".sltBtn").attr("data-name");
+			$(this).find(".sltBtn").text(btnNm);
+		});
+		
+	});
+	
 	// 검색
 	$('#btnSearch').on('click', function() {
 		if(!fnConditionCheck()) return;
@@ -264,17 +292,23 @@
 
 		var searchFlag = false;
 		var cnt = 0;
-
-		for (i = 0; i < form.elements.length; i++ ) {
-			var el = form.elements[i];
-
-			if ($(el).prop("type") == "text" || ($(el).prop("type") == "select-one" && el.name != "search" && el.name != "pageSize")) {
-				if (!(el.value == null || el.value == "")) {
-					cnt++;
+		if( !gagajf.isNull($("#searchForm input[name=supplyCompList]").val()) 
+				|| !gagajf.isNull($("#searchForm textarea[name=condition]").val())
+				|| (!gagajf.isNull($("#searchForm input[name=stDate]").val()) && !gagajf.isNull($("#searchForm input[name=edDate]").val()))
+				|| !gagajf.isNull($("#searchForm input[name=brandList]").val())
+			){
+			searchFlag = true;
+		}else{
+			for (i = 0; i < form.elements.length; i++ ) {
+				var el = form.elements[i];
+	
+				if ($(el).prop("type") == "text" || ($(el).prop("type") == "select-one" && el.name != "search" && el.name != "pageSize")) {
+					if (!(el.value == null || el.value == "")) {
+						cnt++;
+					}
 				}
 			}
-		}
-			
+		}	
 		if(cnt > 0) searchFlag = true;
 
 		if(searchFlag == false){
@@ -317,17 +351,65 @@
 		gagaAgGrid.fetch(actionUrl, gridNoticeGoodsOptions);
 	}
 	
-	//업체변경시
-	$('#searchForm select[name=supplyCompCd]').on('change', function() {
-		var actionUrl = '/renderer/supplyCompany/brand/list/' + $(this).val();
+	// 업체 조회 선택시
+	$('#btnSearchSupplyComp').on('click', function() {
+		cfnOpenCompanyListPopup('fnSetSupplyCompInfo', 'M');
+	});
+	
+	// 업체 조회 팝업에서 호출
+	var fnSetSupplyCompInfo = function(result) {
+		var arrSupplyComp = [];
+		var supplyCompText = "";
+		var sIndex = 0;
+		$('#searchForm').find('#supplyCompText').html('');
+		$('#searchForm input[name=supplyCompSearchTxt]').val('');
+		result.forEach(function(supplyComp){
+			sIndex++; 
+			arrSupplyComp.push(supplyComp.supplyCompCd);
+		});
 
-		if(sessRoleCd == "G001_B000"){
-			actionUrl = '/renderer/brand/AuthBrandlist';
+		// 조회값이 하나일 경우 화면에 코드 노출 그외는 갯수 처리 
+		if (sIndex == 1) {
+			$('#searchForm input[name=supplyCompSearchTxt]').val(arrSupplyComp[0]);
+		}else{
+			supplyCompText = sIndex + " 개";
+			$('#searchForm').find('#supplyCompText').html(supplyCompText);	
 		}
-		$("#searchForm select[name=brandCd] option:gt(0)").remove();
+		var jsonData = JSON.stringify(arrSupplyComp);
+		$("#searchForm input[name=supplyCompList]").val(jsonData);
+	}
+	
+	// 브랜드 조회 팝업에서 호출
+	var fnSetBrandInfo = function(result) {
+		var arrbrandCd = [];
+		var brandText = "";
+		var bIndex = 0;
+		$('#searchForm').find('#brandText').html('');
+		$('#searchForm input[name=searchTxt]').val('');
+		result.forEach(function(brand){
+			bIndex++; 
+			arrbrandCd.push(brand.brandCd);
+		});
 
-		cfnCreateCombo(actionUrl, $('#searchForm select[name=brandCd]'), "[전체]", "");
-	});	
+		// 조회값이 하나일 경우 화면에 코드 노출 그외는 갯수 처리 
+		if (bIndex == 1) {
+			$('#searchForm input[name=searchTxt]').val(arrbrandCd[0]);
+		}else{
+			brandText = bIndex + " 개";
+			$('#searchForm').find('#brandText').html(brandText);	
+		}
+		var jsonData = JSON.stringify(arrbrandCd);
+		$("#searchForm input[name=brandList]").val(jsonData);
+	}
+	
+	// 브랜드 조회 선택시
+	$('#btnSearchBrand').on('click', function() {
+		/* if (gagajf.isNull($("#searchForm input[name=searchTxt]").val())){
+			mcxDialog.alert('브랜드 검색어를 입력하세요.');
+			return false;
+		} */
+		cfnOpenBrandListPopup('fnSetBrandInfo', 'M');
+	});
 	
 	//엑셀 상품 조회
 	$('#btnSearchExcel').on('click', function() {

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

@@ -32,9 +32,9 @@
 			<div class="panelContent">
 				<table class="frmStyle">
 					<colgroup>
-						<col width="8%"/>
-						<col width="25%"/>
-						<col width="8%"/>
+						<col width="10%"/>
+						<col width="40%"/>
+						<col width="10%"/>
 						<col/>
 					</colgroup>
 					<tr>
@@ -56,7 +56,7 @@
 								<option value="searchGoodsNum">품번</option>
 								<option value="searchSupplyGoodsCd">업체상품코드</option>
 							</select>
-							<input type="text" class="w50p" name="condition" id="condition" maxlength="50"/>
+							<textarea class="textareaR2 w50p" name="condition" id="condition"></textarea>
 						</td>
 					</tr>
 					<tr>
@@ -228,16 +228,23 @@
 		var searchFlag = false;
 		var cnt = 0;
 
-		for (i = 0; i < form.elements.length; i++ ) {
-			var el = form.elements[i];
-
-			if ($(el).prop("type") == "text" || ($(el).prop("type") == "select-one" && el.name != "search" && el.name != "pageSize")) {
-				if (!(el.value == null || el.value == "")) {
-					cnt++;
+		if( !gagajf.isNull($("#goodsResSellListForm input[name=supplyCompList]").val())
+				|| !gagajf.isNull($("#goodsResSellListForm input[name=brandList]").val())
+				|| !gagajf.isNull($("#goodsResSellListForm textarea[name=condition]").val())
+			){
+			searchFlag = true;
+		}else{
+			for (i = 0; i < form.elements.length; i++ ) {
+				var el = form.elements[i];
+	
+				if ($(el).prop("type") == "text" || ($(el).prop("type") == "select-one" && el.name != "search" && el.name != "pageSize")) {
+					if (!(el.value == null || el.value == "")) {
+						cnt++;
+					}
 				}
 			}
 		}
-			
+		
 		if(cnt > 0) searchFlag = true;
 
 		if(searchFlag == false){

src/main/webapp/WEB-INF/views/stock/GoodsSizeStockForm.html

@@ -38,9 +38,11 @@
 				<table class="frmStyle">
 					<colgroup>
 						<col width="10%"/>
-						<col width="23%"/>
+						<col width="15%"/>
 						<col width="10%"/>
-						<col width="23%"/>
+						<col width="15%"/>
+						<col width="10%"/>
+						<col width="15%"/>
 						<col width="10%"/>
 						<col/>
 					</colgroup>
@@ -51,42 +53,39 @@
 							<button type="button" class="btn icn" id="btnSearchSupplyComp"><i class="fa fa-search"></i></button>
 							<span id="supplyCompText"></span>
 							<input type="hidden" name="supplyCompList"/>
-							<!-- <label class="rdoBtn"><input type="radio" name="selfYn" id="selfYnY" value="Y"  checked/>자사</label>
-							<label class="rdoBtn"><input type="radio" name="selfYn" id="selfYnN" value="N"/>입점</label>
-							<select name="supplyCompCd" id="supplyCompCd">
-								<option value="" th:if="${sessionInfo.roleCd} != 'G001_B000'">[전체]</option>
-								<option th:if="${supplyCompList}" th:each="oneData, status : ${supplyCompList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
-							</select>
-							<select name="brandCd" id="brandCd">
-								<option value="">[전체]</option>
-							</select> -->
 						</td>
 						<th>브랜드<em class="required" title="필수"></em></th>
 						<td>
 							<input type="text" class="w100" name="searchTxt" id="searchTxt" maxlength="20" />
 							<button type="button" class="btn icn" id="btnSearchBrand"><i class="fa fa-search"></i></button>
-							<!-- <input type="text" class="w100" name="brandCd" readonly="readonly"/> -->
 							<span id="brandText"></span>
 							<input type="hidden" name="brandList"/>
 						</td>
-						<th>키워드<em class="required" title="필수"></em></th>
-						<td colspan="3">
+						<th>정상/이월 구분</th>
+						<td>
+							<select  name="formalGb" id="formalGb">
+								<option value="">[전체]</option>
+								<option th:if="${formalGbList}" th:each="oneData, status : ${formalGbList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
+							</select>
+						</td>
+						<th rowspan="3">키워드<em class="required" title="필수"></em></th>
+						<td rowspan="3">
 							<select name="search" id="search">
 								<option value="searchGoodsCd">상품코드</option>
 								<option value="searchGoodsNm">상품명</option>
 								<option value="searchGoodsNum">품번</option>
 								<option value="searchSupplyGoodsCd">업체상품코드</option>
 							</select>
-							<input type="text" class="w100" name="condition" id="condition" maxlength="50"/>
+							<textarea class="textareaR3 w150" name="condition" id="condition"></textarea>
 						</td>
 					</tr>
 					<tr>
-						<th>정상/이월 구분</th>
+						<th>품목</th>
 						<td>
-							<select  name="formalGb" id="formalGb">
-								<option value="">[전체]</option>
-								<option th:if="${formalGbList}" th:each="oneData, status : ${formalGbList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
-							</select>
+							<input type="text" class="w100" name="itemkindSearchTxt" id="itemkindSearchTxt" maxlength="20" />
+							<button type="button" class="btn icn" id="btnSearchItemkind"><i class="fa fa-search"></i></button>
+							<span id="itemkindText"></span>
+							<input type="hidden" name="itemkindList"/>
 						</td>
 						<th>상품상태</th>
 						<td>
@@ -95,15 +94,6 @@
 								<option th:if="${goodsStatList}" th:each="oneData, status : ${goodsStatList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
 							</select>
 						</td>
-						<th>품목</th>
-						<td colspan="3">
-							<select name="itemkindCd" id="itemkindCd">
-								<option value="">[전체]</option>
-								<option th:if="${itemkindList}" th:each="oneData, status : ${itemkindList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
-							</select>
-						</td>
-					</tr>
-					<tr>
 						<th>품절여부</th>
 						<td>
 							<select  name="soldOutYn" id="soldOutYn">
@@ -111,13 +101,8 @@
 								<option th:if="${useYnList}" th:each="oneData, status : ${useYnList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
 							</select>
 						</td>
-						<th>색상</th>
-						<td>
-							<select name="optCd1" id="optCd1">
-								<option value="">[전체]</option>
-								<option th:if="${colorList}" th:each="oneData, status : ${colorList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
-							</select>
-						</td>
+					</tr>
+					<tr>
 						<th>년도/시즌</th>
 						<td colspan="3">
 							<select  name="styleYear" id="styleYear">
@@ -129,21 +114,21 @@
 								<option th:if="${seasonList}" th:each="oneData, status : ${seasonList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
 							</select>
 						</td>
-					</tr>
-					<tr>
-						<th>담당MD</th>
+						<th>색상</th>
 						<td>
-							<select  name="mdNo" id="mdNo">
+							<select name="optCd1" id="optCd1">
 								<option value="">[전체]</option>
-								<option th:if="${brandMdList}" th:each="oneData, status : ${brandMdList}" th:value="${oneData.cd}" th:text="${oneData.cdNm}"></option>
+								<option th:if="${colorList}" th:each="oneData, status : ${colorList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
 							</select>
 						</td>
+					</tr>
+					<tr>
 						<th>사이즈</th>
 						<td>
 							<input type="text" class="w80" name="optCd2" id="optCd2" maxlength="50"/>
 						</td>
 						<th>재고수량</th>
-						<td colspan="3">
+						<td colspan="6">
 							<input type="text" class="w70" name="stockQtySt" id="stockQtySt" maxlength="5" data-valid-type="numeric"/> ~ <input type="text" class="w70" name="stockQtyEd" id="stockQtyEd" maxlength="5" data-valid-type="numeric"/>
 						</td>
 					</tr>
@@ -154,8 +139,7 @@
 						<button type="button" class="btn btn-info btn-lg" id="btnSearch" >조회</button>
 					</li>
 				</ul>
-
-			</div>
+x			</div>
 			<!-- //검색조건 영역 -->
 		</div>
 		<!-- 패널 영역1 -->
@@ -313,6 +297,13 @@
 		$('#goodsSizeStockForm input[name=supplyCompList]').val('');
 		$('#goodsSizeStockForm').find('#brandText').html('');
 		$('#goodsSizeStockForm').find('#supplyCompText').html('');
+		$('#goodsSizeStockForm input[name=itemkindList]').val('');
+		$('#goodsSizeStockForm').find('#itemkindText').html('');
+		
+		$(document).find('#goodsSizeStockForm').find(".multiCheckBox").each(function(i, e){
+			let btnNm = $(this).find(".sltBtn").attr("data-name");
+			$(this).find(".sltBtn").text(btnNm);
+		});
 		
 	}
 	
@@ -352,7 +343,7 @@
 		var cnt = 0;
 
 		if( !gagajf.isNull($("#goodsSizeStockForm input[name=supplyCompList]").val())
-				|| !gagajf.isNull($("#goodsSizeStockForm input[name=condition]").val())
+				|| !gagajf.isNull($("#goodsSizeStockForm textarea[name=condition]").val())
 				|| (!gagajf.isNull($("#goodsSizeStockForm input[name=stDate]").val()) && !gagajf.isNull($("#goodsSizeStockForm input[name=edDate]").val()))
 				|| !gagajf.isNull($("#goodsSizeStockForm input[name=brandList]").val())
 				
@@ -611,6 +602,34 @@
 		$("#goodsSizeStockForm input[name=brandList]").val(jsonData);
 	}
 	
+	// 품목 조회 선택시
+	$('#btnSearchItemkind').on('click', function() {
+		cfnOpenItemkindListPopup('fnSetItemkindInfo', 'M');
+	});
+	
+	// 품목 조회 팝업에서 호출
+	var fnSetItemkindInfo = function(result) {
+		var arrItemkind = [];
+		var itemkindText = "";
+		var sIndex = 0;
+		$('#goodsSizeStockForm').find('#itemkindText').html('');
+		$('#goodsSizeStockForm input[name=itemkindSearchTxt]').val('');
+		result.forEach(function(itemkind){
+			sIndex++; 
+			arrItemkind.push(itemkind.itemkindCd);
+		});
+
+		// 조회값이 하나일 경우 화면에 코드 노출 그외는 갯수 처리 
+		if (sIndex == 1) {
+			$('#goodsSizeStockForm input[name=itemkindSearchTxt]').val(arrItemkind[0]);
+		}else{
+			itemkindText = sIndex + " 개";
+			$('#goodsSizeStockForm').find('#itemkindText').html(itemkindText);	
+		}
+		var jsonData = JSON.stringify(arrItemkind);
+		$("#goodsSizeStockForm input[name=itemkindList]").val(jsonData);
+	}
+	
 	$(document).ready(function() {
 		
 		// Create a agGrid
@@ -618,12 +637,7 @@
 		//$('.ag-header-group-cell').each(function(item){$(this).css('text-align', 'center')});
 		//$('.ag-header-group-cell-label').each(function(item){$(this).css('display', 'inline-block')});
 
-		// 입점 사용자 브랜드 조회 처리
-		if(sessRoleCd == "G001_B000"){
-			actionUrl = '/renderer/brand/AuthBrandlist';
-			cfnCreateCombo(actionUrl, $('#goodsSizeStockForm select[name=brandCd]'), "[전체]", "");
-		}
-
+		
 	});
 
 /*]]>*/