상품상세 수정중

style24.scm/src/main/java/com/style24/persistence/domain/Goods.java

@@ -83,6 +83,8 @@ public class Goods extends TscBaseDomain {
 	private String chNotiYn = "N";
 	private String chStockDataYn = "N";
 	private String chGoodsStatYn = "N";
+	private String chCfrmYn = "N";		//입점용추가
+
 	private int stockQtySum;
 	private String goodsImageYn;
 	private String itemkindNm;
@@ -92,7 +94,7 @@ public class Goods extends TscBaseDomain {
 	private int currPriceOrg;
 	private String goodsStatOrg;
 	private String formalGbOrg;
-	private String sellFeeRateOrg;
+	private float sellFeeRateOrg;
 
 	private String imgType;
 	private String imgPath1;

style24.scm/src/main/java/com/style24/persistence/domain/GoodsPriceRes.java

@@ -22,7 +22,7 @@ public class GoodsPriceRes extends TscBaseDomain {
 	private String applyStdt;
 	private String applyEddt;
 	private String cfrmYn;
-	private int cfrmNo;
+	private Integer cfrmNo;
 	private String cfrmDt;
 	private String applyYn;
 
@@ -34,7 +34,6 @@ public class GoodsPriceRes extends TscBaseDomain {
 	private String goodsStat;
 	private int currPrice;
 
-
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private String[] arrGoodsCd;
 

style24.scm/src/main/java/com/style24/scm/biz/service/TssGoodsService.java

@@ -98,11 +98,11 @@ public class TssGoodsService {
 		if ("Y".equals(goodsSearch.getImageViewYn())) {
 			// 헤더 title 설정
 			String[] listTitles = {"이미지", "상품코드", "업체명", "브랜드명", "상품명", "품목", "재고", "상품상태", "스타일년도", "시즌",
-				"정상가", "판매가", "할인율", "가격변경일", "ERP재고연동여부", "정상이월구분", "반품가능 여부","승인일시"};
+				"정상가", "판매가", "할인율", "가격변경일", "ERP재고연동여부", "정상이월구분", "반품가능 여부", "승인일시"};
 
 			// DB 처리 시 사용되는 파라미터명(셀명) 설정
 			String[] cellNames = {"IMG_PATH1", "GOODS_CD", "SUPPLY_COMP_CD", "BRAND_GRP_NM", "GOODS_NM", "ITEMKIND_NM",
-				"STOCK_QTY_SUM", "GOODS_STAT", "STYLE_YEAR", "SEASON_CD",  "LIST_PRICE", "CURR_PRICE",
+				"STOCK_QTY_SUM", "GOODS_STAT", "STYLE_YEAR", "SEASON_CD", "LIST_PRICE", "CURR_PRICE",
 				"DC_RATE", "PRICE_UPD_DT", "ERP_STOCK_LINK_YN", "FORMAL_GB", "RETURNABLE_YN", "FRST_CFRM_DT"};
 
 			String[] cellTypes = {GagaExcelConstants.CellType.IMAGE.name(),
@@ -143,22 +143,22 @@ public class TssGoodsService {
 		} else {
 			// 헤더 title 설정
 			String[] listTitles = {"상품코드", "업체명", "브랜드명", "상품명", "품목", "재고", "상품상태", "스타일년도",
-				"시즌",  "정상가", "판매가", "할인율", "가격변경일", "ERP재고연동여부", "정상이월구분", "반품가능 여부", "승인일시"};
+				"시즌", "정상가", "판매가", "할인율", "가격변경일", "ERP재고연동여부", "정상이월구분", "반품가능 여부", "승인일시"};
 
 			// DB 처리 시 사용되는 파라미터명(셀명) 설정
 			String[] cellNames = {"GOODS_CD", "SUPPLY_COMP_CD", "BRAND_GRP_NM", "GOODS_NM", "ITEMKIND_NM", "STOCK_QTY_SUM", "GOODS_STAT", "STYLE_YEAR",
-				"SEASON_CD",  "LIST_PRICE", "CURR_PRICE", "DC_RATE", "PRICE_UPD_DT", "ERP_STOCK_LINK_YN", "FORMAL_GB", "RETURNABLE_YN", "FRST_CFRM_DT"};
+				"SEASON_CD", "LIST_PRICE", "CURR_PRICE", "DC_RATE", "PRICE_UPD_DT", "ERP_STOCK_LINK_YN", "FORMAL_GB", "RETURNABLE_YN", "FRST_CFRM_DT"};
 
 			String[] cellTypes = {
-			GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
-			GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
-			GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_RIGHT.name(),
-			GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
-			GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_RIGHT.name(),
-			GagaExcelConstants.CellType.CHAR_RIGHT.name(), GagaExcelConstants.CellType.CHAR_RIGHT.name(),
-			GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
-			GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
-			GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name()};
+				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_RIGHT.name(),
+				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_RIGHT.name(),
+				GagaExcelConstants.CellType.CHAR_RIGHT.name(), GagaExcelConstants.CellType.CHAR_RIGHT.name(),
+				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name()};
 
 			Collection<GagaMap> dataList = goodsDao.getGoodsInfoExcelList(goodsSearch);
 
@@ -496,33 +496,42 @@ public class TssGoodsService {
 		goods.setGoodsTnm(GagaStringUtil.replace(GagaStringUtil.replace(goods.getGoodsTnm(), "&lt;", "<"), "&gt;", ">"));
 		goods.setGoodsSnm1(GagaStringUtil.replace(GagaStringUtil.replace(goods.getGoodsSnm1(), "&lt;", "<"), "&gt;", ">"));
 
-		// 세트일 경우 상품 가격 확인
-//		if ("G056_S".equals(goods.getGoodsType())) {
-//
-//			Collection<GoodsCompose> goodsExtendList = goods.getGoodsComposeListNew();
-//			int currPriceSum = 0;
-//			for (GoodsCompose regGoodsExtend : goodsExtendList) {
-//				currPriceSum  = currPriceSum + regGoodsExtend.getCompsCurrPrice();
-//			}
+		// 가격, 수수료 승인처리시 
+//		// 가격변경일
+//		if (goods.getCurrPrice() != goods.getCurrPriceOrg()) {
+//			goods.setCurrBprice(goods.getCurrPriceOrg());
+//		} else {
+//			goods.setCurrPrice(goods.getCurrPriceOrg());
+//		}
 //
-//			if (currPriceSum != goods.getCurrPriceOrg()) {
-//				goods.setCurrBprice(goods.getCurrPriceOrg());
-//				goods.setCurrPrice(currPriceSum);
-//				goods.setDcRate((int)(this.getDcRate(goods.getListPrice() , currPriceSum)));
-//			}
-//		}else {
-			// 가격변경일
+//		// 승인일
+//		if (!goods.getGoodsStat().equals(goods.getGoodsStatOrg())) {
+//			goods.setChGoodsStatYn("Y");
+//		}
+		if ("Y".equals(goods.getChCfrmYn())) {
+			GoodsPriceRes goodsPriceRes = new GoodsPriceRes();
+			goodsPriceRes.setGoodsCd(goods.getGoodsCd());
 			if (goods.getCurrPrice() != goods.getCurrPriceOrg()) {
-				goods.setCurrBprice(goods.getCurrPriceOrg());
-			} else {
-				goods.setCurrPrice(goods.getCurrPriceOrg());
+				goodsPriceRes.setResGoodsPrice(goods.getCurrPrice());
+				goodsPriceRes.setEndGoodsPrice(goods.getCurrPrice());
 			}
-//		}
+			if (goods.getSellFeeRate() != goods.getSellFeeRateOrg()) {
+				goodsPriceRes.setSellFeeRate(goods.getSellFeeRate());
+			}
+			goodsPriceRes.setApplyStdt(GagaDateUtil.getTodayDateTime());	//yyyymmddhhmiss
+			goodsPriceRes.setApplyEddt(GagaDateUtil.getTodayDateTime());	//yyyymmddhhmiss   // 수정햬야함
+			goodsPriceRes.setCfrmYn("N");
+			goodsPriceRes.setApplyYn("N");
+			goodsPriceRes.setRegNo(goods.getRegNo());
+			goodsPriceRes.setUpdNo(goods.getUpdNo());
+			goodsDao.createGoodPriceRes(goodsPriceRes);
 
-		// 승인일
-		if (!goods.getGoodsStat().equals(goods.getGoodsStatOrg()) && "G008_90".equals(goods.getGoodsStat())) {
-			goods.setChGoodsStatYn("Y");
+			goods.setCurrPrice(goods.getCurrPriceOrg());
+			goods.setSellFeeRate(goods.getSellFeeRateOrg());
 		}
+
+		// 선물 주문여부 N 설정
+		goods.setGiftPackYn("N");
 		// 사용자 검색어를 검색어에 적용
 		String goodsSnm = goodsDao.getGoodsSnm(goods.getGoodsCd());
 		if (!StringUtils.isEmpty(goods.getGoodsSnm1())) {
@@ -777,7 +786,6 @@ public class TssGoodsService {
 		}
 	}
 
-
 	/**
 	 * 상품 사이즈 옵션정보 이력 생성
 	 *
@@ -872,7 +880,7 @@ public class TssGoodsService {
 			goodsPriceRes.setRegNo(TssSession.getInfo().getUserNo());
 			goodsPriceRes.setUpdNo(TssSession.getInfo().getUserNo());
 
-			if(goodsDao.getGoodsPriceResDupChkCount(goodsPriceRes) > 0 ) {
+			if (goodsDao.getGoodsPriceResDupChkCount(goodsPriceRes) > 0) {
 				throw new IllegalStateException("이미 등록된 상품 가격예약이 존재합니다. \n(상품코드 : " + goodsCd + ")");
 			}
 
@@ -954,12 +962,12 @@ public class TssGoodsService {
 			SimpleDateFormat dateFormatParser = new SimpleDateFormat("yyyyMMdd");
 			dateFormatParser.setLenient(false);
 			try {
-				dateFormatParser.parse(goodsPriceRes.getApplyStdt() );
+				dateFormatParser.parse(goodsPriceRes.getApplyStdt());
 			} catch (Exception e) {
 				return (cnt + 2) + "행의 예약시작일을 확인해주세요.";
 			}
 			try {
-				dateFormatParser.parse(goodsPriceRes.getApplyEddt() );
+				dateFormatParser.parse(goodsPriceRes.getApplyEddt());
 			} catch (Exception e) {
 				return (cnt + 2) + "행의 예약종료일을 확인해주세요.";
 			}
@@ -986,11 +994,10 @@ public class TssGoodsService {
 				return (cnt + 2) + "행의 상품은 자사상품이 아닙니다.";
 			}
 
-			if(goodsDao.getGoodsPriceResDupChkCount(goodsPriceRes) > 0 ) {
+			if (goodsDao.getGoodsPriceResDupChkCount(goodsPriceRes) > 0) {
 				return (cnt + 2) + "행은 이미 등록된 상품 가격예약이 존재합니다. \n(상품코드 : " + goodsPriceRes.getGoodsCd() + ")";
 			}
 
-
 			cnt++;
 		}
 

style24.scm/src/main/java/com/style24/scm/biz/web/TssGoodsController.java

@@ -92,7 +92,7 @@ public class TssGoodsController extends TssBaseController {
 		if ("G001_B000".equals(TssSession.getInfo().getRoleCd())) {	//입점업체담당자
 			supplyCompCd = TssSession.getInfo().getSupplyCompCd();
 			selfYn = "N";
-		}else if ("G001_E000".equals(TssSession.getInfo().getRoleCd())) {	// 촬영업체
+		} else if ("G001_E000".equals(TssSession.getInfo().getRoleCd())) {	// 촬영업체
 			supplyCompCd = TssSession.getInfo().getSupplyCompCd();
 			selfYn = "Y";
 		}
@@ -112,7 +112,7 @@ public class TssGoodsController extends TssBaseController {
 		mav.addObject("seasonList", rendererService.getAvailCommonCodeList("G006"));
 		// 년도
 		int toYear = Integer.parseInt(GagaDateUtil.getToday("yyyy")) - 4;
-		mav.addObject("styleYearList", rendererService.getYearList(toYear,0,5));
+		mav.addObject("styleYearList", rendererService.getYearList(toYear, 0, 5));
 		// 연령대
 		mav.addObject("ageGrpCdList", rendererService.getAvailCommonCodeList("G023"));
 		// 사용여부
@@ -227,7 +227,7 @@ public class TssGoodsController extends TssBaseController {
 		String resultFlag = "SUCC";
 
 		// 입점 담당자만 일괄 변경 가능
-		if (!"G001_B000".equals(TssSession.getInfo().getRoleCd()) ) {
+		if (!"G001_B000".equals(TssSession.getInfo().getRoleCd())) {
 			throw new IllegalStateException("권한이 없습니다.");
 		}
 
@@ -253,7 +253,7 @@ public class TssGoodsController extends TssBaseController {
 						continue;
 					}
 					// 사이즈 등록 여부 확인
-					if ("G056_N".equals(dataGoods.getGoodsType())){
+					if ("G056_N".equals(dataGoods.getGoodsType())) {
 						Option stock = new Option();
 						stock.setGoodsCd(tmpGoods.getGoodsCd());
 						int stockCnt = goodsService.getGoodsOptionCount(stock);
@@ -417,7 +417,7 @@ public class TssGoodsController extends TssBaseController {
 		mav.addObject("ageGrpCdList", rendererService.getAvailCommonCodeList("G023"));
 		// 년도
 		int toYear = Integer.parseInt(GagaDateUtil.getToday("yyyy")) - 4;
-		mav.addObject("styleYearList", rendererService.getYearList(toYear,0,5));
+		mav.addObject("styleYearList", rendererService.getYearList(toYear, 0, 5));
 		// 색상
 //		Color color = new Color();
 //		mav.addObject("colorList", rendererService.getColorList(color));
@@ -526,15 +526,15 @@ public class TssGoodsController extends TssBaseController {
 	@ResponseBody
 	public GagaResponse saveGoodsDetail(@RequestBody Goods goods) {
 
-		// 상품상태에 따른 이미지 정보 확인 - 상품상태가 승인대기나 승인 완료일 경우
-		if ("G008_40".equals(goods.getGoodsStat()) || "G008_90".equals(goods.getGoodsStat())) {
+		// 상품상태에 따른 이미지 정보 확인 - 상품상태가 승인대기일 경우
+		if ("G008_40".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/>'승인대기'나 '승인완료' 상태로 변경할 수 없습니다.");
+				throw new IllegalStateException("필수 이미지가 등록되지 않은 상품은 <br/>'승인대기' 상태로 변경할 수 없습니다.");
 			}
 		}
 
@@ -719,11 +719,11 @@ public class TssGoodsController extends TssBaseController {
 	@ResponseBody
 	public GagaResponse saveGoodsPriceResvExcelupload(@RequestBody Goods goods) throws Exception {
 
-		log.info("[saveGoodsPriceResvExcelupload] goods={} ",goods);
+		log.info("[saveGoodsPriceResvExcelupload] goods={} ", goods);
 		ObjectMapper mapper = new ObjectMapper();
 
 		String targetPath = GagaFileUtil.getConcatenationPath(env.getProperty("upload.excel.target.path"), "excel");
-		log.info("[saveGoodsPriceResvExcelupload] targetPath={} ",targetPath);
+		log.info("[saveGoodsPriceResvExcelupload] targetPath={} ", targetPath);
 		// DB 처리 시 사용되는 파라미터명(셀명) 설정
 		String[] cellName = {"goodsCd", "resGoodsPrice", "applyStdt", "applyEddt"};
 

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

@@ -29,6 +29,7 @@
 				<input type="hidden" id="notiList" name="notiList" />
 				<input type="hidden" id="chDataYn" name="chDataYn" />
 				<input type="hidden" id="chStockDataYn" name="chStockDataYn" />
+				<input type="hidden" id="chCfrmYn" name="chCfrmYn" />
 				<input type="hidden" id="goodsImageYn" name="goodsImageYn" />
 				<input type="hidden" id="niClsfNm" name="niClsfNm" />
 				<input type="hidden" id="uploadGoodsUrl" name="uploadGoodsUrl" th:value="${@environment.getProperty('upload.goods.view')}"/>
@@ -206,14 +207,9 @@
 											</select>
 											<input type="hidden" id="ageGrpCdOrg" name="ageGrpCdOrg"/>
 										</td>
-										<th>선물 주문가능여부<em class="required" title="필수"></em></th>
-										<td>
-											<label class="rdoBtn"><input type="radio" name="giftPackYn" id="giftPackYnY" value="Y" />Y</label>
-											<label class="rdoBtn"><input type="radio" name="giftPackYn" id="giftPackYnN" value="N"/>N</label>
-											<input type="hidden" id="giftPackYnOrg" name="giftPackYnOrg"/>
-										</td>
 										<th>가격변경일</th>
 										<td><span id="priceUpdDtTxt"></span></td>
+										<td colspan="2"></td>
 									</tr>
 									<tr>
 										<th>정상가</th>
@@ -516,7 +512,6 @@
 		},
 		{headerName: "재고연동여부", field: "erpStockLinkYn" , width: 100, cellClass: 'text-center'},
 		{headerName: "자사몰노출여부", field: "selfMallYn" , width: 120, cellClass: 'text-center'},
-		{headerName: "선물주문여부", field: "giftPackYn" , width: 120, cellClass: 'text-center'},
 		{headerName: "판매수수료율", field: "sellFeeRate" , width: 120, cellClass: 'text-right'},
 		{headerName: "사용자검색어", field: "goodsSnm1" , width: 150, cellClass: 'text-left'},
 		{headerName: "검색어", field: "goodsSnm" , width: 450, cellClass: 'text-left', tooltipField: "goodsSnm"}
@@ -621,11 +616,6 @@
 			}else{
 				$("#goodsDetailForm input:radio[name=selfMallYn]:input[value='N']").trigger('click');
 			}
-			if (result.giftPackYn == "Y"){
-				$("#goodsDetailForm input:radio[name=giftPackYn]:input[value='Y']").trigger('click');
-			}else{
-				$("#goodsDetailForm input:radio[name=giftPackYn]:input[value='N']").trigger('click');
-			}
 			if (result.returnableYn == "Y"){
 				$("#goodsDetailForm input:radio[name=returnableYn]:input[value='Y']").trigger('click');
 			}else{
@@ -654,7 +644,6 @@
 			$("#goodsDetailForm input[name=formalGbOrg]").val(result.formalGb);
 			$("#goodsDetailForm input[name=erpPriceLinkYnOrg]").val(result.erpPriceLinkYn);
 			$("#goodsDetailForm input[name=selfMallYnOrg]").val(result.selfMallYn);
-			$("#goodsDetailForm input[name=giftPackYnOrg]").val(result.giftPackYn);
 			$("#goodsDetailForm input[name=prePpntUsableYnOrg]").val(result.prePpntUsableYn);
 			$("#goodsDetailForm input[name=preMpntUsableYnOrg]").val(result.preMpntUsableYn);
 			$("#goodsDetailForm input[name=changeableYnOrg]").val(result.changeableYn);
@@ -974,12 +963,9 @@
 		if($("#goodsDetailForm select[name=goodsStat]").val() == "G008_40" || $("#goodsDetailForm select[name=goodsStat]").val() == "G008_90"){
 
 			// 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"){
-					mcxDialog.alert(" '승인완료' 상태로 변경할 권한이 없습니다.");
-					return false;
-				}
-				
+			if ($("#goodsDetailForm select[name=goodsStat]").val() == "G008_90" &&  $("#goodsDetailForm select[name=goodsStatOrg]").val() != "G008_90"){
+				mcxDialog.alert(" '승인완료' 상태로 변경할 권한이 없습니다.");
+				return false;
 			}
 			//list가 등록되지 않은 상품은 상태변경 불가
 			if(Number($("#goodsDetailForm input[name=listPrice]").val()) == 0){
@@ -1038,7 +1024,7 @@
 				}
 
 				idx = 0;
-
+				//고시정보 필수나 전시표시값 입력여부 확인
 				$("#goodsDetailForm #notiArea").find("#infoContents tr").each(function() {
 					if ("Y" == $(this).find("input[name=reqYn]").val() ||  "Y" == $(this).find("input[name=dispYn]").val()){
 						if (gagajf.isNull($(this).find("input[name=niContent]").val())){
@@ -1059,7 +1045,6 @@
 					return false;
 				}
 			}
-			
 		}
 
 		if(optCheck) {
@@ -1328,20 +1313,6 @@
 				return false;
 			}
 
-			//ERP재고연동여부가 'Y'일 경우 수정여부 확인
-		/* 	if ( $('#goodsDetailForm input[name=erpStockLinkYn]:checked').val() == "Y"){
-				if (Number(editCurrStockQty) != Number(currStockQty) ){
-					optCheck = true;
-					mcxDialog.alertC("ERP가용재고가 변경되었습니다.<br/>확인해주세요", {
-						sureBtnText: "확인",
-						sureBtnClick: function() {
-							$("#optionList tr").find("input[name=erpStockLinkYn]").eq(idx).focus();
-						}
-					});
-					return false;
-				}
-			} */
-
 			// 입점만 체크
 			if ("N" == $('#goodsDetailForm input[name=selfGoodsYn]').val()){
 				
@@ -1425,7 +1396,6 @@
 					if (index == 1){
 						optCheck = true;
 					} else {
-						if (!fnGoodsComposeCheck()) return false;
 						fnSaveCheck();
 					}
 				}
@@ -1434,7 +1404,6 @@
 		}else{
 			$("#goodsDetailForm").find("#dcRateTxt").html(dcRate);
 			$("#goodsDetailForm input[name=dcRate]").val(dcRate);
-			if (!fnGoodsComposeCheck()) return false;
 			fnSaveCheck();
 		}
 		
@@ -1460,8 +1429,6 @@
 		}
 	}
 
-	
-
 	//저장처리
 	var fnGoodsSave = function(){
 		mcxDialog.confirm('저장하시겠습니까?', {
@@ -1476,6 +1443,18 @@
 				}else{
 					$("#goodsDetailForm input[name=chDataYn]").val('N');
 				}
+				// 승인여부 확인 - 판매가와 판매수수룔 변경시
+				// 판매수수료율
+				var chCfrmYn = "N";
+				if ($("#goodsDetailForm input[name=sellFeeRateOrg]").val() != $("#goodsDetailForm input[name=sellFeeRate]").val()){
+					chCfrmYn = "Y";
+				}
+				//판매가
+				if ($("#goodsDetailForm input[name=currPriceOrg]").val() != $("#goodsDetailForm input[name=currPrice]").val().removeComma()){
+					chCfrmYn = "Y";
+				}
+				$("#goodsDetailForm input[name=chCfrmYn]").val(chCfrmYn);
+				
 				$("#goodsDetailForm input[name=mainColorCd]").val($("#goodsDetailForm input[name=basicColor]:checked").val());
 				
 				$('#goodsDetailForm input[name=goodsNm]').val($('#goodsDetailForm input[name=goodsNm]').val().trim().replace(/\n|\r/g, "<br/>").replace(/\"/gi, "&quot;").replace(/\'/gi, "&#39;"));
@@ -1533,7 +1512,7 @@
 	}
 
 	//상품기본정보 변경여부 확인
-	var fnChangeCheck = function(){debugger;
+	var fnChangeCheck = function(){
 		
 		//상품타이틀
 		if ($("#goodsDetailForm input[name=goodsTnmOrg]").val() != $("#goodsDetailForm input[name=goodsTnm]").val()){
@@ -1584,10 +1563,6 @@
 		if ($("#goodsDetailForm input[name=selfMallYnOrg]").val() != $("input[name=selfMallYn]:checked").val()){
 			return true;
 		}
-		//선물주문여부
-		if ($("#goodsDetailForm input[name=giftPackYnOrg]").val() != $("input[name=giftPackYn]:checked").val()){
-			return true;
-		}
 		//PC포인트 
 		if ($("#goodsDetailForm input[name=pntPrateOrg]").val() != $("#goodsDetailForm input[name=pntPrate]").val()){
 			return true;
@@ -1657,17 +1632,6 @@
 			return false;
 		}
 
-		// 고시정보 수정은 맘대로 할수 있음 20200821 신현장 부장 확인
-		/* if ($("#goodsDetailForm input[name=niClsfCd]").val() != $("#goodsDetailForm select[name=selNiClsfCd]").val()){
-			mcxDialog.alertC("상품의 고시분류는 [" + $("#goodsDetailForm input[name=niClsfNm]").val() +"] 입니다."  , {
-				sureBtnText: "확인",
-				sureBtnClick: function() {
-					$("#goodsDetailForm select[name=selNiClsfCd]").focus();
-				}
-			});
-			return false;
-		} */
-
 		var params = new Object();
 		params.supplyCompCd = $("#goodsDetailForm input[name=supplyCompCd]").val();
 		params.niClsfCd = $("#goodsDetailForm select[name=selNiClsfCd]").val();

style24.scm/src/main/webapp/WEB-INF/views/goods/GoodsListForm.html

@@ -416,7 +416,6 @@
 				return !gagajf.isNull(params.value) ? params.value.toDate("YYYYMMDDHHmmss").format("YYYY-MM-DD HH:mm:ss") : '';
 			}
 		},
-		{headerName: "ERP재고연동여부", field: "erpStockLinkYn", width: 120, cellClass: 'text-center'},
 		{headerName: "이월구분", field: "formalGb", width: 100, cellClass: 'text-center',
 			cellEditorParams: { values: gagaAgGrid.extractValues(formalGbList) },
 			valueFormatter: function (params) { return gagaAgGrid.lookupValue(formalGbList, params.value); },