[결함][프로모션] 다다익선 등록오류 ST24PRJ-198

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

@@ -255,8 +255,6 @@ public class TsaMorebetterService {
         }
         */
 
-        
-
         // 업체 & 브랜드 상품
         MoreBetterGoods moreBetterGoods = new MoreBetterGoods();
         StringBuilder sb = new StringBuilder();

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

@@ -68,474 +68,494 @@
 			</otherwise>
 		</choose>
 	</sql>
-
+	
+	<!-- 다다익선 마스터 정보 조회 -->
 	<select id="getMorebetterMstInfo" parameterType="Integer" resultType="MoreBetter">
 		/* TsaMorebetter.getMorebetterMstInfo */
-		SELECT	   	   TT.TMTB_SQ
-					 , TT.TMTB_NM
-					 , TT.TMTB_STAT
-					 , TT.TMTB_ST_DT
-					 , TT.TMTB_ED_DT
-					 , TT.MULTI_YN
-					 , TT.DEL_YN
-					 , TT.REG_NO
-					 , FN_GET_USER_NM(TT.REG_NO) AS REG_NM
-					 , TT.REG_DT
-					 , TT.UPD_NO
-					 , FN_GET_USER_NM(TT.UPD_NO) AS UPD_NM
-					 , TT.UPD_DT
-					 , TS.SECTION_GB
-					 , TS.SECTION_VAL
-					 , TV.DC_WAY
-					 , TV.DC_VAL
-					 , DATE_FORMAT(TT.TMTB_ST_DT , '%Y-%m-%d') AS EVENT_STDT
-					 , DATE_FORMAT(TT.TMTB_ST_DT , '%H') AS EVENT_STHH
-					 , DATE_FORMAT(TT.TMTB_ST_DT , '%i') AS EVENT_STMM
-					 , DATE_FORMAT(TT.TMTB_ED_DT , '%Y-%m-%d') AS EVENT_EDDT
-					 , DATE_FORMAT(TT.TMTB_ED_DT , '%H') AS EVENT_EDHH
-					 , DATE_FORMAT(TT.TMTB_ED_DT , '%i') AS EVENT_EDMM
-		FROM 	TB_TMTB TT
-		INNER 	JOIN TB_TMTB_SECTION TS
-		ON 		TT.TMTB_SQ = TS.TMTB_SQ
-		INNER 	JOIN TB_TMTB_VAL TV
-		ON 		TT.TMTB_SQ = TV.TMTB_SQ
-		AND		TS.TMTB_SECTION_SQ = TV.TMTB_SECTION_SQ
-		WHERE 	1=1
-		  AND 	TT.TMTB_SQ = #{tmtbSq}
-		LIMIT 1
+		SELECT TT.TMTB_SQ
+		     , TT.TMTB_NM
+		     , TT.TMTB_STAT
+		     , TT.TMTB_ST_DT
+		     , TT.TMTB_ED_DT
+		     , TT.MULTI_YN
+		     , TT.DEL_YN
+		     , TT.REG_NO
+		     , FN_GET_USER_NM(TT.REG_NO) AS REG_NM
+		     , TT.REG_DT
+		     , TT.UPD_NO
+		     , FN_GET_USER_NM(TT.UPD_NO) AS UPD_NM
+		     , TT.UPD_DT
+		     , TS.SECTION_GB
+		     , TS.SECTION_VAL
+		     , TV.DC_WAY
+		     , TV.DC_VAL
+		     , DATE_FORMAT(TT.TMTB_ST_DT , '%Y-%m-%d') AS EVENT_STDT
+		     , DATE_FORMAT(TT.TMTB_ST_DT , '%H') AS EVENT_STHH
+		     , DATE_FORMAT(TT.TMTB_ST_DT , '%i') AS EVENT_STMM
+		     , DATE_FORMAT(TT.TMTB_ED_DT , '%Y-%m-%d') AS EVENT_EDDT
+		     , DATE_FORMAT(TT.TMTB_ED_DT , '%H') AS EVENT_EDHH
+		     , DATE_FORMAT(TT.TMTB_ED_DT , '%i') AS EVENT_EDMM
+		FROM   TB_TMTB TT
+		INNER  JOIN TB_TMTB_SECTION TS
+		ON     TT.TMTB_SQ = TS.TMTB_SQ
+		INNER  JOIN TB_TMTB_VAL TV
+		ON     TT.TMTB_SQ = TV.TMTB_SQ
+		AND    TS.TMTB_SECTION_SQ = TV.TMTB_SECTION_SQ
+		WHERE  1=1
+		  AND  TT.TMTB_SQ = #{tmtbSq}
+		LIMIT  1
 	</select>
-
+	
+	<!-- 다다익선 할인구간 정보 조회 -->
 	<select id="getMorebetterSectionValList" parameterType="Integer" resultType="MoreBetterSection">
 		/* TsaMorebetter.getMorebetterSectionValList */
