Merge branch 'develop' into jsshin

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

@@ -48,10 +48,11 @@ public class TsaOrderChangeService {
 	@Transactional("shopTxnManager")
 	public void returnToExchange(OrderChange orderChange) {
 		Integer ordChgSq = orderChange.getOrdChgSq();
+		Integer ordNo = orderChange.getOrdNo();
 		// 1. 반품 철회 처리
 		GagaMap map = new GagaMap();
 		map.setInt("ordChgSq", ordChgSq);
-		map.setInt("ordNo", orderChange.getOrdNo());
+		map.setInt("ordNo", ordNo);
 
 		int userNo = orderChange.getUserNo();
 
@@ -72,9 +73,15 @@ public class TsaOrderChangeService {
 		}
 
 		// 3. WMS 반품 정보 삭제 처리
-		
+		coreWmsService.updateWmsRecallCancel(ordNo, ordChgSq);
 
 		// 4. 교환 접수 처리
+		Collection<OrderChange> orderChangeDetailInfoList = coreOrderChangeService.getOrderChangeDetailInfo(orderChange);
+		if (orderChangeDetailInfoList != null && orderChangeDetailInfoList.size() > 0) {
+			orderChange.setWdInvoiceNo(orderChangeDetailInfoList.iterator().next().getWdInvoiceNo());
+			orderChange.setWdInvoiceSendYn(orderChangeDetailInfoList.iterator().next().getWdInvoiceSendYn());
+		}
+		
 		coreOrderChangeService.exchReq(orderChange);
 	}
 }

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

@@ -359,6 +359,7 @@
 			}
 			gagaAgGrid.addRowData(gridKeywordGoodsOptions, {"goodsCd" : item.goodsCd, "goodsNm" : item.goodsNm, "crud" : "C"});
 		});
+		uifnPopupClose('popupGoods');
 		return;
 	};
 	

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

@@ -245,12 +245,12 @@
 		
 		// 기존상품
 		var oldGoodsDealList = gagaAgGrid.getAllRowData(gridGoodsDealOptions);
-		var idx = oldGoodsDealList.length+1; 
+		var idx = oldGoodsDealList.length; 
 		
 		var isExist = false;
 		goodsData.forEach(function(goods){
 			isExist = false;
-
+			
 			gridGoodsDealOptions.api.forEachNode(function(rowNode, index) {
 				if (goods.goodsCd == rowNode.data.compsGoodsCd){
 					isExist = true;
@@ -264,7 +264,12 @@
 			//	isExist = true;
 			//}
 
+			if (idx >= 200){
+				return false;
+			}
+			
 			if(!isExist){
+				idx++;
 				var data = { 
 						  compsGoodsCd: goods.goodsCd
 						, goodsType: 'G056_D'
@@ -285,11 +290,12 @@
 				//그리드 마지막에 추가해야함
 				gridGoodsDealOptions.api.updateRowData({add: [data], addIndex: idx});
 				
-				idx++;
-			
 			}
+			
+			
 		});
 		gridGoodsDealOptions.api.refreshCells();
+		uifnPopupClose('popupGoods');
 	}
 	
 	//엑셀 상품 조회

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

@@ -2541,6 +2541,7 @@
 			}
 		});
 		gridGoodsComposeOptions.api.refreshCells();
+		uifnPopupClose('popupGoods');
 	}
 	
 	//엑셀 상품 조회

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

@@ -99,7 +99,7 @@
 			}
 			gagaAgGrid.addRowData(rsvtGoodsEpSkipGridOptions, {"goodsCd" : item.goodsCd, "goodsNm" : item.goodsNm, "brandEnm" : item.brandEnm});
 		});
-		uifnPopClose('popupGoods');
+		uifnPopupClose('popupGoods');
 		return;
 	};
 

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

@@ -392,6 +392,7 @@
 			}
 			gagaAgGrid.addRowData(gridNoticeGoodsOptions, {"goodsCd" : item.goodsCd, "goodsNm" : item.goodsNm, "crud" : "C"});
 		});
+		uifnPopupClose('popupGoods');
 		return;
 	};
 	

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

@@ -479,6 +479,12 @@
 		gagaPaging.createPagination(result.pageing.pageable);
 
 	}
+	
+	//페이징
+	$('#goodsPopupForm select[name=pageSize]').on('change', function() {
+		$("#goodsPopupForm input[name=pageNo]").val('1');
+		fnPopupGoodsSearch($("#goodsPopupForm input[name=searchGb]").val());
+	});
 
 	// 적용버튼 클릭시
 	$('#btnPopupGoodsApply').on('click', function() {

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

@@ -100,7 +100,7 @@
 			}
 			gagaAgGrid.addRowData(goodsResSellRegisterGridOptions, {"goodsCd" : item.goodsCd, "goodsNm" : item.goodsNm, "brandEnm" : item.brandEnm});
 		});
-		//uifnPopupClose('popupGoods');
+		uifnPopupClose('popupGoods');
 		return;
 	};
 

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

@@ -135,7 +135,10 @@
 		{headerName: "구성상품코드", field: "compsGoodsCd" , width: 130, cellClass: 'text-center'},
 		{headerName: "구성상품명", field: "goodsNm" , width: 200, cellClass: 'text-left'},
 		//{headerName: "순서", field: "dispOrd" , width: 100, cellClass: 'text-center',editable: true, required: true},
