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

다다익선 - 저장로직 수정

bin2107 5 лет назад
Родитель
Сommit
f4476b33ed

+ 1 - 0
src/main/java/com/style24/admin/biz/service/TsaMorebetterService.java

@@ -137,6 +137,7 @@ public class TsaMorebetterService {
      * @author bin2107
      * @author bin2107
      * @since 2021. 1. 5
      * @since 2021. 1. 5
      */
      */
+    @Transactional("shopTxnManager")
     public void saveMoreBetterDetail(MoreBetter moreBetter) {
     public void saveMoreBetterDetail(MoreBetter moreBetter) {
         // <,> replace 처리
         // <,> replace 처리
         moreBetter.setRegNo(TsaSession.getInfo().getUserNo());
         moreBetter.setRegNo(TsaSession.getInfo().getUserNo());

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

@@ -702,16 +702,18 @@
 	});
 	});
 
 
 	var fnMorebetterSaveCollback = function(result){
 	var fnMorebetterSaveCollback = function(result){
-		console.log('duplicateYn::::'+result.duplicateYn);
+		mcxDialog.alert(result.message);
+
 		if(result.duplicateYn == "Y"){
 		if(result.duplicateYn == "Y"){
-			console.log('duplicateGoodsList Size::'+ result.duplicateGoodsList.length);
+			//console.log('duplicateGoodsList Size::'+ result.duplicateGoodsList.length);
 			for(let i=0; i<result.duplicateGoodsList.length; i++){
 			for(let i=0; i<result.duplicateGoodsList.length; i++){
 				gagaAgGrid.addRowData(gridOptionsDuplicateGoodsList, {"goodsCd" : result.duplicateGoodsList[i].goodsCd, "goodsNm" : result.duplicateGoodsList[i].goodsNm});
 				gagaAgGrid.addRowData(gridOptionsDuplicateGoodsList, {"goodsCd" : result.duplicateGoodsList[i].goodsCd, "goodsNm" : result.duplicateGoodsList[i].goodsNm});
 			}
 			}
 			mcxDialog.alert("다른 다다익선에서 사용중인 상품이 존재합니다.");
 			mcxDialog.alert("다른 다다익선에서 사용중인 상품이 존재합니다.");
 			gagaAgGrid.exportToExcel('다다익선 중복상품 목록', gridOptionsDuplicateGoodsList);
 			gagaAgGrid.exportToExcel('다다익선 중복상품 목록', gridOptionsDuplicateGoodsList);
-
-			return;
+			fnMorebetterFormClose();
+			$('#btnInit').trigger('click');
+			$('#btnSearch').trigger('click');
 		}else{
 		}else{
 			//mcxDialog.alert(result.message);
 			//mcxDialog.alert(result.message);
 			fnMorebetterFormClose();
 			fnMorebetterFormClose();