샵링커수정

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

@@ -122,6 +122,11 @@ public class TsaShoplinkerController extends TsaBaseController {
 			}
 		}
 
+		// multi row 검색관련 처리
+		if (!StringUtils.isBlank(shoplinkerSearch.getCondition())) {
+			shoplinkerSearch.setConditionList(shoplinkerSearch.getCondition().replaceAll("\r", "").trim().split("\n"));
+		}
+
 		shoplinkerSearch.setRegNo(TsaSession.getInfo().getUserNo()); // 엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
 		shoplinkerSearch.setPageable(new TscPageRequest(shoplinkerSearch.getPageNo() - 1, shoplinkerSearch.getPageSize()));
 		shoplinkerSearch.getPageable().setTotalCount(shoplinkerService.getGoodsSendListCount(shoplinkerSearch));
@@ -263,6 +268,11 @@ public class TsaShoplinkerController extends TsaBaseController {
 
 		GagaMap result = new GagaMap();
 
+		// multi row 검색관련 처리
+		if (!StringUtils.isBlank(shoplinkerOrder.getCondition())) {
+			shoplinkerOrder.setConditionList(shoplinkerOrder.getCondition().replaceAll("\r", "").trim().split("\n"));
+		}
+
 		shoplinkerOrder.setRegNo(TsaSession.getInfo().getUserNo()); // 엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
 		shoplinkerOrder.setPageable(new TscPageRequest(shoplinkerOrder.getPageNo() - 1, shoplinkerOrder.getPageSize()));
 		shoplinkerOrder.getPageable().setTotalCount(shoplinkerService.getShoplinkerOrderListCount(shoplinkerOrder));
@@ -418,6 +428,11 @@ public class TsaShoplinkerController extends TsaBaseController {
 
 		GagaMap result = new GagaMap();
 
+		// multi row 검색관련 처리
+		if (!StringUtils.isBlank(shoplinkerInvoice.getCondition())) {
+			shoplinkerInvoice.setConditionList(shoplinkerInvoice.getCondition().replaceAll("\r", "").trim().split("\n"));
+		}
+
 		shoplinkerInvoice.setRegNo(TsaSession.getInfo().getUserNo()); // 엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
 		shoplinkerInvoice.setPageable(new TscPageRequest(shoplinkerInvoice.getPageNo() - 1, shoplinkerInvoice.getPageSize()));
 		shoplinkerInvoice.getPageable().setTotalCount(shoplinkerService.getSendInvoiceListCount(shoplinkerInvoice));
@@ -643,12 +658,17 @@ public class TsaShoplinkerController extends TsaBaseController {
 			}
 		}
 
+		// multi row 검색관련 처리
+		if (!StringUtils.isBlank(shoplinkerSearch.getCondition())) {
+			shoplinkerSearch.setConditionList(shoplinkerSearch.getCondition().replaceAll("\r", "").trim().split("\n"));
+		}
+
 		shoplinkerSearch.setRegNo(TsaSession.getInfo().getUserNo()); // 엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
 		shoplinkerSearch.setPageable(new TscPageRequest(shoplinkerSearch.getPageNo() - 1, shoplinkerSearch.getPageSize()));
 		shoplinkerSearch.getPageable().setTotalCount(shoplinkerService.getStockListCount(shoplinkerSearch));
 
 		result.set("pageing", shoplinkerSearch);
-		result.set("stockList", shoplinkerService.getStockListList(shoplinkerSearch));
+		result.set("stockList", shoplinkerService.getStockList(shoplinkerSearch));
 
 		return result;
 	}

src/main/webapp/WEB-INF/views/shoplinker/ShoplinkerGoodsSendForm.html

@@ -47,7 +47,7 @@
 					<tr>
 						<th>상품코드<em class="required" title="필수"></em></th>
 						<td>
-							<input type="text" class="w130" name="goodsCd" id="goodsCd" maxlength="20" />
+							<textarea class="textareaR3 w20p" name="condition" id="condition"></textarea>
 						</td>
 
 						<th>브랜드</th>

src/main/webapp/WEB-INF/views/shoplinker/ShoplinkerInvoiceSendForm.html

@@ -35,12 +35,11 @@
 				<table class="frmStyle">
 					<colgroup>
 						<col style="width:10%;"/>
-						<col style="width:30%;"/>
+						<col/>
 						<col style="width:10%;"/>
-						<col style="width:20%;"/>
+						<col style="width:13%;"/>
 						<col style="width:10%;"/>
-						<col style="width:20%;"/>
-						<col/>
+						<col style="width:22%;"/>
 					</colgroup>
 
 					<tr>
@@ -49,7 +48,7 @@
 					</tr>
 					<tr>
 						<th>벤더/제휴몰</th>
-						<td colspan="3">
+						<td>
 							<select name="vendorId" required="required" data-valid-name="벤더">
 								<option th:if="${vendorList}" th:each="oneData, status : ${vendorList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
 							</select>/
@@ -60,7 +59,7 @@
 						</td>
 
 						<th>IF결과</th>
-						<td colspan="3">
+						<td>
 							<select name="apiResult" id="apiResult">
 								<option value="">[전체]</option>
 								<option value="true">전송완료</option>
@@ -68,19 +67,14 @@
 								<option value="error">오류</option>
 							</select>
 						</td>
