Merge branch 'eskim' into develop

Conflicts:
	style24.admin/.gitignore
	style24.core/.gitignore
	style24.scm/.gitignore

style24.admin/.gitignore

@@ -1 +1 @@
-/target/
+/target/

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

@@ -759,6 +759,7 @@ public class TsaGoodsService {
 			goods.setGoodsSnm(goodsSnm);
 		}
 
+		goods.setFormalGb(goods.getFormalGb());
 		// 브랜드 확인
 		if (!"G056_N".equals(goods.getGoodsType())) {
 			if (!goods.getFormalGb().equals(goods.getFormalGbOrg())) {
@@ -781,12 +782,6 @@ public class TsaGoodsService {
 					goods.setPntMrate(pntMrate); // 포인트적립율(MOBILE)
 				}
 			}
-		} else {
-			if ("N".equals(goods.getSelfGoodsYn())) {
-				goods.setFormalGb(goods.getFormalGb());
-			} else {
-				goods.setFormalGb(goods.getFormalGbOrg());
-			}
 		}
 
 		// 기본정보 변경
@@ -852,6 +847,11 @@ public class TsaGoodsService {
 		goodsDesc.setUpdNo(goods.getUpdNo());
 
 		// PC 상단
+		goodsDesc.setDescGb("10");
+		goodsDesc.setGoodsDesc(goods.getGoodsPcTopDesc());
+		this.saveGoodsDesc(goodsDesc);
+
+		// PC 하단
 		goodsDesc.setDescGb("20");
 		goodsDesc.setGoodsDesc(goods.getGoodsPcTopDesc());
 		this.saveGoodsDesc(goodsDesc);
@@ -867,9 +867,7 @@ public class TsaGoodsService {
 		this.saveGoodsDesc(goodsDesc);
 
 		//		// 상품상세 저장
-		//		goodsDesc.setDescGb("10");
-		//		goodsDesc.setGoodsDesc(this.setGoodsDescSb(goods).toString());
-		//		this.saveGoodsDesc(goodsDesc);
+
 		//
 		//		// 세트상품의 구서상품으로 있을경우 처리
 		//		this.saveGoodsSetDesc(goodsDesc);

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

@@ -392,7 +392,7 @@ public class TsaGoodsController extends TsaBaseController {
 	@PostMapping("/state/update")
 	@ResponseBody
 	public GagaMap updateGoodsState(@RequestBody Goods goods) {
-		log.info("updateGoodsState goods={}", goods);
+
 		GagaMap result = new GagaMap();
 		result.set("status", GagaResponseStatus.SUCCESS.getCode()); // 200
 		result.set("procJob", goods.getProcJob());
@@ -536,8 +536,8 @@ public class TsaGoodsController extends TsaBaseController {
 		// 공급업체
 		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList(supplyCompCd));
 
-		String[] exceptCds = {"G008_00"};
-		mav.addObject("goodsStatList", rendererService.getCommonCodeList("G008", "Y", exceptCds));
+		String[] goodsStatExceptCds = {"G008_00"};
+		mav.addObject("goodsStatList", rendererService.getCommonCodeList("G008", "Y", goodsStatExceptCds));
 
 		// 정상이월
 		mav.addObject("formalGbList", rendererService.getAvailCommonCodeList("G009"));
@@ -557,6 +557,11 @@ public class TsaGoodsController extends TsaBaseController {
 		mav.addObject("goodsTypeList", rendererService.getAvailCommonCodeList("G056"));
 		// 상품구분
 		mav.addObject("goodsGbList", rendererService.getAvailCommonCodeList("G073"));
+		// 유통구분
+		String[] distributionGbExceptCds = {"G065_20"};
+		mav.addObject("distributionGbList", rendererService.getCommonCodeList("G065", "Y", distributionGbExceptCds));
+		// 상품연령대
+		mav.addObject("ageGrpCdList", rendererService.getAvailCommonCodeList("G023"));
 		// 색상
 		Color color = new Color();
 		mav.addObject("colorList", rendererService.getColorList(color));
@@ -685,6 +690,184 @@ public class TsaGoodsController extends TsaBaseController {
 		return super.ok(message.getMessage("SUCC_0001"));
 	}
 
+	/**
+	 * 상품 상세 저장
+	 *
+	 * @param goods
+	 * @return
+	 * @author eskim
+	 * @since 2020. 10. 27
+	 */
+	@PostMapping("/detail/save")
+	@ResponseBody
+	public GagaResponse saveGoodsDetail(@RequestBody Goods goods) {
+
+		// 상품상태에 따른 이미지 정보 확인 - 상품상태가 승인대기나 승인 완료일 경우
+		if ("G008_40".equals(goods.getGoodsStat()) || "G008_90".equals(goods.getGoodsStat())) {
+			Collection<Goods> goodsList = goodsService.getGoodsImgsYn(goods);
+			String goodsImageYn = "N";
+			for (Goods tmpGoods : goodsList) {
+				goodsImageYn = tmpGoods.getGoodsImageYn();
+			}
+			if ("N".equals(goodsImageYn)) {
+				throw new IllegalStateException("필수 이미지나 고시정보가 등록되지 않은 상품은 <br/>'승인대기'나 '승인완료' 상태로 변경할 수 없습니다.");
+			}
+		}
+
+		Collection<GoodsNotiInfo> notiList = null;
+		Collection<GoodsCompose> goodComposeList = null;
+		Collection<CodiGoods> codiGoodList = null;
+		ObjectMapper mapper = new ObjectMapper();
+		try {
+			if (goods.getNotiList() != null) {
+				notiList = mapper.readValue(goods.getNotiList(), new TypeReference<Collection<GoodsNotiInfo>>() {
+				});
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		try {
+			if (goods.getCodiGoodsList() != null) {
+				codiGoodList = mapper.readValue(goods.getCodiGoodsList(), new TypeReference<Collection<CodiGoods>>() {
+				});
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		try {
+			if (goods.getGoodsComposeList() != null) {
+				goodComposeList = mapper.readValue(goods.getGoodsComposeList(), new TypeReference<Collection<GoodsCompose>>() {
+				});
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		goods.setNotiListNew(notiList);
+		goods.setGoodsComposeListNew(goodComposeList);
+		goods.setCodiGoodsListNew(codiGoodList);
+
+		goodsService.saveGoodsDetail(goods);
+		return super.ok(message.getMessage("SUCC_0001"));
+	}
+
+	/**
+	 * 코디상품 삭제
+	 *
+	 * @param codiGoodsList
+	 * @author eskim
+	 * @since 2020. 10. 28
+	 */
+	@PostMapping("/codi/delete")
+	@ResponseBody
+	public GagaResponse deleteCodiGoods(@RequestBody Collection<CodiGoods> codiGoodsList) {
+
+		goodsService.deleteCodiGoods(codiGoodsList);
+		return super.ok(message.getMessage("SUCC_0003"));
+	}
+
+	/**
+	 * 세트상품구성 화면
+	 *
+	 * @param
+	 * @return
+	 * @author eskim
+	 * @since 2020. 05. 26
+	 */
+	@GetMapping("/set/form")
+	@ResponseBody
+	public ModelAndView setForm(Goods goods) {
+		ModelAndView mav = new ModelAndView();
+
+		// 사용여부
+		mav.addObject("useYnList", rendererService.getAvailCommonCodeList("G002"));
+		// 정상이월
+		mav.addObject("formalGbList", rendererService.getAvailCommonCodeList("G009"));
+		// 성별
+		mav.addObject("sexGbList", rendererService.getAvailCommonCodeList("G007"));
+		// 시즌
+		mav.addObject("seasonList", rendererService.getAvailCommonCodeList("G006"));
+		// 스타일년도
+		mav.addObject("styleYearList", rendererService.getAvailCommonCodeList("G023"));
+		// 매입유형
+		mav.addObject("buyingTypeList", rendererService.getAvailCommonCodeList("G035"));
+		// 상품상태
+		// mav.addObject("goodsStatList",
+		// rendererService.getAvailCommonCodeList("G008"));
+		String[] exceptCds = {"00"};
+		mav.addObject("goodsStatList", rendererService.getCommonCodeList("G008", "Y", exceptCds));
+
+		mav.addObject("params", goods);
+		mav.setViewName("goods/GoodsSetForm");
+		return mav;
+	}
+
+//	/**
+//	 * 세트 상품 등록
+//	 *
+//	 * @param goods
+//	 * @return
+//	 * @author eskim
+//	 * @since 2020. 06. 12
+//	 */
+//	@PostMapping("/set/save")
+//	@ResponseBody
+//	public GagaResponse saveGoodsSet(@RequestBody Goods goods) {
+//		goodsService.saveGoodsSet(goods);
+//		return super.ok(message.getMessage("SUCC_0001"));
+//	}
+
+	/**
+	 * 딜상품구성 화면
+	 *
+	 * @param
+	 * @return
+	 * @author eskim
+	 * @since 2020. 05. 26
+	 */
+	@GetMapping("/deal/form")
+	@ResponseBody
+	public ModelAndView dealForm(Goods goods) {
+		ModelAndView mav = new ModelAndView();
+
+		// 사용여부
+		mav.addObject("useYnList", rendererService.getAvailCommonCodeList("G002"));
+		// 정상이월
+		mav.addObject("formalGbList", rendererService.getAvailCommonCodeList("G009"));
+		// 성별
+		mav.addObject("sexGbList", rendererService.getAvailCommonCodeList("G007"));
+		// 시즌
+		mav.addObject("seasonList", rendererService.getAvailCommonCodeList("G006"));
+		// 스타일년도
+		mav.addObject("styleYearList", rendererService.getAvailCommonCodeList("G023"));
+		// 매입유형
+		mav.addObject("buyingTypeList", rendererService.getAvailCommonCodeList("G035"));
+		// 상품상태
+		// mav.addObject("goodsStatList",
+		// rendererService.getAvailCommonCodeList("G008"));
+		String[] exceptCds = {"00"};
+		mav.addObject("goodsStatList", rendererService.getCommonCodeList("G008", "Y", exceptCds));
+
+		mav.addObject("params", goods);
+		mav.setViewName("goods/GoodsDealForm");
+		return mav;
+	}
+
+//	/**
+//	 * 딜 상품 등록
+//	 *
+//	 * @param goods
+//	 * @return
+//	 * @author eskim
+//	 * @since 2020. 06. 14
+//	 */
+//	@PostMapping("/deal/save")
+//	@ResponseBody
+//	public GagaResponse saveGoodsDeal(@RequestBody Goods goods) {
+//		goodsService.saveGoodsDeal(goods);
+//		return super.ok(message.getMessage("SUCC_0001"));
+//	}
+
 	/**
 	 * 상품 대량 등록 화면
 	 *
@@ -927,80 +1110,5 @@ public class TsaGoodsController extends TsaBaseController {
 		return result;
 	}
 
-	/**
-	 * 상품 상세 저장
-	 *
-	 * @param goods
-	 * @return
-	 * @author eskim
-	 * @since 2020. 10. 27
-	 */
-	@PostMapping("/detail/save")
-	@ResponseBody
-	public GagaResponse saveGoodsDetail(@RequestBody Goods goods) {
-
-		// 상품상태에 따른 이미지 정보 확인 - 상품상태가 승인대기나 승인 완료일 경우
-		if ("G008_40".equals(goods.getGoodsStat()) || "G008_90".equals(goods.getGoodsStat())) {
-			Collection<Goods> goodsList = goodsService.getGoodsImgsYn(goods);
-			String goodsImageYn = "N";
-			for (Goods tmpGoods : goodsList) {
-				goodsImageYn = tmpGoods.getGoodsImageYn();
-			}
-			if ("N".equals(goodsImageYn)) {
-				throw new IllegalStateException("필수 이미지나 고시정보가 등록되지 않은 상품은 <br/>'승인대기'나 '승인완료' 상태로 변경할 수 없습니다.");
-			}
-		}
 
-		Collection<GoodsNotiInfo> notiList = null;
-		Collection<GoodsCompose> goodComposeList = null;
-		Collection<CodiGoods> codiGoodList = null;
-		ObjectMapper mapper = new ObjectMapper();
-		try {
-			if (goods.getNotiList() != null) {
-				notiList = mapper.readValue(goods.getNotiList(), new TypeReference<Collection<GoodsNotiInfo>>() {
-				});
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		try {
-			if (goods.getCodiGoodsList() != null) {
-				codiGoodList = mapper.readValue(goods.getCodiGoodsList(), new TypeReference<Collection<CodiGoods>>() {
-				});
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		try {
-			if (goods.getGoodsComposeList() != null) {
-				goodComposeList = mapper.readValue(goods.getGoodsComposeList(), new TypeReference<Collection<GoodsCompose>>() {
-				});
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-
-		goods.setNotiListNew(notiList);
-		goods.setGoodsComposeListNew(goodComposeList);
-		goods.setCodiGoodsListNew(codiGoodList);
-		log.info("[saveGoodsDetail] goods = {}", goods);
-		goodsService.saveGoodsDetail(goods);
-		return super.ok(message.getMessage("SUCC_0001"));
-	}
-
-	/**
-	 * 코드상품 삭제
-	 *
-	 * @param codiGoodsList
-	 * @author eskim
-	 * @since 2020. 10. 28
-	 */
-	@PostMapping("/codi/delete")
-	@ResponseBody
-	public GagaResponse deleteCodiGoods(@RequestBody Collection<CodiGoods> codiGoodsList) {
-		log.info("codiGoodsList = {}", codiGoodsList);
-		goodsService.deleteCodiGoods(codiGoodsList);
-		return super.ok(message.getMessage("SUCC_0003"));
-	}
 }

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

@@ -25,6 +25,7 @@ public class CodiGoods extends TscBaseDomain {
 	private String imgType;
 	private String imgPath1;
 	private String imgPath6;
+	private String crud;
 
 }
 

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

@@ -1062,8 +1062,8 @@
 	<update id="updateGoodsSnm" parameterType="Goods">
 		/* TsaGoods.updateGoodsSnm */
 		UPDATE TB_GOODS A
-		SET UPD_ID = #{updId}
-		  , UPD_DT = SYSDATE
+		SET UPD_NO = #{updNo}
+		  , UPD_DT = NOW()
 		  , GOODS_SNM = #{goodsSnm} 
 		WHERE GOODS_CD = #{goodsCd}
 	</update>
@@ -1076,12 +1076,6 @@
 		     , NVL(C.NI_CONTENT, D.NI_CONTENT) AS NI_CONTENT
 		     , D.DISP_ORD
 		FROM (
-		       SELECT NI_ITEM_CD
-		            , NI_CONTENT 
-		       FROM TB_GOODS_NOTI_INFO
-		       WHERE GOODS_CD = #{goodsCd}
-		   ) C
-		   , (
 		       SELECT A.NI_CLSF_CD
 		          , A.NI_ITEM_CD
 		          , A.NI_CONTENT
@@ -1091,8 +1085,16 @@
 		       WHERE A.NI_CLSF_CD = B.NI_CLSF_CD
 		       AND A.SUPPLY_COMP_CD = #{supplyCompCd}
 		       AND B.ITEMKIND_CD = #{itemkindCd}
-		   ) D
-		WHERE D.NI_ITEM_CD = C.NI_ITEM_CD (+)
+		     ) D
+		    LEFT OUTER JOIN (
+		       SELECT NI_ITEM_CD
+		            , NI_CONTENT 
+		       FROM TB_GOODS_NOTI_INFO
+		       WHERE GOODS_CD = #{goodsCd}
+		     ) C
+		     ON (
+		       C.NI_ITEM_CD = D.NI_ITEM_CD
+		     )
 		ORDER BY D.DISP_ORD
 	</select>
 	
@@ -1175,7 +1177,7 @@
 		SELECT #{goodsCd} AS GOODS_CD
 		     , A.GOODS_CD AS COMPS_GOODS_CD
 		     , A.OPT_CD
-		     , CONCAT(A.OPT_NM1,  NVL2(A.OPT_NM2, CONCAT('/', A.OPT_NM2), '')) AS OPT_NM 
+		     , CONCAT(A.OPT_NM1,  NVL2(A.OPT_NM2, '', CONCAT('/', A.OPT_NM2))) AS OPT_NM 
 		     , A.OPT_NM1
 		     , A.OPT_NM2
 		     , A.BASE_STOCK_QTY
@@ -1271,6 +1273,8 @@
 		                                          ELSE FRST_CFRM_DT END)
 		  , PRE_PPNT_USABLE_YN = #{prePpntUsableYn}
 		  , PRE_MPNT_USABLE_YN = #{preMpntUsableYn}
+		  , DISTRIBUTION_GB = #{distributionGb}
+		  , AGE_GRP_CD = #{ageGrpCd}
 		  , UPD_NO = #{updNo}
 		  , UPD_DT = NOW()
 		WHERE GOODS_CD = #{goodsCd}
@@ -1279,7 +1283,7 @@
 	<!-- 상품 상세정보 삭제 -->
 	<delete id="deleteGoodsDesc" parameterType="GoodsDesc">
 		/* TsaGoods.deleteGoodsDesc */
-		DELETE TB_GOODS_DESC
+		DELETE FROM TB_GOODS_DESC
 		WHERE GOODS_CD = #{goodsCd}
 		AND DESC_GB = #{descGb}
 	</delete>
@@ -1299,7 +1303,7 @@
 		    #{goodsCd}
 		  , #{descGb}
 		  , #{seq}
-		  , REPLACE(#{goodsDesc},'char(13)', CONCAT(char(13),char(10))
+		  , REPLACE(#{goodsDesc},char(13), CONCAT(char(13),char(10)))
 		  , #{regNo}
 		  , NOW()
 		)
@@ -1478,5 +1482,4 @@
 		WHERE GOODS_CD = #{goodsCd}
 		AND CODI_GOODS_CD = #{codiGoodsCd}
 	</delete>
-	
 </mapper>

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

@@ -6,7 +6,7 @@
  * @source  : GoodsDetailForm.html
  * @desc    : 상품 상세 팝업
  *============================================================================
- * SISUN
+ * SISUNChDataYn
  * Copyright(C) 2020 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION
@@ -158,7 +158,7 @@
 										</td>
 									</tr>
 									<tr>
-										<td rowspan="10">&nbsp;</td>
+										<td rowspan="11">&nbsp;</td>
 										<th>시즌<em class="required" title="필수"></em></th>
 										<td >
 											<select  name="seasonCd" id="seasonCd">
@@ -190,6 +190,23 @@
 											</select>
 											<input type="hidden" id="goodsGbOrg" name="goodsGbOrg"/>
 										</td>
+										<th>유통구분<em class="required" title="필수"></em></th>
+										<td><select  name="distributionGb" id="distributionGb">
+												<option value="">[선택]</option>
+												<option th:if="${distributionGbList}" th:each="oneData, status : ${distributionGbList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
+											</select>
+											<input type="hidden" id="distributionGbOrg" name="distributionGbOrg"/>
+										</td>
+									</tr>
+									<tr id="erplinkarea">
+										<th>상품연령대</th>
+										<td>
+											<select  name="ageGrpCd" id="ageGrpCd">
+												<option value="">[선택]</option>
+												<option th:if="${ageGrpCdList}" th:each="oneData, status : ${ageGrpCdList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
+											</select>
+											<input type="hidden" id="ageGrpCdOrg" name="ageGrpCdOrg"/>
+										</td>
 										<th>가격변경일</th>
 										<td colspan="3"><span id="priceUpdDtTxt"></span></td>
 									</tr>
@@ -518,19 +535,19 @@
 		//{headerName: 'No', width: 60, cellClass: 'text-center', valueGetter: function(params) { return params.node.rowIndex + 1 }},
 		{headerName: "이미지", field: "imgPath1", width: 100, height: 60, cellClass: 'text-center'
 			,cellRenderer: function(params) {
-				if (params.data.imgType == "A"){
+				if (params.data.imgType == "G030_A"){
 					if(!gagajf.isNull(params.data.imgPath6)){
-						return '<img width="60" src="'+ uploadGoodsUrl+params.data.imgPath6 + '" alt=""  onerror="this.src=\'/image/no.gif\';"/>';
+						return '<img width="60" src="'+ params.data.imgPath1 + '" alt="" onerror="this.src=\'/image/no.gif\';"/>';
 					}else{
-						return '<img width="60" src="'+ uploadGoodsUrl+params.value + '" alt=""  onerror="this.src=\'/image/no.gif\';"/>';
+						return '<img width="60" src="'+ params.value + '" alt="" onerror="this.src=\'/image/no.gif\';"/>';
 					}	
+						
 				}else{
 					if(!gagajf.isNull(params.data.imgPath6)){
-						return '<img width="60" src="'+ params.data.imgPath1 + '" alt="" onerror="this.src=\'/image/no.gif\';"/>';
+						return '<img width="60" src="'+ uploadGoodsUrl+params.data.imgPath6 + '" alt=""  onerror="this.src=\'/image/no.gif\';"/>';
 					}else{
-						return '<img width="60" src="'+ params.value + '" alt="" onerror="this.src=\'/image/no.gif\';"/>';
+						return '<img width="60" src="'+ uploadGoodsUrl+params.value + '" alt=""  onerror="this.src=\'/image/no.gif\';"/>';
 					}
-					
 				}
 			}
 		},
@@ -539,8 +556,8 @@
 			valueFormatter: function (params) { return gagaAgGrid.lookupValue(goodsTypeList, params.value); },
 			valueParser: function (params) { return gagaAgGrid.lookupKey(goodsTypeList, params.newValue); }
 		},
-		{headerName: "구성상품코드", field: "extendGoodsCd" , width: 130, cellClass: 'text-center'},
-		{headerName: "구성상품코드명", field: "extendGoodsCdNm" , width: 200, cellClass: 'text-left'},
+		{headerName: "구성상품코드", field: "compsGoodsCd" , width: 130, cellClass: 'text-center'},
+		{headerName: "구성상품코드명", field: "compsGoodsCdNm" , width: 200, cellClass: 'text-left'},
 		//{headerName: "순서", field: "dispOrd" , width: 80, cellClass: 'text-right',editable: true, required: true},
 		{headerName: "수량", field: "qty" , width: 100, cellClass: 'text-right'
 			,valueFormatter: function(params) { return Number(params.value).addComma();}
@@ -558,7 +575,7 @@
 			valueFormatter: function (params) { return gagaAgGrid.lookupValue(useYnList, params.value); },
 			valueParser: function (params) { return gagaAgGrid.lookupKey(useYnList, params.newValue); }
 		},
-		{headerName: "옵션명(딜상품용)", field: "extendGoodsOptNm" , width: 200, cellClass: 'text-left',editable: true, required: true},
+		{headerName: "옵션명(딜상품용)", field: "compsGoodsOptNm" , width: 200, cellClass: 'text-left',editable: true, required: true},
 		{headerName: "상품상태", field: "goodsStat" , width: 100, cellClass: 'text-center',
 			cellEditorParams: { values: gagaAgGrid.extractValues(goodsStatList) },
 			valueFormatter: function (params) { return gagaAgGrid.lookupValue(goodsStatList, params.value); },
@@ -586,19 +603,19 @@
 		//{headerName: 'No', width: 60, cellClass: 'text-center', valueGetter: function(params) { return params.node.rowIndex + 1 }},
 		{headerName: "이미지", field: "imgPath1", width: 100, height: 60, cellClass: 'text-center'
 			,cellRenderer: function(params) {
-				if (params.data.imgType == "A"){
+				if (params.data.imgType == "G030_A"){
 					if(!gagajf.isNull(params.data.imgPath6)){
-						return '<img width="60" src="'+ uploadGoodsUrl+params.data.imgPath6 + '" alt=""  onerror="this.src=\'/image/no.gif\';"/>';
+						return '<img width="60" src="'+ params.data.imgPath6 + '" alt="" onerror="this.src=\'/image/no.gif\';"/>';
 					}else{
-						return '<img width="60" src="'+ uploadGoodsUrl+params.value + '" alt=""  onerror="this.src=\'/image/no.gif\';"/>';
-					}	
+						return '<img width="60" src="'+ params.value + '" alt="" onerror="this.src=\'/image/no.gif\';"/>';
+					}
+						
 				}else{
 					if(!gagajf.isNull(params.data.imgPath6)){
-						return '<img width="60" src="'+ params.data.imgPath1 + '" alt="" onerror="this.src=\'/image/no.gif\';"/>';
+						return '<img width="60" src="'+ uploadGoodsUrl+params.data.imgPath6 + '" alt=""  onerror="this.src=\'/image/no.gif\';"/>';
 					}else{
-						return '<img width="60" src="'+ params.value + '" alt="" onerror="this.src=\'/image/no.gif\';"/>';
+						return '<img width="60" src="'+ uploadGoodsUrl+params.value + '" alt=""  onerror="this.src=\'/image/no.gif\';"/>';
 					}
-					
 				}
 			}
 		},
@@ -650,7 +667,7 @@
 	// 상품상세 조회
 	var fnGoodsDeailSearch = function() {
 
-		$('#goodsDetailForm').find('.tabs .tabsNav li a').attr("style", "color:#888;");
+		$('#goodsDetailForm').find('.tabs .tabsNav li a').attr("style", "color:#888;");  //탭색 초기화
 
 		var params = new Object();
 		params.mode = $('#goodsDetailForm input[name=mode]').val();
@@ -720,6 +737,11 @@
 			$('#goodsDetailForm').find('#priceUpdDtTxt').html(!gagajf.isNull(result.priceUpdDt) ? result.priceUpdDt.toDate("YYYYMMDDHHmmss").format("YYYY-MM-DD") : '');
 			$('#goodsDetailForm').find('#frstCfrmDtTxt').html(!gagajf.isNull(result.frstCfrmDt) ? result.frstCfrmDt.toDate("YYYYMMDDHHmmss").format("YYYY-MM-DD") : '');
 
+			$('#goodsDetailForm select[name=distributionGb]').val(result.distributionGb);
+			$("#goodsDetailForm input[name=distributionGbOrg]").val(result.distributionGb);
+			$('#goodsDetailForm select[name=ageGrpCd]').val(result.ageGrpCd);
+			$("#goodsDetailForm input[name=ageGrpCdOrg]").val(result.ageGrpCd);
+			
 			$("#goodsDetailForm input[type=radio]").parent().removeClass("checked");
 			$("#goodsDetailForm input[type=radio]").removeAttr('checked');
 			
@@ -762,6 +784,7 @@
 			$("#goodsDetailForm input[name=prePpntUsableYnOrg]").val(result.prePpntUsableYn);
 			$("#goodsDetailForm input[name=preMpntUsableYnOrg]").val(result.preMpntUsableYn);
 			$("#goodsDetailForm input[name=changeableYnOrg]").val(result.changeableYn);
+			
 
 			$("#goodsDetailForm input[type=radio][checked]").addClass("checked");
 			//$("#goodsDetailForm input[type=radio][checked]").parent("label").addClass("checked");
@@ -886,6 +909,11 @@
 			fnGoodsDetailHstSearch();
 
 		}
+		
+		//기본정보탭 변경여부
+		$('#goodsDetailForm').find('#goodstab1').find("input, select, textarea").on('change', function() {
+			$('#goodsDetailForm').find('.tabs .tabsNav li:eq(0) a').attr("style", "color:red;");
+		});
 	}
 
 	//옵셥 재고
@@ -903,12 +931,12 @@
 		if ("G056_S" == params.goodsType){	//세트
 			gagaAgGrid.showOrHideColumn(gridGoodsComposeOptions, 'currPrice', false);
 			gagaAgGrid.showOrHideColumn(gridGoodsComposeOptions, 'useYn', false);
-			gagaAgGrid.showOrHideColumn(gridGoodsComposeOptions, 'extendGoodsOptNm', false);
+			gagaAgGrid.showOrHideColumn(gridGoodsComposeOptions, 'compsGoodsOptNm', false);
 			
 			$('#GoodsComposeBtnArea').addClass("off");
 		}else{	//딜
 			gagaAgGrid.showOrHideColumn(gridGoodsComposeOptions, 'qty', false);
-			gagaAgGrid.showOrHideColumn(gridGoodsComposeOptions, 'extendcompsCurrPrice', false);
+			gagaAgGrid.showOrHideColumn(gridGoodsComposeOptions, 'compsCurrPrice', false);
 		}
 		gagaAgGrid.fetch("/goods/detail/compose/list?goodsCd=" + params.goodsCd , gridGoodsComposeOptions);
 	}	
@@ -977,8 +1005,7 @@
 
 		var listPrice = $("#goodsDetailForm input[name=listPrice]").val().removeComma();
 		var currPrice = $("#goodsDetailForm input[name=currPrice]").val().removeComma();
-		//dcRate = Math.round(100 - Math.floor((Number(currPrice) / Number(listPrice) * 100)*100)/100);
-		dcRate = 100 - (Number((Number(currPrice) / Number(listPrice)).toFixed(2)) *100)
+		dcRate =  100 - Math.floor(Number(currPrice) / Number(listPrice) * 100);	//절사
 
 		$("#goodsDetailForm").find("#dcRateTxt").html(dcRate);
 		$("#goodsDetailForm input[name=dcRate]").val(dcRate);
@@ -992,7 +1019,8 @@
 		var listPrice = $("#goodsDetailForm input[name=listPrice]").val().removeComma();
 		var currPrice = $("#goodsDetailForm input[name=currPrice]").val().removeComma();
 		//dcRate = Math.round(100 - Math.floor((Number(currPrice) / Number(listPrice) * 100)*100)/100);
-		dcRate = 100 - (Number((Number(currPrice) / Number(listPrice)).toFixed(2)) *100)
+		//dcRate = 100 - (Number((Number(currPrice) / Number(listPrice)).toFixed(2)) *100);
+		dcRate =  100 - Math.floor(Number(currPrice) / Number(listPrice) * 100);
 
 		if (dcRate < 0){
 			mcxDialog.alert('할인율이 0보다 작습니다.\n판매가를 확인해주세요.', function(){
@@ -1081,7 +1109,7 @@
 	}
 
 	//상품저장 버튼 클릭 시
-	$('#btnGoodsDetailSave').click(function() {
+	$('#btnGoodsDetailSave').click(function() {debugger;
 
 		var optCheck = false;
 		var idx = 0;
@@ -1487,14 +1515,15 @@
 				}
 			});
 			return false;
-		}else if (dcRate >= 90){
+		}else if (dcRate >= 90){debugger;
 			mcxDialog.confirmC("할인율이 90%이상입니다. 계속하시겠습니까?", {
 				btn: ["아니요","예"],
 				btnClick: function(index){
 					if (index == 1){
 						optCheck = true;
 					} else {
-						fnNoticheck();
+						if (!fnGoodsComposeCheck()) return false;
+						fnSaveCheck();
 					}
 				}
 			});
@@ -1502,16 +1531,15 @@
 		}else{
 			$("#goodsDetailForm").find("#dcRateTxt").html(dcRate);
 			$("#goodsDetailForm input[name=dcRate]").val(dcRate);
-			
+			fnSaveCheck();
 		}
-
 		
 		if (optCheck) return false;
 		
-		if (!fnGoodsComposeCheck()) return false;
-		
-		//fnNoticheck();
-
+	});
+	
+	//저장 관련 체크
+	var fnSaveCheck = function(idx){
 		if($("#goodsDetailForm input:checkbox[name=chkDescKeep]").is(':checked')){
 			mcxDialog.confirmC("'정보유지' 체크박스가 선택되어 있어 '상품상세설명' 항목이 저장되지 않습니다.<br/>저장을 원하시면 체크를 해제하세요. 계속하시겠습니까?", {
 				btn: ["아니요","예"],
@@ -1526,11 +1554,7 @@
 		}else{
 			fnGoodsSave();
 		}
-		
-		if (optCheck) return false;
-		
-		
-	});
+	}
 
 	// 구성 정보 관련 체크
 	var fnGoodsComposeCheck = function(){
@@ -1694,7 +1718,7 @@
 			return true;
 		}
 		//상품구분
-		if ($("#goodsDetailForm input[name=goodsGbOrg]").val() != $("input:radio[name=goodsGb]:checked").val()){
+		if ($("#goodsDetailForm input[name=goodsGbOrg]").val() != $("#goodsDetailForm select[name=goodsGb]").val()){
 			return true;
 		}
 		//상품상태
@@ -1757,6 +1781,14 @@
 		if ($("#goodsDetailForm input[name=minOrdAmtOrg]").val() != $("#goodsDetailForm input[name=minOrdAmt]").val().removeComma()){
 			return true;
 		}
+		//유통구분
+		if ($("#goodsDetailForm input[name=distributionGbOrg]").val() != $("#goodsDetailForm select[name=distributionGb]").val()){
+			return true;
+		}
+		//상품연령대
+		if ($("#goodsDetailForm input[name=ageGrpCdOrg]").val() != $("#goodsDetailForm select[name=ageGrpCd]").val()){
+			return true;
+		}
 
 		return false;
 	}
@@ -1866,7 +1898,7 @@
 				gridGoodsComposeOptions.api.updateRowData({add: [data], addIndex: idx});
 				
 				idx++;
-			
+				$('#goodsDetailForm').find('.tabs .tabsNav li:eq(5) a').attr("style", "color:red;");
 			}
 		});
 		gridGoodsComposeOptions.api.refreshCells();
@@ -1918,6 +1950,7 @@
 				gridCodiGoodsOptions.api.updateRowData({add: [data], addIndex: idx});
 				
 				idx++;
+				$('#goodsDetailForm').find('.tabs .tabsNav li:eq(4) a').attr("style", "color:red;");
 			
 			}
 		});
@@ -1933,8 +1966,6 @@
 		}
 
 		//화면에서 삭제
-		//var removedData_1 = gagaAgGrid.removeRowData(gridCodiGoodsOptions, false);
-
 		var removedData = gagaAgGrid.removeRowData(gridCodiGoodsOptions, false);
 		
 		if (removedData.length > 0) {
@@ -1983,7 +2014,6 @@
 	
 	$(document).ready(function() {
 
-		/* gagaSe.createSmartEditor(seOptions, 'goodsDesc'); */
 		gagaSe.createSmartEditor(seOptions, 'goodsPcTopDesc');
 		gagaSe.createSmartEditor(seOptions, 'goodsMobileTopDesc');
 		gagaSe.createSmartEditor(seOptions, 'goodsPcDownDesc');
@@ -1995,11 +2025,6 @@
 
 		fnGoodsDeailSearch();
 
-		//기본정보탭 변경여부
-		$('#goodsDetailForm').find('#goodstab1').find("input, select, textarea").on('change', function() {
-			$('#goodsDetailForm').find('.tabs .tabsNav li:eq(0) a').attr("style", "color:red;");
-		});
-
 	});
 	
 /*]]>*/

style24.core/.gitignore

@@ -1 +1,7 @@
+<<<<<<< HEAD
 /target/
+=======
+target/
+.settings/
+.classpath
+>>>>>>> refs/heads/eskim

style24.scm/.gitignore

@@ -1 +1,7 @@
+<<<<<<< HEAD
 /target/
+=======
+target/
+.settings/
+.classpath
+>>>>>>> refs/heads/eskim