Просмотр исходного кода

이태영 - 20210420 입점발주최종확인 메뉴 개발 중

xodud1202 5 лет назад
Родитель
Сommit
6217b30660

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

@@ -271,13 +271,9 @@ public class TssOrderController extends TssBaseController {
 	 */
 	@PostMapping("/seller/delv/started")
 	@ResponseBody
-	public GagaResponse sellerDelvStarted(@RequestBody List<Order> orderList) {
+	public GagaResponse sellerDelvStarted(@RequestBody Collection<Order> orderList) {
 		int userNo = TssSession.getInfo().getUserNo();
-
-		for(int i = 0 ; i < orderList.size() ; i++) {
-			log.info("CnclRtnQty :::::::::::::: {}", orderList.get(i).getCnclRtnQty());
-		}
-
+		coreOrderService.updateSellerDelvStartAndPartCancel(orderList, userNo);
 		return super.ok("");
 	}
 }

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

@@ -83,7 +83,14 @@ var columnDefs = [
 			}
 		}
 	},
-	{headerName: "결품수량", field: "cnclRtnQty", width: 100, cellClass: 'text-center', hide: true}
+	{headerName: "결품수량",			field: "cnclRtnQty",		width: 100, cellClass: 'text-center', hide: true},
+	{headerName: "결제PG",				field: "pgGb",				width: 100, cellClass: 'text-center', hide: true},
+	{headerName: "결제수단",			field: "payMeans",			width: 100, cellClass: 'text-center', hide: true},
+	{headerName: "고객번호",			field: "custNo",			width: 100, cellClass: 'text-center', hide: true},
+	{headerName: "주문고객명",			field: "ordNm",				width: 100, cellClass: 'text-center', hide: true},
+	{headerName: "환불계좌은행코드",	field: "bankCd",			width: 100, cellClass: 'text-center', hide: true},
+	{headerName: "환불계좌예금주명",	field: "accountNm",			width: 100, cellClass: 'text-center', hide: true},
+	{headerName: "환불계좌번호",		field: "accountNo",			width: 100, cellClass: 'text-center', hide: true}
 ];
 
 var gridOptions = gagaAgGrid.getGridOptions(columnDefs);
@@ -117,7 +124,7 @@ $("#btnSave").on("click", function(e) {
 	for(let i = 0 ; i < selectedData.length ; i++) {
 		let rowData = selectedData[i];
 		if(typeof rowData.cancelQty == "undefined") {
-			mcxDialog.alert('선택된 행의 미출고수량을 입력해주세요.' + rowData.cancelQty);
+			mcxDialog.alert('선택된 행의 미출고수량을 입력해주세요.');
 			return;
 		}
 	}