카테고리 상품 조회 수정

src/main/java/com/style24/admin/biz/web/TsaDisplayController.java

@@ -319,6 +319,7 @@ public class TsaDisplayController extends TsaBaseController {
 		mav.addObject("cateTypeList", rendererService.getAvailCommonCodeList("G031"));
 		mav.addObject("formalGbList", rendererService.getAvailCommonCodeList("G009"));
 		mav.addObject("conentsLocList", rendererService.getAvailCommonCodeList("G028"));
+		mav.addObject("goodsStatList", rendererService.getAvailCommonCodeList("G008"));
 
 		mav.setViewName("display/CategoryGoodsForm");
 

src/main/java/com/style24/persistence/mybatis/shop/TsaDsiplay.xml

@@ -596,14 +596,14 @@
 						, G.TAG_PRICE
 						, G.LIST_PRICE
 						, G.CURR_PRICE
-						, G.GOODS_TYPE
+						, FN_GET_CODE_NM('G056',G.GOODS_TYPE) AS GOODS_TYPE
 						, G.PNT_PRATE
 						, G.PRE_PPNT_USABLE_YN
 						, G.PNT_MRATE
 						, G.PRE_MPNT_USABLE_YN
 						, G.ERP_STOCK_LINK_YN
 						, G.ERP_PRICE_LINK_YN
-						, G.FORMAL_GB
+						, FN_GET_CODE_NM('G009',IFNULL(G.FORMAL_GB,'10')) AS FORMAL_GB
 						, G.SELF_GOODS_YN
 						, G.REG_DT
 						, G.SUPPLY_GOODS_CD
@@ -612,7 +612,7 @@
 						, G.ITEMKIND_CD
 						, G.GOODS_STAT
 						, G.STYLE_YEAR
-						, G.SEASON_CD
+						, FN_GET_CODE_NM('G006',G.SEASON_CD) AS SEASON_CD
 						, (SELECT BRAND_GRP_NM FROM TB_BRAND WHERE BRAND_CD = G.BRAND_CD) AS BRAND_GRP_NM
 						, (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG  WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = G.MAIN_COLOR_CD AND DEFAULT_IMG_YN = 'Y' ) AS SYS_IMG_NM
 				FROM
@@ -881,7 +881,7 @@
 		/* TsaDisplay.getCategoryGoodsList */
 		SELECT Z.*
 		FROM ( SELECT @rownum := @rownum + 1 AS RNUM
-				, (SELECT STOCK_QTY FROM TB_GOODS_STOCK WHERE GOODS_CD = A.GOODS_CD ) AS CURR_STOCK_QTY
+				, IFNULL((SELECT STOCK_QTY FROM TB_GOODS_STOCK WHERE GOODS_CD = A.GOODS_CD ),0) AS CURR_STOCK_QTY
 				, A.*
 				FROM ( SELECT G.GOODS_CD
 							, G.GOODS_TNM
@@ -889,7 +889,7 @@
 							, (SELECT SYS_IMG_NM FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND DEFAULT_IMG_YN = 'Y') AS IMG_PATH1
 							, A.CATE_NO
 							, A.DISP_ORD
-							, G.GOODS_TYPE
+							, FN_GET_CODE_NM('G056',G.GOODS_TYPE) AS GOODS_TYPE
 							, G.TAG_PRICE
 							, G.LIST_PRICE
 							, G.CURR_PRICE
@@ -897,10 +897,11 @@
 							, G.GOODS_STAT
 							, G.BRAND_CD
 							, A.REG_NO
+							, FN_GET_USER_NM(A.REG_NO) AS REG_NM
 							, A.REG_DT
 							, G.SUPPLY_GOODS_CD
 							, G.STYLE_YEAR
-							, IFNULL(G.FORMAL_GB,'10') AS FORMAL_GB
+							, FN_GET_CODE_NM('G009',IFNULL(G.FORMAL_GB,'10'))  AS FORMAL_GB
 						FROM ( SELECT A.GOODS_CD
 									, A.CATE_NO
 									, A.DISP_ORD

src/main/webapp/WEB-INF/views/display/CategoryGoodsForm.html

@@ -183,6 +183,7 @@
 	let cateTypeList = gagajf.convertToArray([[${cateTypeList}]]);
 	let formalGbList = gagajf.convertToArray([[${formalGbList}]]);
 	let conentsLocList = gagajf.convertToArray([[${conentsLocList}]]);
+	let goodsStatList = gagajf.convertToArray([[${goodsStatList}]]);
 
 	let columnDefs1 = [
 		{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
@@ -192,17 +193,28 @@
 		{headerName: "카테고리번호", field: "cateNo", width: 120, cellClass: 'text-center'},
 		{headerName: "표시순서", field: "dispOrd", width: 80, cellClass: 'text-center'},
 		{headerName: "상품타입", field: "goodsType", width: 100, cellClass: 'text-center'},
-		{headerName: "TAG가", field: "tagPrice", width: 80, cellClass: 'text-center'},
-		{headerName: "정상가", field: "listPrice", width: 80, cellClass: 'text-center'},
-		{headerName: "현재판매가", field: "currPrice", width: 80, cellClass: 'text-center'},
+		{headerName: "재고", field: "currStockQty", width: 80, cellClass: 'text-right',
+			valueFormatter: function(params) {	return params.value.addComma();}
+		},
+		{headerName: "TAG가", field: "tagPrice", width: 80, cellClass: 'text-right',
+			valueFormatter: function(params) {	return params.value.addComma();}
+		},
+		{headerName: "정상가", field: "listPrice", width: 80, cellClass: 'text-right',
+			valueFormatter: function(params) {	return params.value.addComma();}
+		},
+		{headerName: "현재판매가", field: "currPrice", width: 80, cellClass: 'text-right',
+			valueFormatter: function(params) {	return params.value.addComma();}
+		},
 		{headerName: "할인율", field: "dcRate", width: 80, cellClass: 'text-center'},
-		{headerName: "상품상태", field: "goodsStat", width: 80, cellClass: 'text-center'},
+		{headerName: "상품상태", field: "goodsStat", width: 80, cellClass: 'text-center'
+			,valueFormatter: function (params) { return gagaAgGrid.lookupValue(goodsStatList, params.value); }
+		},
 		{headerName: "브랜드코드", field: "brandCd", width: 80, cellClass: 'text-center'},
-		{headerName: "공급업체상품코드", field: "supplyGoodsCd", width: 80, cellClass: 'text-center'},
+		{headerName: "공급업체상품코드", field: "supplyGoodsCd", width: 120, cellClass: 'text-center'},
 		{headerName: "스타일구분", field: "styleYear", width: 80, cellClass: 'text-center'},
 		{headerName: "정상/이월", field: "formalGb", width: 80, cellClass: 'text-center'},
-		{headerName: "등록자", field: "regNo", width: 80, cellClass: 'text-center'},
-		{headerName: "등록일시", field: "regDt", width: 80, cellClass: 'text-center'}
+		{headerName: "등록자", field: "regNm", width: 80, cellClass: 'text-center'},
+		{headerName: "등록일시", field: "regDt", width: 150, cellClass: 'text-center'}
 	];
 
 	let gridOptions = gagaAgGrid.getGridOptions(columnDefs1);