다다익선 [진행] 상태변경 수정

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

@@ -551,13 +551,11 @@
 		  AND   NOW() BETWEEN T.TMTB_ST_DT AND T.TMTB_ED_DT
 		  AND   T.TMTB_SQ NOT IN (#{tmtbSq})
 		  AND   EXISTS (
-		            SELECT  B.GOODS_CD
-		            FROM    TB_TMTB A, TB_TMTB_APPLY_GOODS B
+		            SELECT  TMP.GOODS_CD
+		            FROM    TB_TMTB_APPLY_GOODS_TEMP TMP
 		            WHERE   1=1
-		              AND   A.TMTB_SQ = B.TMTB_SQ
-		              AND   NOW() BETWEEN A.TMTB_ST_DT AND A.TMTB_ED_DT
-		              AND   B.TMTB_SQ =  #{tmtbSq}
-		              AND   TG.GOODS_CD = B.GOODS_CD
+		              AND   TMP.REG_NO = #{regNo}
+		              AND   TMP.GOODS_CD = TG.GOODS_CD
 			)
 	</select>
 

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

@@ -625,6 +625,27 @@
 			}else{
 				$("#moreBetterForm .buttonSpan").hide();	//행추가,삭제버튼
 			}
+
+			// 대기모드 아닐시 수정안되게 비활성화
+			if(tmtbMstInfo.tmtbStat != "G232_10"){
+				$("#moreBetterForm").find("input[name=tmtbNm]").attr('disabled',true);		// 프로모션명
+				$("#moreBetterForm").find("input[name=eventStdt]").attr('disabled',true);		// 시작일
+				$("#moreBetterForm select[name=eventStHH]").attr("readonly", true);
+				$("#moreBetterForm select[name=eventStHH]").attr("disabled", true);
+				$("#moreBetterForm select[name=eventStMM]").attr("readonly", true);
+				$("#moreBetterForm select[name=eventStMM]").attr("disabled", true);
+				$("#moreBetterForm").find("input[name=eventEddt]").attr('disabled',true);		// 종료일
+				$("#moreBetterForm select[name=eventEdHH]").attr("readonly", true);
+				$("#moreBetterForm select[name=eventEdHH]").attr("disabled", true);
+				$("#moreBetterForm select[name=eventEdMM]").attr("readonly", true);
+				$("#moreBetterForm select[name=eventEdMM]").attr("disabled", true);
+				$("#moreBetterForm input:radio[name='sectionGb']").attr('readonly', true);		// 할인구간
+				$("#moreBetterForm input:radio[name='sectionGb']").prop('disabled', true);
+				$("#moreBetterForm input:radio[name='sectionGb']").parent().prop('disabled', true);
+				$("#moreBetterForm input:radio[name='dcWay']").attr('readonly', true);		// 할인구분
+				$("#moreBetterForm input:radio[name='dcWay']").prop('disabled', true);
+				$("#moreBetterForm input:radio[name='dcWay']").parent().prop('disabled', true);
+			}
 		}
 
 		// 구분 -> 대기로 체크
@@ -1194,6 +1215,11 @@ console.log(jsonData);
 			return false;
 		}
 
+		// 기본상품 1개이상 있는지 체크
+		if(!fnGoodsGbCheck()) {
+			return false;
+		}
+
 		// 공급업체+브랜드 상품조회
 		var multiSupplyCompCd = [];
 		$.each(allSupplyCompData, function(idx, item) {
@@ -1212,11 +1238,15 @@ console.log(jsonData);
 
 		var multiApplyGoods = [];
 		$.each(allApplyGoodsData, function(agIdx, agItem) {
+			var dupCnt = 0;
 			$.each(allDefaultGoodsData, function(idx, item) {
-				if(agItem.goodsCd != item.goodsCd){
-					multiApplyGoods.push(agItem.goodsCd);
+				if(agItem.goodsCd == item.goodsCd){
+					dupCnt++;
 				}
 			});
+			if(dupCnt==0){
+				multiApplyGoods.push(agItem.goodsCd);
+			}
 		});
 
 		var multiExceptGoods = [];
@@ -1270,6 +1300,7 @@ console.log(jsonData);
 						, exceptGoodsList : allExceptGoodsData
 						, burdenList : allApplyBurdenData
 						, sectionGbList : allSectionGbData
+						, defaultGoodsList : allDefaultGoodsData
 						, multiSupplyCompCd : multiSupplyCompCd
 						, multiBrand : multiBrand
 						, multiApplyGoods : multiApplyGoods
@@ -1277,7 +1308,7 @@ console.log(jsonData);
 						, multiDefaultGoods : multiDefaultGoods
 					}
 					var jsonData = JSON.stringify(data);
-					// console.log('jsonData::'+jsonData);
+					console.log('jsonData::'+jsonData);
 					gagajf.ajaxJsonSubmit('/marketing/morebetter/changeStat', jsonData, fnMorebetterChangeStatCollback);
 				}
 			}