Переглянути джерело

검색기능 소수보완

jsh77b 4 роки тому
батько
коміт
cdfac9a207

+ 26 - 4
src/main/java/com/style24/admin/biz/web/TsaWithdrawController.java

@@ -305,10 +305,6 @@ public class TsaWithdrawController extends TsaBaseController {
 				withdrawExc.setOrdNoList(ordNoList);
 			}
 		}
-		
-		if (withdrawExc.getOrdNoList() != null) {
-			log.info("withdrawExc.getOrdNoList()[0] ::: {}", withdrawExc.getOrdNoList()[0]);
-		}
 
 		withdrawExc.setPageable(new TscPageRequest(withdrawExc.getPageNo() - 1, withdrawExc.getPageSize()));
 		withdrawExc.getPageable().setTotalCount(withdrawService.getWithdrawExceptionListCount(withdrawExc));
@@ -445,6 +441,32 @@ public class TsaWithdrawController extends TsaBaseController {
 		
 		GagaMap result = new GagaMap();
 		
+		// 2021.10.06 샾링커 관련 주문번호
+		if (!StringUtils.isBlank(wmsWithdraw.getCondition()) || !StringUtils.isBlank(wmsWithdraw.getExtmallId())) {
+			if (StringUtils.isBlank(wmsWithdraw.getCondition())) {
+				wmsWithdraw.setSearch("");
+			} else {
+				wmsWithdraw.setConditions(wmsWithdraw.getCondition().replaceAll("\r", "").trim().split("\n"));
+			}
+
+			// 외부몰 주문번호 조회
+			Collection<WmsWithdraw> widthdrawExtmallList = deliveryService.getWithdrawExtmallList(wmsWithdraw);
+			
+			if (widthdrawExtmallList != null && widthdrawExtmallList.size() > 0) {
+				int [] ordNoList = new int[widthdrawExtmallList.size()];
+				int idx = 0;
+				for (WmsWithdraw vo : widthdrawExtmallList) {
+					ordNoList[idx] = vo.getOrdNo();
+					idx++;
+				}
+				wmsWithdraw.setOrdNoList(ordNoList);
+			} else {
+				int [] ordNoList = new int[1];
+				ordNoList[0] = 123;
+				wmsWithdraw.setOrdNoList(ordNoList);
+			}
+		}
+		
 		// 2021.10.06 샾링커 관련 주문번호
 		if (!StringUtils.isBlank(wmsWithdraw.getCondition()) || !StringUtils.isBlank(wmsWithdraw.getExtmallId())) {