wms 입고 단품목록 쿼리 수정

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

@@ -2112,11 +2112,22 @@ public class TsaGoodsController extends TsaBaseController {
 		GagaMap result = new GagaMap();
 
 		// 입점업체담당자는 업체코드 설정
-		if ("G001-B000".equals(TsaSession.getInfo().getRoleCd())) {
+		if ("G001_B000".equals(TsaSession.getInfo().getRoleCd())) {
 			goodsSearch.setSupplyCompCd(TsaSession.getInfo().getSupplyCompCd());
 			goodsSearch.setMdNo(TsaSession.getInfo().getUserNo().toString());
 		}
 
+		// 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");
+			}
+		}
+		
 		goodsSearch.setRegNo(TsaSession.getInfo().getUserNo()); // 엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
 		goodsSearch.setPageable(new TscPageRequest(goodsSearch.getPageNo() - 1, goodsSearch.getPageSize()));
 		goodsSearch.getPageable().setTotalCount(goodsService.getGoodsResSellCount(goodsSearch));

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

@@ -4784,7 +4784,7 @@
 		                ,B.TOTALQTY
 		                ,B.SKUMODELNO
 		                , (CASE WHEN INSTR(REPLACE(B.SKUMODELNO, ' ' , ''), 'F20') = 1 THEN LEFT(REPLACE(B.SKUMODELNO, ' ' , ''),12)
-		                        WHEN INSTR(REPLACE(B.SKUMODELNO, ' ' , ''), '-') > 0 AND INSTR(REPLACE(B.SKUMODELNO, ' ' , ''), '-') <![CDATA[<]]> 10THEN LEFT(REPLACE(B.SKUMODELNO, ' ' , ''),11)
+		                        WHEN INSTR(REPLACE(B.SKUMODELNO, ' ' , ''), '-') > 0 AND INSTR(REPLACE(B.SKUMODELNO, ' ' , ''), '-') <![CDATA[<]]> 10 THEN LEFT(REPLACE(B.SKUMODELNO, ' ' , ''),11)
 		                        ELSE LEFT(REPLACE(B.SKUMODELNO, ' ' , ''),10) END) AS GOODS_CD
 		                FROM TB_IF_INCOMELOT A
 		                INNER JOIN TB_IF_INCOMELOTITEM B ON A.LOTNO = B.LOTNO

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

@@ -55,7 +55,6 @@
 								<option value="searchGoodsNm">상품명</option>
 								<option value="searchGoodsNum">품번</option>
 								<option value="searchSupplyGoodsCd">업체상품코드</option>
-								<option value="searchRegId">등록자</option>
 							</select>
 							<input type="text" class="w50p" name="condition" id="condition" maxlength="50"/>
 						</td>