-		SELECT    TS.TMTB_SQ
-				 ,TS.TMTB_SECTION_SQ
-				 ,TV.TMTB_VAL_SQ
-				 ,TS.SECTION_GB
-				 ,TS.SECTION_VAL
-				 ,TV.DC_WAY
-				 ,TV.DC_VAL
-				 ,TS.DEL_YN
-				 ,TS.REG_NO
-				 ,TS.REG_DT
-				 ,TS.UPD_NO
-				 ,TS.UPD_DT
-		FROM	TB_TMTB_SECTION TS
-		INNER 	JOIN TB_TMTB_VAL TV
-		ON 		TS.TMTB_SQ = TV.TMTB_SQ
-		AND		TS.TMTB_SECTION_SQ = TV.TMTB_SECTION_SQ
-		WHERE 	1=1
-		  AND 	TS.TMTB_SQ = #{tmtbSq}
-		  AND   TS.DEL_YN = 'N'
-		ORDER BY TS.TMTB_SQ, TS.TMTB_SECTION_SQ, TV.TMTB_VAL_SQ
+		SELECT TS.TMTB_SQ
+		     , TS.TMTB_SECTION_SQ
+		     , TV.TMTB_VAL_SQ
+		     , TS.SECTION_GB
+		     , TS.SECTION_VAL
+		     , TV.DC_WAY
+		     , TV.DC_VAL
+		     , TS.DEL_YN
+		     , TS.REG_NO
+		     , TS.REG_DT
+		     , TS.UPD_NO
+		     , TS.UPD_DT
+		FROM   TB_TMTB_SECTION TS
+		INNER  JOIN TB_TMTB_VAL TV
+		ON     TS.TMTB_SQ = TV.TMTB_SQ
+		AND    TS.TMTB_SECTION_SQ = TV.TMTB_SECTION_SQ
+		WHERE  1=1
+		AND    TS.TMTB_SQ = #{tmtbSq}
+		AND    TS.DEL_YN = 'N'
+		ORDER  BY TS.TMTB_SQ
+		     , TS.TMTB_SECTION_SQ
+		     , TV.TMTB_VAL_SQ
 	</select>
-
+	
+	<!-- 다다익선 업체상품 정보 조회 -->
 	<select id="getMorebetterSupplyCompList" parameterType="MoreBetterGoods" resultType="MoreBetterGoods">
 		/* TsaMorebetter.getMorebetterSupplyCompList */
-		SELECT 	 TMTB_GOODS_SQ
-				 , TMTB_SQ
-				 , GOODS_GB
-				 , TARGET_GB
-				 , TARGET_VAL
-				 , TARGET_VAL AS SUPPLY_COMP_CD
-				 , FN_GET_SUPPLY_COMP_NM(TARGET_VAL) AS SUPPLY_COMP_NM
-				 , DEL_YN
-				 , REG_NO
-				 , REG_DT
-				 , UPD_NO
-				 , UPD_DT
-		FROM TB_TMTB_GOODS
-		WHERE 1=1
-		  AND TMTB_SQ = #{tmtbSq}
-		  AND TARGET_GB = 'G260_13'
-		  AND DEL_YN = 'N'
+		SELECT TMTB_GOODS_SQ
+		     , TMTB_SQ
+		     , GOODS_GB
+		     , TARGET_GB
+		     , TARGET_VAL
+		     , TARGET_VAL AS SUPPLY_COMP_CD
+		     , FN_GET_SUPPLY_COMP_NM(TARGET_VAL) AS SUPPLY_COMP_NM
+		     , DEL_YN
+		     , REG_NO
+		     , REG_DT
+		     , UPD_NO
+		     , UPD_DT
+		FROM   TB_TMTB_GOODS
+		WHERE  1=1
+		AND    TMTB_SQ = #{tmtbSq}
+		AND    TARGET_GB = 'G260_13'
+		AND    DEL_YN = 'N'
 	</select>
-
+	
+	<!-- 다다익선 브랜드상품 정보 조회 -->
 	<select id="getMorebetterBrandList" parameterType="MoreBetterGoods" resultType="MoreBetterGoods">
 		/* TsaMorebetter.getMorebetterBrandList */
-		SELECT 	 TMTB_GOODS_SQ
-				 , TMTB_SQ
-				 , GOODS_GB
-				 , TARGET_GB
-				 , TARGET_VAL
-				 , TARGET_VAL AS BRAND_CD
-				 , (SELECT   BRAND_ENM
-					FROM  TB_BRAND
-					WHERE BRAND_CD = TARGET_VAL) AS BRAND_ENM
-				 , (SELECT   FN_GET_SUPPLY_COMP_NM(SUPPLY_COMP_CD)
-					FROM  TB_BRAND
-					WHERE BRAND_CD = TARGET_VAL) AS SUPPLY_COMP_NM
-				 , DEL_YN
-				 , REG_NO
-				 , REG_DT
-				 , UPD_NO
-				 , UPD_DT
-		FROM TB_TMTB_GOODS
-		WHERE 1=1
-		  AND TMTB_SQ = #{tmtbSq}
-		  AND TARGET_GB = 'G260_12'
-		  AND DEL_YN = 'N'
+		SELECT TMTB_GOODS_SQ
+		     , TMTB_SQ
+		     , GOODS_GB
+		     , TARGET_GB
+		     , TARGET_VAL
+		     , TARGET_VAL AS BRAND_CD
+		     , (SELECT BRAND_ENM
+		        FROM   TB_BRAND
+		        WHERE  BRAND_CD = TARGET_VAL) AS BRAND_ENM
+		     , (SELECT FN_GET_SUPPLY_COMP_NM(SUPPLY_COMP_CD)
+		        FROM   TB_BRAND
+		        WHERE  BRAND_CD = TARGET_VAL) AS SUPPLY_COMP_NM
+		     , DEL_YN
+		     , REG_NO
+		     , REG_DT
+		     , UPD_NO
+		     , UPD_DT
+		FROM   TB_TMTB_GOODS
+		WHERE  1=1
+		AND    TMTB_SQ = #{tmtbSq}
+		AND    TARGET_GB = 'G260_12'
+		AND    DEL_YN = 'N'
 	</select>
-
+	
+	<!-- 다다익선 적용상품 정보 조회 -->
 	<select id="getMorebetterApplyGoodsList" parameterType="MoreBetterGoods" resultType="MoreBetterGoods">
 		/* TsaMorebetter.getMorebetterApplyGoodsList */
