Merge remote-tracking branch 'origin/develop' into jsh77b

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

@@ -1925,17 +1925,22 @@
 	<!-- wms 상품정보 조회 -->
 	<select  id="getWmsGoodsInfo" parameterType="Goods" resultType="WmsGoods" >
 		/* TssGoods.getWmsGoodsInfo */
-		SELECT PRODUCT_NO
-		     , PRODUCT_CODE
-		     , PRODUCT_NAME
-		     , MODEL_NO
-		     , PROVIDER_NO
-		     , PROVIDER_NAME
-		     , BRAND_NO
-		     , BRAND_NAME
-		     , GOODS_REG_DT
-		     , GOODS_REG_GB
-		FROM TB_WMS_GOODS
+		SELECT A.PRODUCT_NO
+		     , A.PRODUCT_CODE
+		     , A.PRODUCT_NAME
+		     , A.MODEL_NO
+		     , A.PROVIDER_NO
+		     , A.PROVIDER_NAME
+		     , A.BRAND_NO
+		     , A.BRAND_NAME
+		     , A.GOODS_REG_DT
+		     , A.GOODS_REG_GB
+		FROM TB_WMS_GOODS A
+		INNER JOIN TB_BRAND B ON A.BRAND_NO = B.BRAND_NO 
+		                      AND B.SELF_YN  = 'Y'
+		                      AND B.USE_YN  = 'Y'
+		                      AND B.BRAND_CD = #{brandCd}
+		INNER JOIN TB_BRAND_SUPPLY S ON B.BRAND_CD = S.BRAND_CD
 		WHERE MODEL_NO = #{goodsCd}
 		LIMIT 1
 	</select>

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

@@ -2514,13 +2514,8 @@ public class TssGoodsService {
 			return goods;
 		}
 
