09.12 환불컨펌 제휴사명 추가 환불상세 복사기능

src/main/java/com/style24/admin/biz/service/TsaDeliveryService.java

@@ -278,15 +278,7 @@ public class TsaDeliveryService {
 			ordSoldoutList.add(param);
 			
 		}
-		coreDeliveryService.cancelSoldout(ordSoldoutList,userNo, "N"); 
-		
-		/*
-		for(Delivery data : soldoutList) {
-			data.setSoldoutMemo("수동 품절처리");
-			data.setUpdNo(userNo);
-			deliveryDao.updateSoldOut(data);
-		}
-		*/
+		//coreDeliveryService.cancelSoldout(ordSoldoutList,userNo, "N"); 
 		
 	}	
 	

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

@@ -184,7 +184,7 @@ public class TsaDeliveryController extends TsaBaseController {
 		if (deliveryList == null || deliveryList.isEmpty()) {
 			throw new IllegalStateException(message.getMessage("FAIL_1002"));
 		}
-		deliveryService.cancelSoldout(deliveryList);
+		//deliveryService.cancelSoldout(deliveryList);
 
 		return super.ok(message.getMessage("SUCC_0004"));
 	}

src/main/webapp/WEB-INF/views/withdraw/RefundDetailForm.html

@@ -313,7 +313,7 @@
 	
 	// Get withDrawDetailGridOptions
 	var withdrawDetailGridOptions = gagaAgGrid.getGridOptions(columnDefsDetail);
-	withdrawDetailGridOptions.rowSelection = 'multiple';
+	//withdrawDetailGridOptions.rowSelection = 'multiple';
 	
 	var isCustomer = true;
 
@@ -359,11 +359,14 @@
 			$('#pgBtn').hide();
 			$('#divRefundInfo').hide();
 			$('#divRefundInfo2').show();
+			
 		}
 		
 		// 회수리스트 설정
 		withdrawDetailGridOptions.api.setRowData(result.dataList); 
 		
+		$("#refundAmt").text(result.dataList[0].refundAmt.addComma());
+		
 		fnSetWithdrawInfo(result.dataList[0]);	// 회수정보 설정
 	}
 	

src/main/webapp/WEB-INF/views/withdraw/RefundRegisterListForm.html

@@ -171,16 +171,14 @@
 				}
 			}
 		},
-		{headerName: "회수송장번호", field: "wdInvoiceNo", 	width: 100, cellClass: 'text-center'},
+		{headerName: "회수송장번호", field: "wdInvoiceNo", 			width: 100, cellClass: 'text-center'},
 		{headerName: "보내는사람", 	field: "maskingSenderNm", 		width: 100, cellClass: 'text-center'},
 		{headerName: "보낸연락처", 	field: "maskingSenderPhnno", 	width: 120, cellClass: 'text-center'},
 		{headerName: "주문자명", 	field: "maskingOrdNm",			width: 100, cellClass: 'text-center'},
 		{headerName: "주문자연락처", field: "maskingOrdPhnno",		width: 120, cellClass: 'text-center'},
-		
-		{headerName: "제휴사", field: "extmallId",		width: 120, cellClass: 'text-left'},
+		{headerName: "제휴사명", field: "extmallNm",		width: 120, cellClass: 'text-left'},
+		{headerName: "제휴사코드", field: "extmallId",		width: 120, cellClass: 'text-center'},
 		{headerName: "제휴몰 주문번호", field: "extmallOrderId",		width: 120, cellClass: 'text-center'},
-		
-		
 		{headerName: "도착일", 		field: "arrivalDt", 	width: 100,  cellClass: 'text-center'},
 		{headerName: "환불확정일", 	field: "completeDt",	width: 100,  cellClass: 'text-center'},
 		{headerName: "WMS회수메모", 	field: "wdMemo", 		width: 200,  cellClass: 'text-left'},
@@ -221,6 +219,7 @@
 	*  조회 버튼 클릭 시
 	**************************************************************************/
 	$('#btnSearch').on('click', function() {
+		$("#searchForm input[name=pageNo]").val('1');
 		fnSearch();
 	});
 
@@ -259,6 +258,12 @@
 		
 	}
 	
+	// 페이징
+	$('#searchForm select[name=pageSize]').on('change', function() {
+		$("#searchForm input[name=pageNo]").val('1');
+		fnSearch();
+	});
+	
 	/*************************************************************************
 	*  cell Click
 	**************************************************************************/