입점상품대량등록 - 안전인증관련 추가

src/main/java/com/style24/persistence/domain/GoodsMass.java

@@ -38,6 +38,9 @@ public class GoodsMass extends TscBaseDomain {
 //	private String distributionGb;	//유통구분(공콩코드 G065)
 	private String taxGb;			//과세구분(10:과세, 20:비과세)
 	private String ageGrpCd;		//상품연령코드(공통코드G023)
+	private String certTargetGb;	//안전인증대상구분
+	private String certFormGb;		//안전인증형태구분
+	private String certType;		//안전인증타입구분
 	private String certNum;			//안전인증번호 
 	private String adultYn;			//성인용품여부 'Y', 'N'
 

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

@@ -1981,6 +1981,10 @@
 		  , RETURNABLE_YN
 		  , GIFT_PACK_YN
 		  , NEW_CUST_ORD_YN
+		  , CERT_TARGET_GB
+		  , CERT_FORM_GB
+		  , CERT_TYPE
+		  , CERT_NUM
 		  , OPT_STR
 		  , GOODS_CONTENT
 		  , NI_CLSF_CD
@@ -2052,6 +2056,10 @@
 		  , #{returnableYn}
 		  , #{giftPackYn}
 		  , #{newCustOrdYn}
+		  , #{certTargetGb}
+		  , #{certFormGb}
+		  , #{certType}
+		  , #{certNum}
 		  , #{optStr}
 		  , #{goodsContent}
 		  , #{niClsfCd}
@@ -2299,6 +2307,10 @@
 		     , A.RETURNABLE_YN
 		     , A.GIFT_PACK_YN
 		     , A.NEW_CUST_ORD_YN
+		     , A.CERT_TARGET_GB
+		     , A.CERT_FORM_GB
+		     , A.CERT_TYPE
+		     , A.CERT_NUM
 		     , A.OPT_STR
 		     , A.GOODS_CONTENT
 		     , A.NI_CLSF_CD

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

@@ -1769,6 +1769,7 @@ public class TssGoodsService {
 	public String createExceluploadGoods(GagaMap gagaMap, String procJob, String delvFeeCd) {
 
 		GoodsMass goodsMass = mapper.convertValue(gagaMap, GoodsMass.class);
+		goodsMass.setDelvFeeCd(delvFeeCd);	// 화면입력값 적용
 
 		// 상품기본정보
 		Goods goods = this.createGoodsInfo(goodsMass, procJob);
@@ -2020,17 +2021,18 @@ public class TssGoodsService {
 		goods.setRegNo(TssSession.getInfo().getUserNo());
 		goods.setUpdNo(TssSession.getInfo().getUserNo());
 
+		log.info("goodsMass= > {}" ,goodsMass);
 		if (StringUtils.isBlank(goodsMass.getSupplyGoodsCd())) {
 			goods.setGoodsRegMsg("공급업체 상품코드 오류");
 			goods.setGoodsStat("10");
 			return goods;
 		}
 
-		if (!GagaStringUtil.replace(goodsMass.getSupplyGoodsCd().trim(), ",", "").matches(ALPHA_NUMERIC)) {
-			goods.setGoodsRegMsg("공급업체 상품코드 오류");
-			goods.setGoodsStat("10");
-			return goods;
-		}
+//		if (!GagaStringUtil.replace(goodsMass.getSupplyGoodsCd().trim(), ",", "").matches(ALPHA_NUMERIC)) {
+//			goods.setGoodsRegMsg("공급업체 상품코드 오류");
+//			goods.setGoodsStat("10");
+//			return goods;
+//		}
 
 		goods.setSupplyGoodsCd(goodsMass.getSupplyGoodsCd().trim().toUpperCase());
 
@@ -2344,7 +2346,56 @@ public class TssGoodsService {
 			return goods;
 		}
 
-		goods.setCertNum(goodsMass.getCertNum()); //안전인증번호
+		//인증대상구분
+		if (StringUtils.isNotBlank(goodsMass.getCertTargetGb())) {
+			commonCode.setCdGb("G083"); 	
+			commonCode.setCd(goodsMass.getCertTargetGb());
+			Collection<CommonCode> certTargetGbList = rendererService.getCommonCodeList(commonCode);
+			if (certTargetGbList == null || certTargetGbList.isEmpty()) {
+				goods.setGoodsRegMsg("인증대상 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}	
+			goods.setCertTargetGb(goodsMass.getCertTargetGb().trim());
+		}
+		
+		//인증형태구분
+		if (StringUtils.isNotBlank(goodsMass.getCertFormGb())) {
+			commonCode.setCdGb("G084"); 	
+			commonCode.setCd(goodsMass.getCertFormGb());
+			Collection<CommonCode> certFormGbList = rendererService.getCommonCodeList(commonCode);
+			if (certFormGbList == null || certFormGbList.isEmpty()) {
+				goods.setGoodsRegMsg("인증형태 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}	
+			goods.setCertFormGb(goodsMass.getCertFormGb().trim());
+		}
+		
+		
+		//인증타입
+		if (StringUtils.isNotBlank(goodsMass.getCertType())) {
+			commonCode.setCdGb("G084"); 	
+			commonCode.setCd(goodsMass.getCertType());
+			Collection<CommonCode> certTypeList = rendererService.getCommonCodeList(commonCode);
+			if (certTypeList == null || certTypeList.isEmpty()) {
+				goods.setGoodsRegMsg("인증타입 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}	
+			goods.setCertType(goodsMass.getCertType().trim());
+		}
+		
+		if (StringUtils.isNotBlank(goodsMass.getCertNum())) {
+			if (StringUtils.isBlank(goodsMass.getCertTargetGb()) ||
+				StringUtils.isBlank(goodsMass.getCertFormGb()) ||
+				StringUtils.isBlank(goodsMass.getCertType())) {
+				goods.setGoodsRegMsg("인증관련 구분 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+			goods.setCertNum(goodsMass.getCertNum().trim()); //안전인증번호
+		}
 
 		goods.setGoodsType("G056_N"); //상품타입
 		goods.setDistributionGb("G065_20"); //유통구분
@@ -2353,7 +2404,7 @@ public class TssGoodsService {
 		goods.setErpStockLinkYn("N"); // ERP재고연동여부
 		goods.setMainColorCd("XX"); // 무의미 데이터
 		goods.setTobeFormYn("N"); // 입점 신규 기본값
-
+		
 		return goods;
 	}
 

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

@@ -875,7 +875,7 @@ public class TssGoodsController extends TssBaseController {
 			// DB 처리 시 사용되는 파라미터명(셀명) 설정 -
 			String[] goodsNames = {"supplyGoodsCd", "supplyCompCd", "brandCd", "goodsNm", "goodsTnm", "goodsSnm1", "itemkindCd",
 				"sexGb", "listPrice", "currPrice", "goodsGb", "formalGb", "originCd", "makeYmd", "taxGb", "ageGrpCd", "adultYn",
-				"certNum", "optStr", "goodsContent",
+				"certTargetGb", "certFormGb", "certType", "certNum", "optStr", "goodsContent",
 				"niClsfCd", "niContent1", "niContent2", "niContent3", "niContent4", "niContent5",
 				"niContent6", "niContent7", "niContent8", "niContent9", "niContent10", "niContent11", "niContent12",
 				"niContent13", "niContent14", "niContent15", "niContent16", "niContent17", "niContent18",

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

@@ -158,6 +158,10 @@
 		{headerName: "상품구분", field: "goodsGb", width: 100, cellClass: 'text-center'},
 		{headerName: "과세구분", field: "taxGb", width: 100, cellClass: 'text-center'},
 		{headerName: "성인용품여부", field: "adultYn", width: 100, cellClass: 'text-center'},
+		{headerName: "인증대상구분", field: "certTargetGb", width: 100, cellClass: 'text-center'},
+		{headerName: "인증형태구분", field: "certFormGb", width: 100, cellClass: 'text-center'},
+		{headerName: "인증타입", field: "certType", width: 100, cellClass: 'text-center'},
+		{headerName: "인증번호", field: "certNum", width: 120, cellClass: 'text-center'},
 		{headerName: "옵션정보", field: "optStr", width: 150, cellClass: 'text-center'},
 		{headerName: "상품상세 html", field: "goodsContent", width: 150, cellClass: 'text-center'},
 		{headerName: "고시분류코드", field: "niClsfCd", width: 100, cellClass: 'text-center'},