Merge branch 'develop' into bin2107

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

@@ -213,7 +213,7 @@ public class TssOrderController extends TssBaseController {
 	}
 	
 	/**
-	 * 입점업체미발주목록 - 송장번호 입력(출고완료)
+	 * 입점업체미발주목록 - 송장번호 입력(자사 : 배송준비중, 입점 : 배송중)
 	 *
 	 * @param orderList - 송방번호 입력된 주문리스트
 	 * @return GagaMap

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

@@ -48,14 +48,14 @@ var columnDefs = [
 	{headerName: 'No', width: 60, cellClass: 'text-center', valueGetter: function(params) { return params.node.rowIndex + 1 }},
 	{headerName: "입점업체",			field:"supplyCompNm",		width:70, cellClass: 'text-center'},
 	{headerName: "입점업체코드",		field:"supplyCompCd",		width:80, cellClass: 'text-center', hide: true},
-	{headerName: "브랜드",				field:"brandKnm",			width:80, cellClass: 'text-center'},
+	{headerName: "브랜드",			field:"brandKnm",			width:80, cellClass: 'text-center'},
 	{headerName: "주문번호",			field:"ordNo",				width:70, cellClass: 'text-center'},
 	{headerName: "주문상세번호",		field:"ordDtlNo",			width:100, cellClass: 'text-center'},
 	{headerName: "업체상품코드",		field:"supplyGoodsCd",		width:100, cellClass: 'text-center'},
 	{headerName: "상품코드",			field:"goodsCd",			width:100, cellClass: 'text-center'},
-	{headerName: "상품명",				field:"goodsNm",			width:100, cellClass: 'text-center'},
-	{headerName: "옵션1",				field:"optCd1",				width:100, cellClass: 'text-center'},
-	{headerName: "옵션2",				field:"optCd2",				width:100, cellClass: 'text-center'},
+	{headerName: "상품명",			field:"goodsNm",			width:100, cellClass: 'text-center'},
+	{headerName: "옵션1",			field:"optCd1",				width:100, cellClass: 'text-center'},
+	{headerName: "옵션2",			field:"optCd2",				width:100, cellClass: 'text-center'},
 	{headerName: "배송업체",			field:"shipCompCd",			width:120, cellClass: 'text-center'
 		, valueFormatter: function (params) {
 			return gagaAgGrid.lookupValue(shipCompanyList, params.value);
@@ -67,7 +67,7 @@ var columnDefs = [
 	{headerName: "송장",				field:"invoiceNo",			width:120, cellClass: 'text-center'},
 	{headerName: "주문수량",			field:"ordQty",				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
 		, cellEditor		: 'agRichSelectCellEditor'
 		, cellEditorParams	: function(params){
@@ -84,10 +84,10 @@ var columnDefs = [
 		}
 	},
 	{headerName: "결품수량",			field: "cnclRtnQty",		width: 100, cellClass: 'text-center', hide: true},
-	{headerName: "결제PG",				field: "pgGb",				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: "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}