Merge branch 'eskim' into develop

src/main/java/com/style24/persistence/domain/Itemkind.java

@@ -16,8 +16,9 @@ public class Itemkind extends TscBaseDomain {
 
 	private String itemkindCd;		// 품목코드
 	private String itemkindNm;		// 품목명
-	//private String itemkindEnm;		// 품목영문명
+	//private String itemkindEnm;	// 품목영문명
 	private String niClsfCd;		// 고시분류코드
+	private String sizeGb;			// 사이즈구분(T:상의, B:하의, S:신발)
 	private String useYn;			// 사용여부
 	private String itemkindLeafNm;		// leaf 품목명
 

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

@@ -8,6 +8,7 @@
 		SELECT ITEMKIND_CD
 		     , ITEMKIND_NM
 		     , NI_CLSF_CD
+		     , SIZE_GB
 		     , USE_YN
 		     , REPLACE(SUBSTRING_INDEX(ITEMKIND_NM, '>', -2) ,'>','') AS ITEMKIND_LEAF_NM
 		FROM TB_ITEMKIND
@@ -28,6 +29,7 @@
 		       ITEMKIND_CD
 		     , ITEMKIND_NM
 		     , NI_CLSF_CD
+		     , SIZE_GB
 		     , USE_YN
 		     , REG_NO
 		     , REG_DT
@@ -38,6 +40,7 @@
 		       #{itemkindCd}
 		     , #{itemkindNm}
 		     , #{niClsfCd}
+		     , #{sizeGb}
 		     , #{useYn}
 		     , #{regNo}
 		     , NOW()
@@ -47,6 +50,7 @@
 		ON DUPLICATE KEY UPDATE
 		       ITEMKIND_NM = #{itemkindNm}
 		     , NI_CLSF_CD = #{niClsfCd}
+		     , SIZE_GB = #{sizeGb}
 		     , USE_YN = #{useYn}
 		     , UPD_NO = #{updNo}
 		     , UPD_DT = NOW()

src/main/webapp/WEB-INF/views/goods/ItemkindBaseForm.html

@@ -47,7 +47,7 @@
 /*<![CDATA[*/
 	var useYnList = { "Y":"Yes", "N":"No" };
 	var niClsfCdList = gagajf.convertToArray([[${niClsfCdList}]]);
-
+	var sizeGbList = { "":"" ,"T":"상의", "B":"하의", "S":"신발"};
 	// specify the columns
 	var columnDefs = [
 		{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
@@ -71,6 +71,12 @@
 			valueFormatter: function (params) { return gagaAgGrid.lookupValue(niClsfCdList, params.value); },
 			valueParser: function (params) { return gagaAgGrid.lookupKey(niClsfCdList, params.newValue); }
 		},
+		{headerName: "사이즈구분", field: "sizeGb", width: 150, cellClass: 'text-center',
+			cellEditor: 'agRichSelectCellEditor',
+			cellEditorParams: { values: gagaAgGrid.extractValues(sizeGbList) },
+			valueFormatter: function (params) { return gagaAgGrid.lookupValue(sizeGbList, params.value); },
+			valueParser: function (params) { return gagaAgGrid.lookupKey(sizeGbList, params.newValue); }
+		},
 		{
 			headerName: "사용여부", field: "useYn", width: 100, minWidth: 75, cellClass: 'text-center',
 			cellEditor: 'agRichSelectCellEditor',
@@ -94,7 +100,7 @@
 
 	// 행추가
 	$('#btnAddRow').on('click', function() {
-		var data = { itemkindCd: null, itemkindNm: null, itemkindEnm: null, erpItemkindCd: null, useYn: "Y" };
+		var data = { itemkindCd: null, itemkindNm: null, niClsfCd: null, sizeGb: null, useYn: "Y" };
 		gagaAgGrid.addRowData(gridOptions, data, "itemkindCd");
 	});