Просмотр исходного кода

자사상품 대량엑셀등록 안전인증컬럼 추가

eskim 4 лет назад
Родитель
Сommit
2ec7637a6e

+ 95 - 5
src/main/java/com/style24/scm/biz/service/TssGoodsService.java

@@ -1486,6 +1486,17 @@ public class TssGoodsService {
 
 		goodsDao.createCategoryGoods(goods);
 
+		// 안전안증작업
+		if (!StringUtils.isEmpty(goods.getCertTargetGb())) {
+			GoodsSafeNo goodsSafeNo = new GoodsSafeNo();
+			goodsSafeNo.setGoodsCd(goods.getGoodsCd());
+			goodsSafeNo.setCertTargetGb(goods.getCertTargetGb());
+			goodsSafeNo.setCertFormGb(goods.getCertFormGb());
+			goodsSafeNo.setCertType(goods.getCertType());
+			goodsSafeNo.setCertNum(goods.getCertNum());
+			saveGoodsDetailCertNum(goodsSafeNo);
+		}
+
 		this.setGoodsRegResult(goods, goodsMass, procJob);
 
 		return goods.getGoodsStat();
@@ -1844,6 +1855,85 @@ public class TssGoodsService {
 			}
 		}
 
+		// 안전인증 체크
+		if (!StringUtils.isBlank(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 (!"G083_1".equals(goodsMass.getCertTargetGb())) {
+				if (!StringUtils.isBlank(goodsMass.getCertNum()) ||
+					!StringUtils.isBlank(goodsMass.getCertFormGb()) ||
+					!StringUtils.isBlank(goodsMass.getCertType())) {
+					goods.setGoodsRegMsg("인증정보 오류(인증대상만 입력)");
+					goods.setGoodsStat("10");
+					return goods;
+				}
+			}
+
+			//인증형태구분
+			if (StringUtils.isBlank(goodsMass.getCertFormGb())) {
+				goods.setGoodsRegMsg("인증형태 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+
+			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.isBlank(goodsMass.getCertType())) {
+				goods.setGoodsRegMsg("인증타입 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+
+			commonCode.setCdGb("G081");
+			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 ("G081_1".equals(goodsMass.getCertType()) || "G081_2".equals(goodsMass.getCertType())) {
+				if (StringUtils.isBlank(goodsMass.getCertNum())) {
+					goods.setGoodsRegMsg("인증번호 오류");
+					goods.setGoodsStat("10");
+					return goods;
+				}
+			}
+			if (!StringUtils.isBlank(goodsMass.getCertNum())) {
+				goods.setCertNum(goodsMass.getCertNum().trim()); //안전인증번호
+			}
+
+		} else {
+			if (!StringUtils.isBlank(goodsMass.getCertFormGb()) ||
+				!StringUtils.isBlank(goodsMass.getCertType()) ||
+				!StringUtils.isBlank(goodsMass.getCertNum())) {
+				goods.setGoodsRegMsg("인증대상 오류");
+				goods.setGoodsStat("10");
+				return goods;
+			}
+		}
+
 		goods.setGoodsType("G056_N"); //상품타입
 		goods.setFormalGb("G009_10"); // 정상이월 구분
 		goods.setGoodsGb("G073_11"); //상품구분
@@ -2892,7 +2982,7 @@ public class TssGoodsService {
 				this.setGoodsRegResult(goods, goodsMass, procJob);
 				return goods.getGoodsStat();
 			}
-		
+
 		}
 
 		//상품 기본정보 변경여부 와 촬영업체가 아닌경우
@@ -3094,7 +3184,7 @@ public class TssGoodsService {
 			}
 			goods.setChDataYn("Y");
 		}
-		
+
 		// 상품상태
 		if (StringUtils.isBlank(goodsMass.getGoodsStatCd())) {
 			goods.setGoodsRegMsg("상품상태 오류");
@@ -3114,8 +3204,8 @@ public class TssGoodsService {
 			}
 			goods.setChDataYn("Y");
 		}
-		
-		// 최초승인완료일이 있을경우만 승인완료로 상태값 변경가능 
+
+		// 최초승인완료일이 있을경우만 승인완료로 상태값 변경가능
 		if("G008_90".equals(goodsMass.getGoodsStatCd())) {
 			if (StringUtils.isBlank(goodsOrigin.getFrstCfrmDt())) {
 				goods.setGoodsRegMsg("상품상태 오류- 최초승인일이 있는경우만 승인완료로 변경가능");
@@ -3123,7 +3213,7 @@ public class TssGoodsService {
 				return goods;
 			}
 		}
-		
+
 		//판매가
 		if (StringUtils.isBlank(goodsMass.getCurrPrice())) {
 			goods.setGoodsRegMsg("판매가 오류");

+ 1 - 0
src/main/java/com/style24/scm/biz/web/TssGoodsController.java

@@ -1235,6 +1235,7 @@ public class TssGoodsController extends TssBaseController {
 			String[] goodsNames = {"goodsNum", "brandCd", "goodsNm", "itemkindCd", "styleYear", "seasonCd",
 				"sexGb", "formalGb", "ageGrpCd", "originCd", "makeYmd", "goodsTitles",
 				"goodsContent", "goodsCharacter",
+				"certTargetGb", "certFormGb", "certType", "certNum",
 				"niClsfCd", "niContent1", "niContent2", "niContent3", "niContent4", "niContent5",
 				"niContent6", "niContent7", "niContent8", "niContent9", "niContent10", "niContent11", "niContent12",
 				"niContent13", "niContent14", "niContent15", "niContent16", "niContent17", "niContent18",