-		SELECT 	 A.TMTB_GOODS_SQ
-		       , A.TMTB_SQ
-		       , B.TMTB_APPLY_GOODS_SQ
-		       , A.GOODS_GB
-		       , A.TARGET_GB
-		       , A.TARGET_VAL
-		       , A.TARGET_VAL AS GOODS_CD
-		       , (SELECT  GOODS_NM
-		      	FROM  TB_GOODS
+		SELECT A.TMTB_GOODS_SQ
+		     , A.TMTB_SQ
+		     , B.TMTB_APPLY_GOODS_SQ
+		     , A.GOODS_GB
+		     , A.TARGET_GB
+		     , A.TARGET_VAL
+		     , A.TARGET_VAL AS GOODS_CD
+		     , (SELECT GOODS_NM
+		      	FROM   TB_GOODS
 		      	WHERE  GOODS_CD = A.TARGET_VAL) AS GOODS_NM
-		       , A.DEL_YN
-		       , A.REG_NO
-		       , A.REG_DT
-		       , A.UPD_NO
-		       , A.UPD_DT
-		FROM 		TB_TMTB_GOODS A
-		INNER JOIN 	TB_TMTB_APPLY_GOODS B
-		      ON 	A.TMTB_SQ = B.TMTB_SQ
-		      AND A.GOODS_GB = B.GOODS_GB
-		      AND A.TARGET_VAL = B.GOODS_CD
-		WHERE 1=1
-		  AND A.TMTB_SQ = #{tmtbSq}
-		  AND A.TARGET_GB = 'G260_10'
-		  AND A.GOODS_GB = #{goodsGb}
- 		  AND A.DEL_YN = 'N'
-		GROUP BY A.TMTB_GOODS_SQ, B.TMTB_APPLY_GOODS_SQ
+		     , A.DEL_YN
+		     , A.REG_NO
+		     , A.REG_DT
+		     , A.UPD_NO
+		     , A.UPD_DT
+		FROM   TB_TMTB_GOODS A
+		INNER  JOIN TB_TMTB_APPLY_GOODS B
+		ON 	   A.TMTB_SQ = B.TMTB_SQ
+		AND    A.GOODS_GB = B.GOODS_GB
+		AND    A.TARGET_VAL = B.GOODS_CD
+		WHERE  1=1
+		AND    A.TMTB_SQ = #{tmtbSq}
+		AND    A.TARGET_GB = 'G260_10'
+		AND    A.GOODS_GB = #{goodsGb}
+ 		AND    A.DEL_YN = 'N'
+		GROUP  BY A.TMTB_GOODS_SQ
+		     , B.TMTB_APPLY_GOODS_SQ
 	</select>
-
+	
+	<!-- 다다익선 제외상품 정보 조회 -->
 	<select id="getMorebetterExceptGoodsList" parameterType="MoreBetterGoods" resultType="MoreBetterGoods">
 		/* TsaMorebetter.getMorebetterExceptGoodsList */
-		SELECT 	 A.TMTB_GOODS_SQ
-				 , A.TMTB_SQ
-				 , B.TMTB_APPLY_GOODS_SQ
-				 , A.GOODS_GB
-				 , A.TARGET_GB
-				 , A.TARGET_VAL
-				 , A.TARGET_VAL AS GOODS_CD
-				 , (SELECT  GOODS_NM
-					FROM  TB_GOODS
-					WHERE  GOODS_CD = A.TARGET_VAL) AS GOODS_NM
-				 , A.DEL_YN
-				 , A.REG_NO
-				 , A.REG_DT
-				 , A.UPD_NO
-				 , A.UPD_DT
-			FROM 	TB_TMTB_GOODS A
-		INNER JOIN 	TB_TMTB_APPLY_GOODS B
-			 ON 	A.TMTB_SQ = B.TMTB_SQ
-			AND 	A.GOODS_GB = B.GOODS_GB
-			AND 	A.TARGET_VAL = B.GOODS_CD
-		WHERE 1=1
-		  AND A.TMTB_SQ = #{tmtbSq}
-		  AND A.TARGET_GB = 'G260_10'
-		  AND A.GOODS_GB IN ('G800_30')
-		  AND A.DEL_YN = 'N'
-		GROUP BY A.TMTB_GOODS_SQ, B.TMTB_APPLY_GOODS_SQ
+		SELECT A.TMTB_GOODS_SQ
+		     , A.TMTB_SQ
+		     , B.TMTB_APPLY_GOODS_SQ
+		     , A.GOODS_GB
+		     , A.TARGET_GB
+		     , A.TARGET_VAL
+		     , A.TARGET_VAL AS GOODS_CD
+		     , (SELECT  GOODS_NM
+		        FROM    TB_GOODS
+		        WHERE  GOODS_CD = A.TARGET_VAL) AS GOODS_NM
+		     , A.DEL_YN
+		     , A.REG_NO
+		     , A.REG_DT
+		     , A.UPD_NO
+		     , A.UPD_DT
+		FROM   TB_TMTB_GOODS A
+		INNER  JOIN TB_TMTB_APPLY_GOODS B
+		ON 	   A.TMTB_SQ = B.TMTB_SQ
+		AND    A.GOODS_GB = B.GOODS_GB
+		AND    A.TARGET_VAL = B.GOODS_CD
+		WHERE  1=1
+		AND    A.TMTB_SQ = #{tmtbSq}
+		AND    A.TARGET_GB = 'G260_10'
+		AND    A.GOODS_GB IN ('G800_30')
+		AND    A.DEL_YN = 'N'
+		GROUP  BY A.TMTB_GOODS_SQ
+		     , B.TMTB_APPLY_GOODS_SQ
 	</select>
-
+	
+	<!-- 다다익선 분담율 정보 조회 -->
 	<select id="getMorebetterBurdenList" parameterType="Integer" resultType="MoreBetterBurden">
 		/* TsaMorebetter.getMorebetterBurdenList */
-		SELECT 		TB_TMTB_BURDEN_SQ
-				   , TMTB_SQ
-				   , TMTB_SUPPLY_CD
-				   , FN_GET_SUPPLY_COMP_NM(TMTB_SUPPLY_CD) AS SUPPLY_COMP_NM
-				   , TMTB_BURDEN_RATE
-				   , USE_YN
-				   , REG_NO
-				   , REG_DT
-				   , UPD_NO
-				   , UPD_DT
-		FROM TB_TMTB_BURDEN
-		WHERE 1=1
-		  AND TMTB_SQ = #{tmtbSq}
-		  AND USE_YN = 'Y'
+		SELECT TB_TMTB_BURDEN_SQ
+		     , TMTB_SQ
+		     , TMTB_SUPPLY_CD
+		     , FN_GET_SUPPLY_COMP_NM(TMTB_SUPPLY_CD) AS SUPPLY_COMP_NM
+		     , TMTB_BURDEN_RATE
+		     , USE_YN
+		     , REG_NO
+		     , REG_DT
+		     , UPD_NO
+		     , UPD_DT
+		FROM   TB_TMTB_BURDEN
+		WHERE  1=1
+		  AND  TMTB_SQ = #{tmtbSq}
+		  AND  USE_YN = 'Y'
 	</select>
-
+	
+	<!-- 다다익선 마스터정보 등록 -->
 	<insert id="saveMorebetterMst" parameterType="MoreBetter" keyProperty="tmtbSq">
 		/* TsaMorebetter.saveMorebetterMst */
-		INSERT INTO TB_TMTB(
-		        TMTB_SQ
-		        ,TMTB_NM
-				,TMTB_STAT
-				,TMTB_ST_DT
-				,TMTB_ED_DT
-				,APPLY_GB
-				,MULTI_YN
-				,DEL_YN
-				,REG_NO
-				,REG_DT
-				,UPD_NO
-				,UPD_DT
+		INSERT INTO TB_TMTB (
+		    TMTB_SQ
+		    , TMTB_NM
+		    , TMTB_STAT
+		    , TMTB_ST_DT
+		    , TMTB_ED_DT
+		    , APPLY_GB
+		    , MULTI_YN
+		    , DEL_YN
+		    , REG_NO
+		    , REG_DT
+		    , UPD_NO
+		    , UPD_DT
 		) VALUES (
-			#{tmtbSq}
-		    ,#{tmtbNm}
-			,#{tmtbStat}
-			,DATE_FORMAT(#{tmtbStdt},'%Y-%m-%d %H:%i:%s')
-			,DATE_FORMAT(#{tmtbEddt},'%Y-%m-%d %H:%i:%s')
-			,#{applyGb}
-			,'Y'
-			,'N'
-			,#{regNo}
-			,NOW()
-			,#{updNo}
-			,NOW()
+		    #{tmtbSq}
+		    , #{tmtbNm}
+		    , #{tmtbStat}
+		    , DATE_FORMAT(#{tmtbStdt},'%Y-%m-%d %H:%i:%s')
+		    , DATE_FORMAT(#{tmtbEddt},'%Y-%m-%d %H:%i:%s')
+		    , #{applyGb}
+		    , 'Y'
+		    , 'N'
+		    , #{regNo}
+		    , NOW()
+		    , #{updNo}
+		    , NOW()
 		)
 		ON DUPLICATE KEY UPDATE
-			TMTB_NM = #{tmtbNm}
-			,TMTB_STAT = #{tmtbStat}
-			,TMTB_ST_DT = #{tmtbStdt}
-			,TMTB_ED_DT = #{tmtbEddt}
-			,APPLY_GB = #{applyGb}
-			,UPD_NO = #{updNo}
-			,UPD_DT = NOW()
+		    TMTB_NM = #{tmtbNm}
+		    , TMTB_STAT = #{tmtbStat}
+		    , TMTB_ST_DT = #{tmtbStdt}
+		    , TMTB_ED_DT = #{tmtbEddt}
+		    , APPLY_GB = #{applyGb}
+		    , UPD_NO = #{updNo}
+		    , UPD_DT = NOW()
 	</insert>
-
+	
+	<!-- 다다익선 기본정보 등록 -->
 	<insert id="saveMorebetterGoods" parameterType="MoreBetterGoods" keyProperty="tmtbGoodsSq">
 		/* TsaMorebetter.saveMorebetterGoods */
-		INSERT INTO TB_TMTB_GOODS(
-		         	 TMTB_GOODS_SQ
-		        	,TMTB_SQ
-					,GOODS_GB
-					,TARGET_GB
-					,TARGET_VAL
-					,DEL_YN
-					,REG_NO
-					,REG_DT
-					,UPD_NO
-					,UPD_DT
-			)
-			VALUES (
-			         #{tmtbGoodsSq}
-			        ,#{tmtbSq}
-				    ,#{goodsGb}
-				    ,#{targetGb}
-				    ,#{targetVal}
-				    ,'N'
-				    ,#{regNo}
-				    ,NOW()
-				    ,#{updNo}
-				    ,NOW()
-				   )
-			ON DUPLICATE KEY UPDATE
-						 GOODS_GB = #{goodsGb}
-						,TARGET_GB = #{targetGb}
-						,TARGET_VAL = #{targetVal}
-			    		,DEL_YN = #{delYn}
-						,UPD_NO = #{updNo}
-						,UPD_DT = NOW()
+		INSERT INTO TB_TMTB_GOODS (
+		    TMTB_GOODS_SQ
+		    , TMTB_SQ
+		    , GOODS_GB
+		    , TARGET_GB
+		    , TARGET_VAL
+		    , DEL_YN
+		    , REG_NO
+		    , REG_DT
+		    , UPD_NO
+		    , UPD_DT
+		) VALUES (
+		    #{tmtbGoodsSq}
+		    , #{tmtbSq}
+		    , #{goodsGb}
+		    , #{targetGb}
+		    , #{targetVal}
+		    , 'N'
+		    , #{regNo}
+		    , NOW()
+		    , #{updNo}
+		    , NOW()
+		)
+		ON DUPLICATE KEY UPDATE
+		    GOODS_GB = #{goodsGb}
+		    , TARGET_GB = #{targetGb}
+		    , TARGET_VAL = #{targetVal}
+		    , DEL_YN = #{delYn}
+		    , UPD_NO = #{updNo}
+		    , UPD_DT = NOW()
 	</insert>
-
+	
+	<!-- 다다익선 적용정보 등록 -->
 	<insert id="saveMorebetterApplyGoods" parameterType="MoreBetterGoods" keyProperty="tmtbApplyGoodsSq">
 		/* TsaMorebetter.saveMorebetterApplyGoods */
-		INSERT INTO TB_TMTB_APPLY_GOODS(
-					TMTB_APPLY_GOODS_SQ
-					,TMTB_SQ
-					,GOODS_GB
-					,GOODS_CD
-					,DEL_YN
-					,REG_NO
-					,REG_DT
-					,UPD_NO
-					,UPD_DT
+		INSERT INTO TB_TMTB_APPLY_GOODS (
+		    TMTB_APPLY_GOODS_SQ
+		    , TMTB_SQ
+		    , GOODS_GB
+		    , GOODS_CD
+		    , DEL_YN
+		    , REG_NO
+		    , REG_DT
+		    , UPD_NO
+		    , UPD_DT
+		) VALUES (
+		    #{tmtbApplyGoodsSq}
+		    , #{tmtbSq}
+		    , #{goodsGb}
+		    , #{goodsCd}
+		    , 'N'
+		    , #{regNo}
+		    , NOW()
+		    , #{updNo}
+		    , NOW()
 		)
-		VALUES (
-				#{tmtbApplyGoodsSq}
-			   ,#{tmtbSq}
-			   ,#{goodsGb}
-			   ,#{goodsCd}
-			   ,'N'
-			   ,#{regNo}
-			   ,NOW()
-			   ,#{updNo}
-			   ,NOW()
-			   )
-			ON DUPLICATE KEY UPDATE
-								 GOODS_GB = #{goodsGb}
-								 ,GOODS_CD = #{goodsCd}
-								 ,UPD_NO = #{updNo}
-								 ,UPD_DT = NOW()
+		ON DUPLICATE KEY UPDATE
+		    GOODS_GB = #{goodsGb}
+		    , GOODS_CD = #{goodsCd}
+		    , UPD_NO = #{updNo}
+		    , UPD_DT = NOW()
 	</insert>
-
+	
+	<!-- 다다익선 할인구간정보 등록 -->
 	<insert id="saveMorebetterSection" parameterType="MoreBetterSection" keyProperty="tmtbSectionSq">
 		/* TsaMorebetter.saveMorebetterSection */
-		INSERT INTO TB_TMTB_SECTION(
-					 TMTB_SECTION_SQ
-					,TMTB_SQ
-					,SECTION_GB
-					,SECTION_VAL
-					,DEL_YN
-					,REG_NO
-					,REG_DT
-					,UPD_NO
-					,UPD_DT
-			)
-			VALUES (
-					 #{tmtbSectionSq}
-					,#{tmtbSq}
-					,#{sectionGb}
-				    ,#{sectionVal}
-				    ,'N'
-				    ,#{regNo}
-				    ,NOW()
-				    ,#{updNo}
-				    ,NOW()
-				   )
-			ON DUPLICATE KEY UPDATE
-						 SECTION_GB = #{sectionGb}
-						,SECTION_VAL = #{sectionVal}
-						,DEL_YN = #{delYn}
-						,UPD_NO = #{updNo}
-						,UPD_DT = NOW()
+		INSERT INTO TB_TMTB_SECTION (
+		    TMTB_SECTION_SQ
+		    , TMTB_SQ
+		    , SECTION_GB
+		    , SECTION_VAL
+		    , DEL_YN
+		    , REG_NO
+		    , REG_DT
+		    , UPD_NO
+		    , UPD_DT
+		) VALUES (
+		    #{tmtbSectionSq}
+		    , #{tmtbSq}
+		    , #{sectionGb}
+		    , #{sectionVal}
+		    , 'N'
+		    , #{regNo}
+		    , NOW()
+		    , #{updNo}
+		    , NOW()
+		)
+		ON DUPLICATE KEY UPDATE
+		    SECTION_GB = #{sectionGb}
+		    , SECTION_VAL = #{sectionVal}
+		    , DEL_YN = #{delYn}
+		    , UPD_NO = #{updNo}
+		    , UPD_DT = NOW()
 	</insert>
-
+	
+	<!-- 다다익선 할인정보 등록 -->
 	<insert id="saveMorebetterVal" parameterType="MoreBetterSection" keyProperty="tmtbValSq">
 		/* TsaMorebetter.saveMorebetterVal */
-		INSERT INTO TB_TMTB_VAL(
-					 TMTB_VAL_SQ
-					,TMTB_SQ
-					,TMTB_SECTION_SQ
-					,DC_WAY
-					,DC_VAL
-					,DEL_YN
-					,REG_NO
-					,REG_DT
-					,UPD_NO
-					,UPD_DT
-			)
-			VALUES (
-					#{tmtbValSq}
-				   ,#{tmtbSq}
-				   ,#{tmtbSectionSq}
-				   ,#{dcWay}
-				   ,#{dcVal}
-				   ,'N'
-				   ,#{regNo}
-				   ,NOW()
-				   ,#{updNo}
-				   ,NOW()
-				   )
-			ON DUPLICATE KEY UPDATE
-						 DC_WAY = #{dcWay}
-						,DC_VAL = #{dcVal}
-						,DEL_YN = #{delYn}
-						,UPD_NO = #{updNo}
-						,UPD_DT = NOW()
+		INSERT INTO TB_TMTB_VAL (
+		    TMTB_VAL_SQ
+		    , TMTB_SQ
+		    , TMTB_SECTION_SQ
+		    , DC_WAY
+		    , DC_VAL
+		    , DEL_YN
+		    , REG_NO
+		    , REG_DT
+		    , UPD_NO
+		    , UPD_DT
+		) VALUES (
+		    #{tmtbValSq}
+		    , #{tmtbSq}
+		    , #{tmtbSectionSq}
+		    , #{dcWay}
+		    , #{dcVal}
+		    , 'N'
+		    , #{regNo}
+		    , NOW()
+		    , #{updNo}
+		    , NOW()
+		)
+		ON DUPLICATE KEY UPDATE
+		    DC_WAY = #{dcWay}
+		    , DC_VAL = #{dcVal}
+		    , DEL_YN = #{delYn}
+		    , UPD_NO = #{updNo}
+		    , UPD_DT = NOW()
 	</insert>
-
+	
+	<!-- 다다익선 분담율정보 등록 -->
 	<insert id="saveMorebetterBurden" parameterType="MoreBetterBurden" keyProperty="tbTmtbBurdenSq">
 		/* TsaMorebetter.saveMorebetterBurden */
-		INSERT INTO TB_TMTB_BURDEN(
-								  TB_TMTB_BURDEN_SQ
-		                          ,TMTB_SQ
-								  ,TMTB_SUPPLY_CD
-								  ,TMTB_BURDEN_RATE
-								  ,USE_YN
-								  ,REG_NO
-								  ,REG_DT
-								  ,UPD_NO
-								  ,UPD_DT
+		INSERT INTO TB_TMTB_BURDEN (
+		    TB_TMTB_BURDEN_SQ
+		    , TMTB_SQ
+		    , TMTB_SUPPLY_CD
+		    , TMTB_BURDEN_RATE
+		    , USE_YN
+		    , REG_NO
+		    , REG_DT
+		    , UPD_NO
+		    , UPD_DT
 		) VALUES (
-			    #{tbTmtbBurdenSq}
-		       ,#{tmtbSq}
-			   ,#{tmtbSupplyCd}
-			   ,IFNULL(#{tmtbBurdenRate},0)
-			   ,#{useYn}
-			   ,#{regNo}
-			   ,NOW()
-			   ,#{updNo}
-			   ,NOW()
-			   )
-			ON DUPLICATE KEY UPDATE
-								 TMTB_SUPPLY_CD = #{tmtbSupplyCd}
-								 ,TMTB_BURDEN_RATE = IFNULL(#{tmtbBurdenRate},0)
-								 ,USE_YN = #{useYn}
-								 ,UPD_NO = #{updNo}
-								 ,UPD_DT = NOW()
+		    #{tbTmtbBurdenSq}
+		    , #{tmtbSq}
+		    , #{tmtbSupplyCd}
+		    , IFNULL(#{tmtbBurdenRate},0)
+		    , #{useYn}
+		    , #{regNo}
+		    , NOW()
+		    , #{updNo}
+		    , NOW()
+		)
+		ON DUPLICATE KEY UPDATE
+		    TMTB_SUPPLY_CD = #{tmtbSupplyCd}
+		    , TMTB_BURDEN_RATE = IFNULL(#{tmtbBurdenRate},0)
+		    , USE_YN = #{useYn}
+		    , UPD_NO = #{updNo}
+		    , UPD_DT = NOW()
 	</insert>
-
+	
+	<!-- 다다익선 업체 정보 삭제 -->
 	<delete id="deleteTmtbSupplyCompanyList" parameterType="MoreBetterGoods">
 		/* TsaMorebetter.deleteTmtbSupplyCompanyList */
 		DELETE FROM TB_TMTB_GOODS
 		WHERE TMTB_SQ =  #{tmtbSq}
-		<if test="arrCompanySq != null and arrCompanySq.length>0">
+		<if test="arrCompanySq != null and arrCompanySq.length > 0">
 			AND TMTB_GOODS_SQ IN
 			<foreach collection="arrCompanySq" item="item" index="index"  open="(" close=")" separator=",">
 				#{item}
 			</foreach>
 		</if>
 	</delete>
-
+	
+	<!-- 다다익선 브랜드 정보 삭제 -->
 	<delete id="deleteTmtbBrandList" parameterType="MoreBetterGoods">
 		/* TsaMorebetter.deleteTmtbBrandList */
 		DELETE FROM TB_TMTB_GOODS
-		WHERE TMTB_SQ =  #{tmtbSq}
-		<if test="arrBrandSq != null and arrBrandSq.length>0">
+		WHERE  TMTB_SQ =  #{tmtbSq}
+		<if test="arrBrandSq != null and arrBrandSq.length > 0">
 			AND TMTB_GOODS_SQ IN
 			<foreach collection="arrBrandSq" item="item" index="index"  open="(" close=")" separator=",">
 				#{item}
 			</foreach>
 		</if>
 	</delete>
-
+	
+	<!-- 다다익선 적용상품 삭제 -->
 	<delete id="deleteTmtbApplyGoodsList" parameterType="MoreBetterGoods">
 		/* TsaMorebetter.deleteTmtbApplyGoodsList */
 		DELETE FROM TB_TMTB_GOODS
-		WHERE TMTB_SQ =  #{tmtbSq}
-		<if test="arrApplyGoodsSq != null and arrApplyGoodsSq.length>0">
-			AND TMTB_GOODS_SQ IN
+		WHERE  TMTB_SQ =  #{tmtbSq}
+		<if test="arrApplyGoodsSq != null and arrApplyGoodsSq.length > 0">
+		AND    TMTB_GOODS_SQ IN
 			<foreach collection="arrApplyGoodsSq" item="item" index="index"  open="(" close=")" separator=",">
-				#{item}
+		       #{item}
 			</foreach>
 		</if>
 	</delete>
-
+	
+	<!-- 다다익선예외상품삭제 -->
 	<delete id="deleteTmtbExceptGoodsList" parameterType="MoreBetterGoods">
 		/* TsaMorebetter.deleteTmtbExceptGoodsList */
 		DELETE FROM TB_TMTB_GOODS
-		WHERE TMTB_SQ =  #{tmtbSq}
-		<if test="arrExceptGoodsSq != null and arrExceptGoodsSq.length>0">
-			AND TMTB_GOODS_SQ IN
+		WHERE  TMTB_SQ =  #{tmtbSq}
+		<if test="arrExceptGoodsSq != null and arrExceptGoodsSq.length > 0">
+		AND    TMTB_GOODS_SQ IN
 			<foreach collection="arrExceptGoodsSq" item="item" index="index"  open="(" close=")" separator=",">
-				#{item}
+		       #{item}
 			</foreach>
 		</if>
 	</delete>
-
+	
+	<!-- 다다익선 구간 삭제 -->
 	<delete id="deleteTmtbSectionList" parameterType="MoreBetterSection">
 		/* TsaMorebetter.deleteTmtbSectionList */
 		DELETE FROM TB_TMTB_SECTION
-		WHERE TMTB_SQ =  #{tmtbSq}
-		<if test="arrSectionSq != null and arrSectionSq.length>0">
-			AND TMTB_SECTION_SQ IN
+		WHERE  TMTB_SQ =  #{tmtbSq}
+		<if test="arrSectionSq != null and arrSectionSq.length > 0">
+		AND    TMTB_SECTION_SQ IN
 			<foreach collection="arrSectionSq" item="item" index="index"  open="(" close=")" separator=",">
-				#{item}
+		       #{item}
 			</foreach>
 		</if>
 	</delete>
-
+	
+	<!-- 다다익선 할인율 삭제 -->
 	<delete id="deleteTmtbValList" parameterType="MoreBetterSection">
 		/* TsaMorebetter.deleteTmtbValList */
 		DELETE FROM TB_TMTB_VAL
-		WHERE TMTB_SQ =  #{tmtbSq}
-		<if test="arrSectionSq != null and arrSectionSq.length>0">
-			AND TMTB_SECTION_SQ IN
+		WHERE  TMTB_SQ =  #{tmtbSq}
+		<if test="arrSectionSq != null and arrSectionSq.length > 0">
+		AND    TMTB_SECTION_SQ IN
 			<foreach collection="arrSectionSq" item="item" index="index"  open="(" close=")" separator=",">
-				#{item}
+		       #{item}
 			</foreach>
 		</if>
 	</delete>
-
+	
+	<!-- 다다익선 분담율 삭제 -->
 	<delete id="deleteTmtbBurdenList" parameterType="MoreBetterGoods">
 		/* TsaMorebetter.deleteTmtbBurdenList */
 		DELETE FROM TB_TMTB_BURDEN
-		WHERE TMTB_SQ =  #{tmtbSq}
-		<if test="arrBurdenSq != null and arrBurdenSq.length>0">
-			AND TB_TMTB_BURDEN_SQ IN
+		WHERE  TMTB_SQ =  #{tmtbSq}
+		<if test="arrBurdenSq != null and arrBurdenSq.length > 0">
+		AND    TB_TMTB_BURDEN_SQ IN
 			<foreach collection="arrBurdenSq" item="item" index="index"  open="(" close=")" separator=",">
-				#{item}
+		           #{item}
 			</foreach>
 		</if>
 	</delete>
@@ -544,7 +564,9 @@
 	<select id="getMorebetterDuplicateList" parameterType="MoreBetterGoods" resultType="MoreBetterGoods">
 		/* TsaMorebetter.getMorebetterDuplicateList */
 		SELECT TG.GOODS_CD
-		     , (SELECT GOODS_NM FROM TB_GOODS WHERE GOODS_CD = TG.GOODS_CD) AS GOODS_NM
+		     , (SELECT GOODS_NM 
+		        FROM TB_GOODS 
+		        WHERE GOODS_CD = TG.GOODS_CD) AS GOODS_NM
 		FROM   TB_TMTB T
 		     , TB_TMTB_APPLY_GOODS TG
 		WHERE  T.TMTB_SQ = TG.TMTB_SQ
@@ -559,19 +581,21 @@
 		    AND    TMP.GOODS_CD = TG.GOODS_CD
 		)
 	</select>
-
+	
+	<!-- 다다익선 상태 업데이트 -->
 	<update id="updateMorebetterStat" parameterType="MoreBetter">
 		/* TsaMorebetter.updateMorebetterStat */
-		UPDATE TB_TMTB SET
-			TMTB_STAT = #{tmtbStat}
+		UPDATE TB_TMTB 
+		SET    TMTB_STAT = #{tmtbStat}
 		<if test="tmtbStat == 'G232_14'">
-			, DEL_YN = 'Y'
+		     , DEL_YN = 'Y'
 		</if>
-			, UPD_NO = #{updNo}
-			, UPD_DT = NOW()
+		     , UPD_NO = #{updNo}
+		     , UPD_DT = NOW()
 		WHERE TMTB_SQ = #{tmtbSq}
 	</update>
-
+	
+	<!-- 다다익선 상품 삭제 -->
 	<update id="deleteTmtbGoods" parameterType="MoreBetter">
 		/* TsaMorebetter.deleteTmtbGoods */
 		UPDATE TB_TMTB_GOODS 
@@ -581,42 +605,45 @@
 		 WHERE TMTB_SQ = #{tmtbSq}
 		   AND DEL_YN = 'N'
 	</update>
-
+	
+	<!-- 다다익선 할인 분담율 삭제 -->
 	<update id="deleteTmtbBurden" parameterType="MoreBetter">
 		/* TsaMorebetter.deleteTmtbBurden */
 		UPDATE TB_TMTB_BURDEN 
 		   SET USE_YN = 'N'
 		     , UPD_NO = #{updNo}
-			 , UPD_DT = CURRENT_TIMESTAMP
+		     , UPD_DT = CURRENT_TIMESTAMP
 		 WHERE TMTB_SQ = #{tmtbSq}
 		   AND USE_YN = 'Y'
 	</update>
-
+	
+	<!-- 다다익선 할인 구간 삭제 -->
 	<update id="deleteTmtbSection" parameterType="MoreBetter">
 		/* TsaMorebetter.deleteTmtbSection */
-		UPDATE TB_TMTB_SECTION SET
-			DEL_YN = 'Y'
-			, UPD_NO = #{updNo}
-			, UPD_DT = CURRENT_TIMESTAMP
-		WHERE TMTB_SQ = #{tmtbSq}
-		  AND DEL_YN = 'N'
+		UPDATE TB_TMTB_SECTION 
+		SET    DEL_YN = 'Y'
+		     , UPD_NO = #{updNo}
+		     , UPD_DT = CURRENT_TIMESTAMP
+		WHERE  TMTB_SQ = #{tmtbSq}
+		AND    DEL_YN = 'N'
 	</update>
-
+	
+	<!-- 다다익선 할인 값 삭제 -->
 	<update id="deleteTmtbVal" parameterType="MoreBetter">
 		/* TsaMorebetter.deleteTmtbVal */
-		UPDATE TB_TMTB_VAL SET
-			DEL_YN = 'Y'
-			, UPD_NO = #{updNo}
-			, UPD_DT = CURRENT_TIMESTAMP
-		WHERE TMTB_SQ = #{tmtbSq}
-		  AND DEL_YN = 'N'
+		UPDATE TB_TMTB_VAL 
+		SET    DEL_YN = 'Y'
+			 , UPD_NO = #{updNo}
+			 , UPD_DT = CURRENT_TIMESTAMP
+		WHERE  TMTB_SQ = #{tmtbSq}
+		  AND  DEL_YN = 'N'
 	</update>
 	
 	<!-- 다다익선적용상품삭제 -->
 	<delete id="deleteTmtbApplyGoods" parameterType="MoreBetter">
 		/* TsaMarketing.deleteTmtbApplyGoods */
 		DELETE FROM TB_TMTB_APPLY_GOODS
-		WHERE	TMTB_SQ = #{tmtbSq}
+		WHERE  TMTB_SQ = #{tmtbSq}
 	</delete>
 	
 	<!-- 적용상품등록 (다다익선적용상품테이블) -->
@@ -755,37 +782,38 @@
 	<delete id="deleteMorebetterApplyGoodsTemp" parameterType="MoreBetter">
 		/* TsaMorebetter.deleteMorebetterApplyGoodsTemp */
 		DELETE FROM TB_TMTB_APPLY_GOODS_TEMP
-		WHERE	REG_NO = #{regNo}
+		WHERE  REG_NO = #{regNo}
 	</delete>
-
+	
+	<!-- 적용상품임시등록 -->
 	<insert id="insertMorebetterApplyGoodsTemp" parameterType="MoreBetter">
 		/* TsaMorebetter.insertMorebetterApplyGoodsTemp */
 		INSERT INTO TB_TMTB_APPLY_GOODS_TEMP
-		SELECT	T.*
+		SELECT T.*
 		FROM (
-		    SELECT	#{regNo} AS REG_NO
-		          , GOODS_CD
-		          , GOODS_NM
-		    FROM    TB_GOODS
-		    WHERE   1=1
+		    SELECT #{regNo} AS REG_NO
+		         , GOODS_CD
+		         , GOODS_NM
+		    FROM   TB_GOODS
+		    WHERE  1=1
 		    <if test="multiDefaultGoods != null and multiDefaultGoods.length>0">
-		    AND GOODS_CD IN
-		        <foreach collection="multiDefaultGoods" item="item" open="(" separator="," close=")">
+		    AND    GOODS_CD IN
+				<foreach collection="multiDefaultGoods" item="item" open="(" separator="," close=")">
 		        #{item}
-		        </foreach>
+				</foreach>
 		    </if>
 		) T
-		WHERE	1=1
+		WHERE  1=1
 		<if test="multiExceptGoods != null and multiExceptGoods.length>0">
-		AND  T.GOODS_CD NOT IN (
-		                  SELECT    GOODS_CD
-		                  FROM    TB_GOODS
-		                  WHERE    1=1
-		                  AND     GOODS_CD IN
-		                  <foreach collection="multiExceptGoods" item="item" open="(" separator="," close=")">
-		                      #{item}
-		                  </foreach>
-		                )
+		AND    T.GOODS_CD NOT IN (
+		    SELECT GOODS_CD
+		    FROM   TB_GOODS
+			WHERE  1=1
+			AND    GOODS_CD IN
+			<foreach collection="multiExceptGoods" item="item" open="(" separator="," close=")">
+			       #{item}
+			</foreach>
+		)
 		</if>
 	</insert>
 

src/main/webapp/WEB-INF/views/marketing/MorebetterPopupForm.html

@@ -797,6 +797,12 @@
 				return false;
 			}
 		}
+		
+		// 2021.11.10 적용대상정보를설정
+		if (allSupplyCompData.length < 1 && allBrandData.length < 1 && allApplyGoodsData < 1) {
+			mcxDialog.alert("적용대상 정보를 설정해주세요.");
+			return false;
+		}
 
 		// 공급업체+브랜드 상품조회
 		var multiSupplyCompCd = [];
@@ -873,7 +879,7 @@
 			fnMorebetterFormClose();
 			$('#btnInit').trigger('click');
 			$('#btnSearch').trigger('click');
-		}else{
+		} else {
 			//mcxDialog.alert(result.message);
 			fnMorebetterFormClose();
 			$('#btnInit').trigger('click');
@@ -887,7 +893,7 @@
 		var supplyCompCdArr = [];
 		
 		// 기존 리스트 데이터 for
-		for(let i = 0 ; i < result.length ; i++) {
+		for (let i = 0 ; i < result.length ; i++) {
 			let addChk = true, gridListValue = gagaAgGrid.getAllRowData(gridOptionsFGCompanyList);		// 받아온 모든 데이터
 
 			// 받아온 data for
@@ -897,7 +903,7 @@
 			}
 
 			// 중복되지 않은 데이터 리스트에 추가
-			if(addChk) {
+			if (addChk) {
 				gagaAgGrid.addRowData(gridOptionsFGCompanyList, {"supplyCompCd" : result[i].supplyCompCd, "supplyCompNm" : result[i].supplyCompNm, "targetGb" : "G260_13"});
 				
 				// 2021.08.23 업체로정보로 브랜드정보 조회