-		{headerName: "세트구성수량", field: "qty" , width: 120, cellClass: 'text-right',editable: true, required: true},
+		{headerName: "세트구성수량", field: "qty" , width: 120, cellClass: 'text-right',editable: true, required: true,
+			cellEditor: 'textCellEditor',
+			cellEditorParams: { maxlength: 14, validType: 'numeric'}
+		},
 		{headerName: "세트구성상품판매가", field: "compsCurrPrice" , width: 150, cellClass: 'text-right', editable: true, required: true,
 			cellEditor: 'textCellEditor',
 			cellEditorParams: { maxlength: 14, validType: 'numeric'}
@@ -179,7 +182,6 @@
 			return { background: '#ffffff' };
 		}	
 	}
-	
 
 	// Row 
 	gridGoodsSetOptions.onCellValueChanged = function(event) {
@@ -206,8 +208,24 @@
 			}	
 		}
 		
+		//세트구상상품판매가
 		if (event.colDef.field == "compsCurrPrice"){
-			var setGoodsCurrPrice = 0;
+			let setGoodsCurrPrice = 0;
+			
+			gridGoodsSetOptions.api.forEachNode(function(rowNode, index) {
+				if (!gagajf.isNull(rowNode.data.compsCurrPrice)){
+					setGoodsCurrPrice += Number(rowNode.data.compsCurrPrice);
+				}
+			});
+			$('#goodsSetForm').find('#setGoodsCurrPrice').html(setGoodsCurrPrice.addComma());
+		}
+		
+		// 세트구성수량 수저시
+		if (event.colDef.field == "qty"){
+			event.data.compsCurrPrice = Number(event.data.qty) * Number(event.data.currPrice);
+			gridGoodsSetOptions.api.updateRowData({update: [event.data]});	
+			
+			let setGoodsCurrPrice = 0;
 			
 			gridGoodsSetOptions.api.forEachNode(function(rowNode, index) {
 				if (!gagajf.isNull(rowNode.data.compsCurrPrice)){
@@ -268,6 +286,9 @@
 			if (goods.selfGoodsYn != "Y"){
 				isExist = true;
 			}
+			if(goods.goodsStat == "G008_99"){
+				isExist = true;
+			}
 			if(!isExist){
 				
 				var data = { 
@@ -295,6 +316,7 @@
 			}
 		});
 		$('#goodsSetForm').find('#setGoodsCurrPrice').html(setGoodsCurrPrice.addComma());
+		uifnPopupClose('popupGoods');
 	}
 	
 	// 저장클릭시
@@ -420,7 +442,7 @@
 				checkBaseYn = true;
 			}
 			
-			if(item.goodsStat != "G008_90"){
+			/* if(item.goodsStat != "G008_90"){
 				optCheck = true;
 				mcxDialog.alertC("상품상태를 확인해 주세요.", {
 					sureBtnText: "확인",
@@ -429,7 +451,7 @@
 					}
 				});	
 				return false;
-			}
+			} */
 			
 			if(Number(item.qty)  ==  0){
 				optCheck = true;

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

@@ -351,7 +351,7 @@
 	var selectPoll = [];
 	gridOptionsPoll.onCellClicked = function(event)  {
 		if (event.colDef.field == 'pollTitle') {
-			//$('#registerForm input[name=pollTitle]').focus();
+			$('#registerForm input[name=pollTitle]').focus();
 			fnAllDeleteQuestion();
 			fnSetDetail(event);
 			fnSearchVote(event.data);

src/main/webapp/dx5/dextuploadx5-configuration.js

@@ -6,7 +6,7 @@
 
     var gAuthkey = '';
     if (location.host.indexOf("ld") > -1) {
-    	gAuthkey = "/kMB0Chw9RULxOoWHHAhF4d09CrBzhsd0slsUr590PVmT7A9EHQmVpn8CsvuE1hAZVRtsV3Jb5xUL0hyVRaAn+aTCLoRxeGK3Uu/j5GxAoNYW8D7smKwGrDN/l/u7AoIkM8nDjsAqmTbtTngVsOReqSgchnI/3keVdFYciIP6iE= ";
+    	gAuthkey = "tUOR2fkfazRRQLaqhQxfq5y/4k4Ev0q6qgnp/agZPB4Rih2VuGbntr5tMUPEPjw3t5wilWvIo0RVYGyQ1BtJYGoaFfkFEo725J6GjCWSJFvGG2rhZkyqYd9P7sXU0gI7OSoMWa6IzyKfkbptvMOZLSwUDJ5xkZ/N8ig01dN4QeY=";
     } else if (location.host.indexOf("lp") > -1) {
     	gAuthkey = "gx9EHEhXzTpbdxWjty/oHh9cfVi5WA5X4BV71AHaC/ORN/1fcs8nTTd4oUUvC5WhHqEa6Wt8cfmCBJ9w/pJpRhDd+tVu6kPDt9bxZL9n0bvaUn2rrbmJMA+HC9gzahwdEOcjr6ZOmNSEd6N0xN2BDBk55hvfPw02R77XjVuZrQU=";
     } else if (location.host.indexOf("td") > -1) {