-		// 영유야용품 - 안전인증 체크
-		if ("G004_23".equals(safeNiClsfCd)) {
-			if (StringUtils.isBlank(goodsMass.getCertTargetGb())) {
-				goods.setGoodsRegMsg("영유야용품 인증대상 오류");
-				goods.setGoodsStat("10");
-				return goods;
-			}
+		// 안전인증 체크
+		if (!StringUtils.isBlank(goodsMass.getCertTargetGb())) {
 
 			//인증대상구분
 			commonCode.setCdGb("G083");
@@ -2588,12 +2583,12 @@ public class TssGoodsService {
 				goods.setCertNum(goodsMass.getCertNum().trim()); //안전인증번호
 			}
 
-		} else {
-			if (!StringUtils.isBlank(goodsMass.getCertTargetGb()) ||
-				!StringUtils.isBlank(goodsMass.getCertNum()) ||
-				!StringUtils.isBlank(goodsMass.getCertFormGb()) ||
-				!StringUtils.isBlank(goodsMass.getCertType())) {
-				goods.setGoodsRegMsg("인증정보 오류(영유야용품만 입력)");
+		}
+		else {
+			if (!StringUtils.isBlank(goodsMass.getCertFormGb()) || 
+				!StringUtils.isBlank(goodsMass.getCertType()) || 
+				!StringUtils.isBlank(goodsMass.getCertNum())) {
+				goods.setGoodsRegMsg("인증대상 오류");
 				goods.setGoodsStat("10");
 				return goods;
 			}

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

@@ -1084,7 +1084,7 @@
 			$('#goodsDetailForm input[name=delvFeeCdOrg]').val(result.delvFeeCd);
 			
 			cfnCreateCombo('/renderer/delvLoc/list/' + result.supplyCompCd, $('#goodsDetailForm select[name=delvLocCd]'), "[선택]", result.delvLocCd);
-			$('#goodsDetailForm input[name=delvLocdOrg]').val(result.delvLocCd);
+			$('#goodsDetailForm input[name=delvLocCdOrg]').val(result.delvLocCd);
 			
 			//상품상세
 			$('#goodsDetailForm input[name=goodsTitlesDesc]').val(result.goodsTitlesDesc);
@@ -1277,8 +1277,54 @@
 		$('#goodsDetailForm').find('#certDivTxt').html(result.certDiv);
 		$('#goodsDetailForm').find('#certDtTxt').html(!gagajf.isNull(result.certDt) ? result.certDt.toDate("YYYYMMDD").format("YYYY-MM-DD") : '');
 
+		if (!gagajf.isNull($("#goodsDetailForm select[name=selCertTargetGb]").val()) ){
+			if ("G081_1" != $("#goodsDetailForm select[name=certType]").val() &&  "G081_2" != $("#goodsDetailForm select[name=certType]").val()){
+				$("#goodsDetailForm input[name=certNum]").attr('readonly', true);
+			}
+		}
 	}
 	
+	
+	// 인증대상 변경시
+	$("#goodsDetailForm input[name=selCertTargetGb]").bind('click', function () {
+		var certTargetGb = $(this).val();
+		if (certTargetGb == "G083_1"){ 
+			$("#goodsDetailForm select[name=certFormGb]").attr('readonly', false);
+			$("#goodsDetailForm select[name=certType]").attr('readonly', false);
+			$("#goodsDetailForm input[name=certNum]").attr('readonly', false);
+		}else{
+			$("#goodsDetailForm select[name=certFormGb]").val('');
+			$("#goodsDetailForm select[name=certType]").val('');
+			$("#goodsDetailForm input[name=certNum]").val('');
+			$("#goodsDetailForm select[name=certFormGb]").attr('readonly', true);
+			$("#goodsDetailForm select[name=certType]").attr('readonly', true);
+			$("#goodsDetailForm input[name=certNum]").attr('readonly', true);
+			
+			$("#goodsDetailForm").find("#certStateTxt").html('');
+			$("#goodsDetailForm").find("#certOrganNameTxt").html('');
+			$("#goodsDetailForm").find("#certDtTxt").html('');
+			$("#goodsDetailForm").find("#certDivTxt").html('');
+			
+		}
+	});
+	
+	// 인증타입 변경시
+	$("#goodsDetailForm select[name=certType]").bind('click change', function () {
+		var certType = $(this).val();
+		if (certType == "G081_1" || certType == "G081_2"){ 
+			$("#goodsDetailForm input[name=certNum]").attr('readonly', false);
+		}else{
+			$("#goodsDetailForm input[name=certNum]").val('');
+			$("#goodsDetailForm input[name=certNum]").attr('readonly', true);
+			
+			$("#goodsDetailForm").find("#certStateTxt").html('');
+			$("#goodsDetailForm").find("#certOrganNameTxt").html('');
+			$("#goodsDetailForm").find("#certDtTxt").html('');
+			$("#goodsDetailForm").find("#certDivTxt").html('');
+			
+		}
+	});
+	
 	//구매등급 콜백
 	/* var fnGoodsDetailOrderGradeSearchCallback = function(result) {
 		if (result == null) return;
@@ -2001,7 +2047,7 @@
 		//안전인증관련
 		if (!fnGoodsSafetyCertNumCheck()) return false;
 		
-		//인증번호 있는데 인증작업 했는지 여부 확인
+	/* 	//인증번호 있는데 인증작업 했는지 여부 확인
 		if (!gagajf.isNull($("#goodsDetailForm input[name=certNum]").val())){
 			if ("G084_4" == $("#goodsDetailForm select[name=certFormGb]").val() || 
 				"G084_5" == $("#goodsDetailForm select[name=certFormGb]").val() || 
@@ -2018,7 +2064,7 @@
 		if (!gagajf.isNull($("#goodsDetailForm input[name=certNum]").val()) && ($("#goodsDetailForm input[name=certNum]").val() != $("#goodsDetailForm input[name=certNumOrg]").val())){
 			mcxDialog.alert("안전인증작업을 하거나 인증번호를 확인해주세요.");
 			return false;
-		}
+		} */
 		
 		var basicColor = $("#goodsDetailForm input[name=basicColor]:checked").val();
 		
@@ -2460,6 +2506,11 @@
 	// 안전인증
 	$("#btnGoodsSafetyCertNum").on("click", function(){
 		
+		if (gagajf.isNull($("#goodsDetailForm input[name=selCertTargetGb]:checked").val())){
+			mcxDialog.alert("안전인증대상를 선택해 주세요.");
+			return false;
+		}
+		
 		if (!fnGoodsSafetyCertNumCheck()) return false;
 
 		mcxDialog.confirm('안전인증정보(API)를 변경 하시겠습니까?', {
@@ -2480,52 +2531,15 @@
 	
 	var fnGoodsSafetyCertNumCheck = function(){
 		
-		// 유아용품 확인  
-		if ("G004_23" == $("#goodsDetailForm input[name=niClsfCd]").val()){
-			if (gagajf.isNull($("#goodsDetailForm input[name=selCertTargetGb]:checked").val())){
-				mcxDialog.alert("안전인증대상을 선택해 주세요.");
-				return false;	
-			}
-		}else{
-			if ((!gagajf.isNull($("#goodsDetailForm input[name=selCertTargetGb]:checked").val()) && "G083_1" != $("#goodsDetailForm input[name=selCertTargetGb]:checked").val())){
-				
-			}else{
-				if ((!gagajf.isNull($("#goodsDetailForm input[name=selCertTargetGb]:checked").val()) && "G083_1" == $("#goodsDetailForm input[name=selCertTargetGb]:checked").val())||
-					!gagajf.isNull($("#goodsDetailForm select[name=certFormGb]").val()) ||
-					!gagajf.isNull($("#goodsDetailForm select[name=certType]").val()) ||
-					!gagajf.isNull($("#goodsDetailForm input[name=certNum]").val())){
-					mcxDialog.alert("인즌대상이 아닌 상품은 인증대상아님을 선택해주세요");
-					return false;	
-				}else{
-					return true;
-				}	
-			}
-			
-		}
-			
-		if(gagajf.isNull($("#goodsDetailForm input[name=selCertTargetGb]:checked").val())){
-			
-			if (!gagajf.isNull($("#goodsDetailForm select[name=certFormGb]").val()) ||
-				!gagajf.isNull($("#goodsDetailForm select[name=certType]").val()) ||
-				!gagajf.isNull($("#goodsDetailForm input[name=certNum]").val())){
-				mcxDialog.alert("안전인증대상을 선택해 주세요.");
-				return false;	
-			}
-			
+		if (gagajf.isNull($("#goodsDetailForm input[name=selCertTargetGb]:checked").val())){
+			return true;	
 		}
 		
-		// 인증대상이 아니면 스킵
-		if ("G083_1" != $("#goodsDetailForm input[name=selCertTargetGb]:checked").val()){
+		$("#goodsDetailForm input[name=certTargetGb]").val($("#goodsDetailForm input[name=selCertTargetGb]:checked").val());
+		
+		if ((!gagajf.isNull($("#goodsDetailForm input[name=selCertTargetGb]:checked").val()) && "G083_1" != $("#goodsDetailForm input[name=selCertTargetGb]:checked").val())){
 			
-			if (!gagajf.isNull($("#goodsDetailForm select[name=certFormGb]").val()) ||
-				!gagajf.isNull($("#goodsDetailForm select[name=certType]").val()) ||
-				!gagajf.isNull($("#goodsDetailForm input[name=certNum]").val())){
-				mcxDialog.alert("인즌대상이 아닐경우 정보를 입력하지 마세요.");
-				return false;	
-			}else{
-				$("#goodsDetailForm input[name=certTargetGb]").val($("#goodsDetailForm input[name=selCertTargetGb]:checked").val());
-				return true;	
-			}
+			return true;	
 		}
 		
 		if(gagajf.isNull($("#goodsDetailForm select[name=certFormGb]").val())){

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

@@ -50,7 +50,7 @@
 							<input type="hidden" name="brandCd" id="brandCd" />
 						</td>
 						<th>업체상품코드<em class="required" title="필수"></em></th>
-						<td><input type="text" class="w200" name="supplyGoodsCd" required="required" data-valid-name="업체상품코드"  data-valid-type="alphaNumeric" onkeyup="$(this).val($(this).val().toUpperCase());"/></td>
+						<td><input type="text" class="w200" name="supplyGoodsCd" required="required" data-valid-name="업체상품코드"  onkeyup="$(this).val($(this).val().toUpperCase());"/></td> <!-- data-valid-type="alphaNumeric"  -->
 					</tr>
 				</table>
 				<!-- TABS BUTTON AREA -->
@@ -550,6 +550,46 @@
 <script th:inline="javascript">
 /*<![CDATA[*/
 	
+	// 인증대상 변경시
+	$("#goodsDetailForm input[name=selCertTargetGb]").bind('click', function () {
+		var certTargetGb = $(this).val();
+		if (certTargetGb == "G083_1"){ 
+			$("#goodsDetailForm select[name=certFormGb]").attr('readonly', false);
+			$("#goodsDetailForm select[name=certType]").attr('readonly', false);
+			$("#goodsDetailForm input[name=certNum]").attr('readonly', false);
+		}else{
+			$("#goodsDetailForm select[name=certFormGb]").val('');
+			$("#goodsDetailForm select[name=certType]").val('');
+			$("#goodsDetailForm input[name=certNum]").val('');
+			$("#goodsDetailForm select[name=certFormGb]").attr('readonly', true);
+			$("#goodsDetailForm select[name=certType]").attr('readonly', true);
+			$("#goodsDetailForm input[name=certNum]").attr('readonly', true);
+			
+			$("#goodsDetailForm").find("#certStateTxt").html('');
+			$("#goodsDetailForm").find("#certOrganNameTxt").html('');
+			$("#goodsDetailForm").find("#certDtTxt").html('');
+			$("#goodsDetailForm").find("#certDivTxt").html('');
+			
+		}
+	});
+	
+	// 인증타입 변경시
+	$("#goodsDetailForm select[name=certType]").bind('click change', function () {
+		var certType = $(this).val();
+		if (certType == "G081_1" || certType == "G081_2"){ 
+			$("#goodsDetailForm input[name=certNum]").attr('readonly', false);
+		}else{
+			$("#goodsDetailForm input[name=certNum]").val('');
+			$("#goodsDetailForm input[name=certNum]").attr('readonly', true);
+			
+			$("#goodsDetailForm").find("#certStateTxt").html('');
+			$("#goodsDetailForm").find("#certOrganNameTxt").html('');
+			$("#goodsDetailForm").find("#certDtTxt").html('');
+			$("#goodsDetailForm").find("#certDivTxt").html('');
+			
+		}
+	});
+	
 	//상품명 길이표시
 	$("#goodsDetailForm input[name=goodsNm]").bind('focus focusout input keyup keydown paste change', function () {
 		fnDataLengthCheck('goodsNm',200);
@@ -808,51 +848,15 @@
 	
 	//안전인증관련 체크
 	var fnGoodsSafetyCertNumCheck = function(){
-		$("#goodsDetailForm input[name=certTargetGb]").val($("#goodsDetailForm input[name=selCertTargetGb]:checked").val());
-		// 유아용품 확인  
-		if ("G004_23" == $("#goodsDetailForm input[name=safeNiClsfCd]").val()){
-			if (gagajf.isNull($("#goodsDetailForm input[name=selCertTargetGb]:checked").val())){
-				mcxDialog.alert("안전인증대상을 선택해 주세요.");
-				return false;	
-			}
-		}else{
-			if ((!gagajf.isNull($("#goodsDetailForm input[name=selCertTargetGb]:checked").val()) && "G083_1" != $("#goodsDetailForm input[name=selCertTargetGb]:checked").val())){
-				
-			}else{
-				if ((!gagajf.isNull($("#goodsDetailForm input[name=selCertTargetGb]:checked").val()) && "G083_1" == $("#goodsDetailForm input[name=selCertTargetGb]:checked").val())||
-					!gagajf.isNull($("#goodsDetailForm select[name=certFormGb]").val()) ||
-					!gagajf.isNull($("#goodsDetailForm select[name=certType]").val()) ||
-					!gagajf.isNull($("#goodsDetailForm input[name=certNum]").val())){
-					mcxDialog.alert("인즌대상이 아닌 상품은 인증대상아님을 선택해주세요");
-					return false;	
-				}else{
-					return true;
-				}	
-			}
-		}
-			
-		if(gagajf.isNull($("#goodsDetailForm input[name=selCertTargetGb]:checked").val())){
-			
-			if (!gagajf.isNull($("#goodsDetailForm select[name=certFormGb]").val()) ||
-				!gagajf.isNull($("#goodsDetailForm select[name=certType]").val()) ||
-				!gagajf.isNull($("#goodsDetailForm input[name=certNum]").val())){
-				mcxDialog.alert("안전인증대상을 선택해 주세요.");
-				return false;	
-			}
-			
+		
+		if (gagajf.isNull($("#goodsDetailForm input[name=selCertTargetGb]:checked").val())){
+			return true;	
 		}
 		
-		// 인증대상이 아니면 스킵
-		if ("G083_1" != $("#goodsDetailForm input[name=selCertTargetGb]:checked").val()){
-			
-			if (!gagajf.isNull($("#goodsDetailForm select[name=certFormGb]").val()) ||
-				!gagajf.isNull($("#goodsDetailForm select[name=certType]").val()) ||
-				!gagajf.isNull($("#goodsDetailForm input[name=certNum]").val())){
-				mcxDialog.alert("인즌대상이 아닐경우 정보를 입력하지 마세요.");
-				return false;	
-			}else{
-				return true;	
-			}
+		$("#goodsDetailForm input[name=certTargetGb]").val($("#goodsDetailForm input[name=selCertTargetGb]:checked").val());
+
+		if ((!gagajf.isNull($("#goodsDetailForm input[name=selCertTargetGb]:checked").val()) && "G083_1" != $("#goodsDetailForm input[name=selCertTargetGb]:checked").val())){
+			return true;	
 		}
 		
 		if(gagajf.isNull($("#goodsDetailForm select[name=certFormGb]").val())){

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

@@ -436,6 +436,46 @@
 <script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2021053101"></script>
 <script th:inline="javascript">
 /*<![CDATA[*/
+	// 인증대상 변경시
+	$("#goodsDetailForm input[name=selCertTargetGb]").bind('click', function () {
+		var certTargetGb = $(this).val();
+		if (certTargetGb == "G083_1"){ 
+			$("#goodsDetailForm select[name=certFormGb]").attr('readonly', false);
+			$("#goodsDetailForm select[name=certType]").attr('readonly', false);
+			$("#goodsDetailForm input[name=certNum]").attr('readonly', false);
+		}else{
+			$("#goodsDetailForm select[name=certFormGb]").val('');
+			$("#goodsDetailForm select[name=certType]").val('');
+			$("#goodsDetailForm input[name=certNum]").val('');
+			$("#goodsDetailForm select[name=certFormGb]").attr('readonly', true);
+			$("#goodsDetailForm select[name=certType]").attr('readonly', true);
+			$("#goodsDetailForm input[name=certNum]").attr('readonly', true);
+			
+			$("#goodsDetailForm").find("#certStateTxt").html('');
+			$("#goodsDetailForm").find("#certOrganNameTxt").html('');
+			$("#goodsDetailForm").find("#certDtTxt").html('');
+			$("#goodsDetailForm").find("#certDivTxt").html('');
+			
+		}
+	});
+	
+	// 인증타입 변경시
+	$("#goodsDetailForm select[name=certType]").bind('click change', function () {
+		var certType = $(this).val();
+		if (certType == "G081_1" || certType == "G081_2"){ 
+			$("#goodsDetailForm input[name=certNum]").attr('readonly', false);
+		}else{
+			$("#goodsDetailForm input[name=certNum]").val('');
+			$("#goodsDetailForm input[name=certNum]").attr('readonly', true);
+			
+			$("#goodsDetailForm").find("#certStateTxt").html('');
+			$("#goodsDetailForm").find("#certOrganNameTxt").html('');
+			$("#goodsDetailForm").find("#certDtTxt").html('');
+			$("#goodsDetailForm").find("#certDivTxt").html('');
+			
+		}
+	});
+	
 	
 	//상품명 길이표시
 	$("#goodsDetailForm input[name=goodsNm]").bind('focus focusout input keyup keydown paste change', function () {
@@ -781,15 +821,15 @@
 		$('#goodsDetailForm  input[name=sellEdYMD]').val("2030-12-31");
 		
 		// Create a summernote
-//		var snOptions1 = gagaSn.getToolbarOptions('media');
-//		var snOptions2 = gagaSn.getToolbarOptions('media');
+		var snOptions1 = gagaSn.getToolbarOptions('media');
+		var snOptions2 = gagaSn.getToolbarOptions('media');
 		var snOptions3 = gagaSn.getToolbarOptions('media');
 		var snOptions4 = gagaSn.getToolbarOptions('media');
 		var snOptions5 = gagaSn.getToolbarOptions('media');
 		var snOptions6 = gagaSn.getToolbarOptions('media');
 		var snOptions7 = gagaSn.getToolbarOptions('media');
-//		gagaSn.createSummernote(snOptions1, '#goodsContentsDesc');
-//		gagaSn.createSummernote(snOptions2, '#goodsCharacterDesc');
+		gagaSn.createSummernote(snOptions1, '#goodsContentsDesc');
+		gagaSn.createSummernote(snOptions2, '#goodsCharacterDesc');
 		gagaSn.createSummernote(snOptions3, '#goodsDesc');
 		gagaSn.createSummernote(snOptions4, '#goodsPcTopDesc');
 		gagaSn.createSummernote(snOptions5, '#goodsMobileTopDesc');