Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.scm.git into develop

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

@@ -46,13 +46,12 @@ public class TssOrderChangeController extends TssBaseController {
 	private Environment env;
 
 	/**
-	 * 반품요청 화면 (관리자)
+	 * 입점업체 상품검수중 회수컨펌 화면
 	 * 
 	 * @param ordNo - 주문번호
-	 * @param cncWait - 취소대기요청 구분
 	 * @return ModelAndView
 	 * @author jsh77b
-	 * @since 2020. 12. 22
+	 * @since 2021. 07. 01
 	 */
 	@GetMapping("/seller/withdraw/confirm/form")
 	public ModelAndView rtnReqForm(@RequestParam(value = "ordNo") int ordNo, @RequestParam(value = "ordDtlNo") int ordDtlNo
@@ -101,7 +100,7 @@ public class TssOrderChangeController extends TssBaseController {
 	}
 	
 	/**
-	 * 입점업체 상품검수중 목록 회수컨펌 처리
+	 * 입점업체 상품검수중(변경번호단위) 회수컨펌 처리
 	 * @param order - 주문정보
 	 * @return Collection<Order>
 	 * @author jsh77b
@@ -121,7 +120,7 @@ public class TssOrderChangeController extends TssBaseController {
 	}
 	
 	/**
-	 * 입점업체 상품검수중 목록 회수컨펌목록 처리
+	 * 입점업체 상품검수중(변경번호목록단위) 회수컨펌목록 처리
 	 * @param order - 주문정보
 	 * @return Collection<Order>
 	 * @author jsh77b

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

@@ -181,9 +181,30 @@ var columnDefs = [
 	{headerName: "사이즈",			field:"optCd2",				width:100, cellClass: 'text-center'},
 	{headerName: "주문수량",			field:"ordQty",				width:100, cellClass: 'text-center'},
 	{headerName: "취소수량",			field:"cnclRtnQty",			width:100, cellClass: 'text-center'},
-	{headerName: "주문금액",			field:"ordAmt",				width:100, cellClass: 'text-center'},
-	{headerName: "할인금액",			field:"totDcAmt",			width:100, cellClass: 'text-center'},
-	{headerName: "실결제금액",		field:"realOrdAmt",			width:100, cellClass: 'text-center'},
+	{headerName: "주문금액",			field:"ordAmt",				width:100, cellClass: 'text-right'
+		,valueFormatter: function(params) {
+			if(params.value && params.value > 0) {
+				return params.value.addComma();
+			} else {
+				return 0;
+			}
+		}},
+	{headerName: "할인금액",			field:"totDcAmt",			width:100, cellClass: 'text-right'
+		,valueFormatter: function(params) {
+			if(params.value && params.value > 0) {
+				return params.value.addComma();
+			} else {
+				return 0;
+			}
+		}},
+	{headerName: "실결제금액",		field:"realOrdAmt",			width:100, cellClass: 'text-right'
+		,valueFormatter: function(params) {
+			if(params.value && params.value > 0) {
+				return params.value.addComma();
+			} else {
+				return 0;
+			}
+		}},
 	{headerName: "배송업체",			field:"shipCompCd",			width:150, cellClass: 'text-center'},
 	{headerName: "송장",				field:"invoiceNo",			width:150, cellClass: 'text-center'}
 ];

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

@@ -171,9 +171,30 @@ var columnDefs = [
 	{headerName: "옵션2",			field:"optCd2",				width:100, cellClass: 'text-center'},
 	{headerName: "주문수량",			field:"ordQty",				width:100, cellClass: 'text-center'},
 	{headerName: "취소수량",			field:"cnclRtnQty",			width:100, cellClass: 'text-center'},
-	{headerName: "주문금액",			field:"ordAmt",				width:100, cellClass: 'text-center'},
-	{headerName: "할인금액",			field:"totDcAmt",			width:100, cellClass: 'text-center'},
-	{headerName: "실결제금액",		field:"realOrdAmt",			width:100, cellClass: 'text-center'},
+	{headerName: "주문금액",			field:"ordAmt",				width:100, cellClass: 'text-right'
+		,valueFormatter: function(params) {
+			if(params.value && params.value > 0) {
+				return params.value.addComma();
+			} else {
+				return 0;
+			}
+		}},
+	{headerName: "할인금액",			field:"totDcAmt",			width:100, cellClass: 'text-right'
+		,valueFormatter: function(params) {
+			if(params.value && params.value > 0) {
+				return params.value.addComma();
+			} else {
+				return 0;
+			}
+		}},
+	{headerName: "실결제금액",		field:"realOrdAmt",			width:100, cellClass: 'text-right'
+		,valueFormatter: function(params) {
+			if(params.value && params.value > 0) {
+				return params.value.addComma();
+			} else {
+				return 0;
+			}
+		}},
 	{headerName: "배송업체",			field:"shipCompCd",			width:150, cellClass: 'text-left'
 		, editable 			: true
 		, cellEditor		: 'agRichSelectCellEditor'

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

@@ -123,7 +123,6 @@
 /*<![CDATA[*/
 var sessRoleCd 			= [[${sessionInfo.roleCd}]];
 var columnDefs = [
-	{width: 40, minWidth: 40, cellClass: 'text-right', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
 	{headerName: 'No', width: 60, cellClass: 'text-center', valueGetter: function(params) { return params.node.rowIndex + 1 }},
 	{headerName: "입점업체",			field:"supplyCompNm",		width:120, cellClass: 'text-center'},
 	{headerName: "입점업체코드",		field:"supplyCompCd",		width:120, cellClass: 'text-center', hide: true},