Merge branch 'master' of http://106.246.249.162:13000/orderqueen/oqpo-view

src/main/webapp/js/app/locales/locale-ko.js

@@ -280,6 +280,7 @@ const ITP_MSG_LOCALE = (function() {
 			"rtnRsn": "반품사유",
 			"reqTypeNm":"요청구분",
 			"dlvAmt":"납품금액",
+			"whsDvsnNm":"창고구분",
 		},
 		"table": {
 			"brandId": "브랜드ID",

src/main/webapp/js/app/pomng/ITP_POMNG05010.js

@@ -68,7 +68,7 @@ const gridColModel = {
 			index: 'DLV_ST_CD', name: 'dlvStNm',		
 			label: '납품상태', 								//납품서상태
 			width: '12', fixed: false, align: 'center',	
-			minwidth:50,
+			minwidth:70,
 			sortable: false, hidden: false				
 		},
 		{
@@ -168,6 +168,13 @@ const gridColModel = {
 			width: '10', fixed: false, align: 'center',	
 			minwidth:120,
 			sortable: false, hidden: false				
+		},
+		{
+			index: 'WHS_DVSN_NM', name: 'whsDvsnNm',	
+			label: ITP_MSG_LOCALE.label.whsDvsnNm, 	//창고구분
+			width: '10', fixed: false, align: 'center',	
+			minwidth:100,
+			sortable: false, hidden: false				
 		}
 	]
 };