색상관리

style24.admin/src/main/java/com/style24/persistence/domain/Color.java

@@ -19,6 +19,7 @@ public class Color extends TsaBaseDomain {
 	private String colorKnm;		// 색상한글명
 	private String colorFile;		// 색상파일
 	private String colorGrpNm;		// 색상그룹명
+	private String colorGrpCd;		// 색상그룹코드
 	private String useYn;			// 사용여부
 
 }

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

@@ -68,11 +68,11 @@
 		     , COLOR_FILE
 		     , COLOR_GRP_NM
 		     , USE_YN
-		     /*, FN_GET_USER_NM(REG_NO) AS REG_NM*/
-		     , TO_CHAR(REG_DT, 'YYYYMMDDHH24MISS') AS REG_DT
-		     /*, FN_GET_USER_NM(UPD_NO) AS UPD_NM*/
-		     , TO_CHAR(UPD_DT, 'YYYYMMDDHH24MISS') AS UPD_DT
-		     , GROUP_COLOR_CD
+		     , FN_GET_USER_NM(REG_NO) AS REG_NM
+		     , DATE_FORMAT(REG_DT, '%Y%m%d%H%i%S') AS REG_DT
+		     , FN_GET_USER_NM(UPD_NO) AS UPD_NM
+		     , DATE_FORMAT(UPD_DT, '%Y%m%d%H%i%S') AS UPD_DT
+		     , COLOR_GRP_CD
 		FROM TB_COLOR
 		WHERE 1 = 1
 		<if test='colorCd != null and colorCd != ""'>
@@ -93,6 +93,7 @@
 		     , COLOR_KNM
 		     , COLOR_FILE
 		     , COLOR_GRP_NM
+		     , COLOR_GRP_CD
 		     , USE_YN
 		     , REG_NO
 		     , REG_DT
@@ -105,6 +106,7 @@
 		     , #{colorKnm}
 		     , #{colorFile}
 		     , #{colorGrpNm}
+		     , #{colorGrpCd}
 		     , #{useYn}
 		     , #{regNo}
 		     , NOW()
@@ -116,9 +118,11 @@
 		     , COLOR_KNM = #{colorKnm}
 		     , COLOR_FILE = UPPER(#{colorFile})
 		     , COLOR_GRP_NM = UPPER(#{colorGrpNm})
+		     , COLOR_GRP_CD = UPPER(#{colorGrpCd})
 		     , USE_YN = #{useYn}
 		     , UPD_NO = #{updNo}
 		     , UPD_DT = NOW()
 	</update>
 	
+	
 </mapper>

style24.admin/src/main/webapp/WEB-INF/views/goods/ColorForm.html

@@ -30,7 +30,6 @@
 				<ul class="panelBar">
 					<li>
 						<button type="button" class="btn btn-dark btn-sm" id="btnAddRow">행추가</button>
-						<button type="button" class="btn btn-danger btn-sm" id="btnDeleteRow">행삭제</button>
 					</li>
 					<li  class="right">
 						<button type="button" class="btn btn-success btn-lg" id="btnSave">저장</button>
@@ -67,23 +66,23 @@
 			cellEditor: 'textCellEditor',
 			cellEditorParams: { maxlength: 50, required: true }
 		},
-		{headerName: "RGB색상코드", field: "colorGrpFile", width: 100, cellClass: 'text-center',
+		{headerName: "RGB색상코드", field: "colorFile", width: 100, cellClass: 'text-center',
 			cellEditor: 'textCellEditor',
 			cellEditorParams: { maxlength: 7, required: true, onblur: '$(this).val($(this).val().toUpperCase())' }
 		},
 		{headerName: "색상", width: 60, cellClass: 'text-center', editable: false,
 			cellStyle : function(params){
-				return { 'background-color': params.data.colorGrpFile};
+				return { 'background-color': params.data.colorFile};
 			}
 		},
-		{headerName: "그룹색상명", field: "groupColorCd", width: 180, cellClass: 'text-left',
+		{headerName: "그룹색상명", field: "colorGrpCd", width: 180, cellClass: 'text-left',
 			cellEditor: 'agRichSelectCellEditor',
 			cellEditorParams: { values: gagaAgGrid.extractValues(groupColorCodeList), required: true },
 			valueFormatter: function (params) { return gagaAgGrid.lookupValue(groupColorCodeNmList, params.value); }
 		},
 		{headerName: "그룹색상", width: 80, cellClass: 'text-center', editable: false,
 			cellStyle : function(params){
-				return { 'background-color': gagaAgGrid.lookupValue(groupColorCodeList, params.data.groupColorCd)};
+				return { 'background-color': gagaAgGrid.lookupValue(groupColorCodeList, params.data.colorGrpCd)};
 			}
 		},
 		{headerName: "사용여부", field: "useYn", width: 100, minWidth: 75, cellClass: 'text-center',
@@ -144,22 +143,22 @@
 		var optCheck = false;
 		$.each(changedData, function(idx, item) {
 
-			if (item.colorGrpFile.indexOf("#") !=0 ) {
+			if (item.colorFile.indexOf("#") !=0 ) {
 				optCheck = true;
 				mcxDialog.alertC("RGB색상코드는 #으로 시작해주세요.", {
 					sureBtnText: "확인",
 					sureBtnClick: function() {
-						gridOptions.api.setFocusedCell(idx, "colorGrpFile", null);
+						gridOptions.api.setFocusedCell(idx, "colorFile", null);
 					}
 				});
 				return false;
 			}
-			if (item.colorGrpFile.length != 7 ) {
+			if (item.colorFile.length != 7 ) {
 				optCheck = true;
 				mcxDialog.alertC("RGB색상코드는 #포함 7자리로 입력해주세요.", {
 					sureBtnText: "확인",
 					sureBtnClick: function() {
-						gridOptions.api.setFocusedCell(idx, "colorGrpFile", null);
+						gridOptions.api.setFocusedCell(idx, "colorFile", null);
 					}
 				});
 				return false;

style24.admin/target/classes/com/style24/persistence/mybatis/shop/TsaRenderer.xml

@@ -240,8 +240,7 @@
 		     , COLOR_KNM AS CD_DESC
 		     , USE_YN
 		FROM   TB_COLOR
-		WHERE  SUPPLY_COMP_CD = #{supplyCompCd}
-		AND    USE_YN = 'Y'
+		WHERE  USE_YN = 'Y'
 		<if test='colorCd != null and colorCd != ""'>
 		AND    COLOR_CD = #{colorCd}
 		</if>
@@ -351,5 +350,16 @@
 		WHERE  AF_CHANNEL = #{afChannel}
 		AND    USE_YN = 'Y'
 	</select>
+	
+	<!-- 코드설명 목록 -->
+	<select id="getCommonCodeDescList" parameterType="String" resultType="CommonCode">
+		/* TsaRenderer.getCommonCodeDescList */
+		SELECT CD
+			 , CD_DESC AS CD_NM
+		FROM TB_COMMON_CODE
+		WHERE 1=1
+		AND CD_GB = #{cdGb}
+		AND USE_YN = 'Y'
+	</select>
 
 </mapper>