-					</tr>
-					<tr>
-						<th>샵링커주문번호</th>
+						<th>키워드</th>
 						<td>
-							<input type="text" class="w150" name="agentOrderId" maxlength="20"/>
-						</td>
-						<th>쇼핑몰주문번호</th>
-						<td>
-							<input type="text" class="w150" name="extmallOrderId" maxlength="50" onkeyup="$(this).val($(this).val().toUpperCase());"/>
-						</td>
-						<th>주문번호</th>
-						<td>
-							<input type="text" class="w150" name="ordNo" maxlength="50"/>
+							<select name="search" id="search">
+								<option value="agentOrderId">샵링커주문번호</option>
+								<option value="extmallOrderId">쇼핑몰주문번호</option>
+								<option value="ordNo">스타일24주문번호</option>
+							</select>
+							<textarea class="textareaR3 w40p" name="condition" id="condition"></textarea>
 						</td>
 					</tr>
 				</table>

src/main/webapp/WEB-INF/views/shoplinker/ShoplinkerOrderForm.html

@@ -34,11 +34,11 @@
 						<col/>
 					</colgroup>
 					<tr>
-						<th>샵링커 주문일<em class="required" title="필수"></em></th>
+						<th>샵링커 주문수집일<em class="required" title="필수"></em></th>
 						<td colspan="7">
 							<input name="apiStDate" id="apiStDate" type="text" class="w80 schDate" maxlength="10" required="required" data-valid-name="주문수집일" />
 							&nbsp;&nbsp;&nbsp;&nbsp;
-							<button th:if="${sessionInfo.userId == 'jsh77b'}" type="button" class="btn btn-primary btn-lg" id="btnCollection">주문수집</button>
+							<button th:if="${sessionInfo.userId == 'jmh'}" type="button" class="btn btn-primary btn-lg" id="btnCollection">주문수집</button>
 							&nbsp;<span class="runable_info"></span>
 						</td>
 					</tr>
@@ -66,12 +66,8 @@
 					</colgroup>
 
 					<tr>
-						<th>일자<em class="required" title="필수"></em></th>
-						<td colspan="7">
-							<select name="dtGb">
-								<option value="orderRegDate">주문수집일자</option>
-								<option value="orderdate">주문일자</option>
-							</select>
+						<th>주문수집일자<em class="required" title="필수"></em></th>
+						<td colspan="5">
 							<span id="terms">
 							</span>
 						</td>
@@ -103,17 +99,14 @@
 						</td>
 					</tr>
 					<tr>
-						<th>샵링커주문번호</th>
-						<td>
-							<input type="text" class="w150" name="shoplinkerOrderId" maxlength="20"/>
-						</td>
-						<th>쇼핑몰주문번호</th>
-						<td>
-							<input type="text" class="w150" name="mallOrderId" maxlength="50" onkeyup="$(this).val($(this).val().toUpperCase());"/>
-						</td>
-						<th>스타일24주문번호</th>
-						<td>
-							<input type="text" class="w150" name="ordNo" maxlength="50"/>
+						<th>키워드</th>
+						<td colspan="5">
+							<select name="search" id="search">
+								<option value="shoplinkerOrderId">샵링커주문번호</option>
+								<option value="mallOrderId">쇼핑몰주문번호</option>
+								<option value="ordNo">스타일24주문번호</option>
+							</select>
+							<textarea class="textareaR3 w20p" name="condition" id="condition"></textarea>
 						</td>
 					</tr>
 				</table>
@@ -383,6 +376,9 @@
 						var actionUrl = '/shoplinker/order/collection/receiveList/' + $('#apiStDate').val();
 						$.post(actionUrl, null, null, 'json');
 
+						$("#btnCollection").html("주문수집중");
+						$("#btnCollection").removeClass("btn-primary");
+						$("#btnCollection").addClass("btn-dark");
 						setTimeout(function(){
 							fnGetCallRunableInfo();
 						}, 20000 );
@@ -403,6 +399,10 @@
 			if( null != result  ){
 				if( 0 == result.runCnt){
 					// 재호출 안함.
+					$("#btnCollection").html("주문수집");
+					$("#btnCollection").addClass("btn-primary");
+					$("#btnCollection").removeClass("btn-dark");
+
 				}else{
 					// 현재 진행중
 					var resultTxt = result.txt;
@@ -410,6 +410,10 @@
 					resultTxt = resultTxt.replace("스타일24", "스타일24남은수 "+result.remainStyleCnt )
 					$(".runable_info").html(resultTxt);
 
+					$("#btnCollection").html("주문수집중");
+					$("#btnCollection").removeClass("btn-primary");
+					$("#btnCollection").addClass("btn-dark");
+
 					setTimeout(function(){
 						fnGetCallRunableInfo();
 					}, 20000 );

src/main/webapp/WEB-INF/views/shoplinker/ShoplinkerStockForm.html

@@ -51,7 +51,7 @@
 					<tr>
 						<th>상품코드<em class="required" title="필수"></em></th>
 						<td>
-							<input type="text" class="w130" name="goodsCd" id="goodsCd" maxlength="20" />
+							<textarea class="textareaR3 w40p" name="condition" id="condition"></textarea>
 						</td>
 
 						<th>브랜드</th>