Selaa lähdekoodia

이태영 - 20210603 네이버페이 주문형 결제완료 데이터 수신 개발중

xodud lee 5 vuotta sitten
vanhempi
commit
1a43fe533e

+ 9 - 6
src/main/java/com/style24/scm/biz/web/TssOrderController.java

@@ -139,16 +139,19 @@ public class TssOrderController extends TssBaseController {
 	 * @since 2020. 12. 01
 	 * @since 2020. 12. 01
 	 */
 	 */
 	@GetMapping("/seller/unorder/excel/list")
 	@GetMapping("/seller/unorder/excel/list")
-	public ResponseEntity<InputStreamResource> downloadPickingGoodsExcelList(HttpServletRequest request) throws Exception {
+	public ResponseEntity<InputStreamResource> downloadPickingGoodsExcelList(HttpServletRequest request, Order param) throws Exception {
 		String excelfileName 	= "입점출고목록_" + GagaDateUtil.getTodayDateTime() + ".xlsx";
 		String excelfileName 	= "입점출고목록_" + GagaDateUtil.getTodayDateTime() + ".xlsx";
 		String excelFilePath 	= GagaFileUtil.getConcatenationPath(env.getProperty("download.path"), "excel", excelfileName);
 		String excelFilePath 	= GagaFileUtil.getConcatenationPath(env.getProperty("download.path"), "excel", excelfileName);
 		
 		
-		Order order = new Order();
-		order.setRegNo(TssSession.getInfo().getUserNo());
-		order.setSearch("EXCEL");
+		param.setRegNo(TssSession.getInfo().getUserNo());
+		param.setSearch("EXCEL");
+
+		log.info("CHECK ORD_DTL_NO_ARR :::: {}", param.getOrdDtlNoArr());
+
+		coreOrderService.geSellerUnorderExcelList(param, excelFilePath);
+
+		log.info("CHECK OUT :::: ");
 
 
-		coreOrderService.geSellerUnorderExcelList(order, excelFilePath);
-		
 		return GagaFileUtil.writeFile(request, excelFilePath);
 		return GagaFileUtil.writeFile(request, excelFilePath);
 	}
 	}
 	
 	

+ 1 - 1
src/main/webapp/WEB-INF/views/order/OrderSellerDelvListForm.html

@@ -66,7 +66,7 @@ var columnDefs = [
 	},
 	},
 	{headerName: "송장",				field:"invoiceNo",			width:120, cellClass: 'text-center'},
 	{headerName: "송장",				field:"invoiceNo",			width:120, cellClass: 'text-center'},
 	{headerName: "주문수량",			field:"ordQty",				width:100, cellClass: 'text-center'},
 	{headerName: "주문수량",			field:"ordQty",				width:100, cellClass: 'text-center'},
-	{headerName: "취소/반품수량",		field:"cnclRtnQty",			width:100, cellClass: 'text-center'},
+	{headerName: "취소수량",			field:"cnclRtnQty",			width:100, cellClass: 'text-center'},
 	{headerName: "출고수량",			field:"delvQty",			width:100, cellClass: 'text-center'},
 	{headerName: "출고수량",			field:"delvQty",			width:100, cellClass: 'text-center'},
 	{headerName: "미출고수량",		field:"cancelQty",			width:100, cellClass: 'text-center'
 	{headerName: "미출고수량",		field:"cancelQty",			width:100, cellClass: 'text-center'
 		, editable 			: true
 		, editable 			: true

+ 21 - 1
src/main/webapp/WEB-INF/views/order/OrderSellerListForm.html

@@ -243,7 +243,27 @@ $('#btnExcelDown').on('click', function () {
 
 
 // 엑셀다운로드
 // 엑셀다운로드
 var fnExcelDownCollback = function(flag){
 var fnExcelDownCollback = function(flag){
-	$('#excelList').attr({ href : '/order/seller/unorder/excel/list' }).get(0).click();
+	var selectedData = gridOptions.api.getSelectedRows();
+
+	if (selectedData.length == 0) {
+		mcxDialog.alert('선택된 행이 없습니다.');
+		return;
+	}
+
+	let ordDtlNoArr = new Array();
+	for(let i = 0 ; i < selectedData.length ; i++) {
+		ordDtlNoArr.push(selectedData[i].ordDtlNo);
+	}
+
+	let order = {
+		ordDtlNoArr : ordDtlNoArr
+	};
+
+	// var jsonData = JSON.stringify(order);
+	/*gagajf.ajaxJsonSubmit('/order/seller/unorder/excel/list', jsonData, null);*/
+	$('#excelList').attr({ href : '/order/seller/unorder/excel/list?ordDtlNoArr=' + ordDtlNoArr }).get(0).click();
+
+	// $('#excelList').attr({ href : '/order/seller/unorder/excel/list' }).get(0).click();
 }
 }
 
 
 // 송장 엑셀 업로드
 // 송장 엑셀 업로드