SCM 수정 작업

src/main/java/com/style24/scm/biz/web/TssOrderController.java

@@ -321,19 +321,6 @@ public class TssOrderController extends TssBaseController {
 	@PostMapping("/seller/claim/list")
 	@ResponseBody
 	public Collection<Order> getOrderSellerClaimList(@RequestBody Order order) throws Exception {
-		
-		// 값이없으면 반품접수, 교환접수
-		/*
-		String [] multiChgStat = new String[2];
-		if (order.getChgStat() == null || "".equals(order.getChgStat())) {
-			multiChgStat[0] = TscConstants.OrderChangeStat.EXCHANGE.value();
-			multiChgStat[1] = TscConstants.OrderChangeStat.RETURN.value();
-		} else {
-			multiChgStat[0] = order.getChgStat();
-		}
-		order.setMultiChgStat(multiChgStat);
-		 */
-		
 		Collection<Order> OrderSellerClaimList = coreOrderService.getOrderSellerClaimList(order);
 		return OrderSellerClaimList;
 	}
@@ -384,10 +371,11 @@ public class TssOrderController extends TssBaseController {
 	public Collection<Order> getOrderSellerClaimTargetList(@RequestBody Order order) throws Exception {
 		
 		// 값이없으면 반품접수, 교환접수
-		String [] multiChgStat = new String[2];
+		String [] multiChgStat = new String[3];
 		if (order.getChgStat() == null || "".equals(order.getChgStat())) {
 			multiChgStat[0] = TscConstants.OrderChangeStat.EXCHANGE.value();
 			multiChgStat[1] = TscConstants.OrderChangeStat.RETURN.value();
+			multiChgStat[2] = TscConstants.OrderChangeStat.WITHDRAW.value();
 		} else {
 			multiChgStat[0] = order.getChgStat();
 		}
@@ -445,7 +433,7 @@ public class TssOrderController extends TssBaseController {
 		}
 		
 		mav.addObject("supplyCompList"	, rendererService.getSupplyCompanyList(supplyCompCd, selfYn)); 	// 공급업제목록
-		mav.addObject(" chgStatList"	, rendererService.getAvailCommonCodeList("G685"));				// 클렘임상태코드
+		mav.addObject("chgStatList"		, rendererService.getAvailCommonCodeList("G685"));					// 클렘임상태코드
 		mav.setViewName("order/OrderSellerWithdrawListForm");
 
 		return mav;

src/main/webapp/WEB-INF/views/order/OrderSellerClaimTargetListForm.html

@@ -79,6 +79,7 @@
 								<option value="">전체</option>
 								<option value="G685_20">교환접수</option>
 								<option value="G685_50">반품접수</option>
+								<option value="G685_30">회수요청</option>
 							</select>
 						</td>
 					</tr>

src/main/webapp/WEB-INF/views/order/OrderSellerWithdrawListForm.html

@@ -73,12 +73,12 @@
 						<td>
 							<input type="text" name="goodsCd" placeholder="" maxlength="20"/>
 						</td>
-						<th>클레임상태</th>
+						<th>변경구분</th>
 						<td>
 							<select name="chgGb" id="chgGb">
 								<option value="">전체</option>
-								<option value="G680_40">교환</option>
 								<option value="G680_30">반품</option>
+								<option value="G680_40">교환</option>
 							</select>
 						</td>
 					</tr>