입점 상품 승인관련 수정

src/main/java/com/style24/admin/biz/service/TsaGoodsService.java

@@ -1566,7 +1566,7 @@ public class TsaGoodsService {
 		String goodsCd = "";
 		Goods goods = new Goods();
 		goodsDao.createGoodsSequence(goods);
-		String goodsSeq = GagaStringUtil.getLPadding(Integer.toString(goods.getGoodsSq()), 9, "0");
+		String goodsSeq = GagaStringUtil.getLPadding(Integer.toString(goods.getGoodsSq()), 8, "0");
 		if ("S".equals(goodsType) || "D".equals(goodsType)) {
 			goodsCd = SELF_GOOODS_AFTER + goodsCdAfter + goodsSeq;
 

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

@@ -1435,9 +1435,12 @@
 		FROM (
 		      SELECT A.GOODS_CD 
 		           , A.MAIN_COLOR_CD 
-		           , B.OPT_CD1 
+		           , NVL(B.OPT_CD1,'00') AS OPT_CD1
 		      FROM TB_GOODS A
 		      LEFT OUTER JOIN TB_OPTION B ON A.GOODS_CD = B.GOODS_CD
+		                                  AND 1 = (CASE WHEN A.SELF_GOODS_YN = 'Y' THEN 1
+		                                                ELSE 2 END
+		                                          )
 		      WHERE A.GOODS_CD  = #{goodsCd}
 		      GROUP BY A.GOODS_CD , B.OPT_CD1
 		     ) A 

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

@@ -1250,7 +1250,7 @@
 
 			// SUPER관리자, 어드민관리자, 계정관리자. 총괄관리자, MD 를 제외하고 승인처리 할수 없음
 			if ("G001_0000" != sessRoleCd && "G001_A000" != sessRoleCd && "G001_A001" != sessRoleCd && "G001_A100" != sessRoleCd && "G001_A101" != sessRoleCd ){
-				if ($("#goodsDetailForm select[name=goodsStat]").val() == "G008_90" &&  $("#goodsDetailForm select[name=goodsStatOrg]").val() != "G008_90"){
+				if ($("#goodsDetailForm select[name=goodsStat]").val() == "G008_90" &&  $("#goodsDetailForm input[name=goodsStatOrg]").val() != "G008_90"){
 					mcxDialog.alert(" '승인완료' 상태로 변경할 권한이 없습니다.");
 					return false;
 				}

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

@@ -65,7 +65,7 @@
 			cellEditor: 'textCellEditor',
 			cellEditorParams: { maxlength: 50, required: true }
 		},
-		{headerName: "색상코드", field: "colorCd", width: 100, cellClass: 'text-center',editable: true,
+		{headerName: "온라인 색상", field: "colorCd", width: 100, cellClass: 'text-center',editable: true,
 			cellEditor: 'agRichSelectCellEditor',
 			cellEditorParams: { values: gagaAgGrid.extractValues(colorList) },
 			valueFormatter: function (params) { return gagaAgGrid.lookupValue(colorList, params.value); },