사은품 입고

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

@@ -2762,24 +2762,19 @@ public class TsaGoodsService {
 	 * @since 2021. 01. 05
 	 */
 	@Transactional("shopTxnManager")
-	public void saveFreeGoods(Collection<WmsGoods> wmsGoodsList) {
+	public void saveFreeGoods(Collection<IfIncomelot> wmsGoodsList) {
 
-		for (WmsGoods wmsGoods : wmsGoodsList) {
+		for (IfIncomelot wmsGoods : wmsGoodsList) {
 			FreeGoods freeGoods = new FreeGoods();
-			freeGoods.setProductNo(wmsGoods.getProductNo());
-			freeGoods.setProductCode(wmsGoods.getProductCode());
-			freeGoods.setGoodsNm(wmsGoods.getProductName());
+			freeGoods.setProductNo(Integer.parseInt(wmsGoods.getProductno()));
+			freeGoods.setProductCode(wmsGoods.getProductcode());
+			freeGoods.setGoodsNm(wmsGoods.getProductname());
 			freeGoods.setBrandCd(wmsGoods.getBrandCd());
 			freeGoods.setUseYn("Y");
 			freeGoods.setUpdNo(TsaSession.getInfo().getUserNo());
 			freeGoods.setRegNo(TsaSession.getInfo().getUserNo());
 			goodsDao.saveFreeGoods(freeGoods);
-
-			//WMS 상품등록구분
-			wmsGoods.setGoodsRegGb("F");
-			wmsGoods.setUpdNo(TsaSession.getInfo().getUserNo());
-			wmsGoods.setRegNo(TsaSession.getInfo().getUserNo());
-			goodsDao.saveGoodsWmsIncomelot(wmsGoods);
+		
 		}
 	}
 

src/main/java/com/style24/admin/biz/web/TsaGoodsController.java

@@ -1489,7 +1489,7 @@ public class TsaGoodsController extends TsaBaseController {
 	 */
 	@PostMapping("/free/goods/save")
 	@ResponseBody
-	public GagaResponse saveFreeGoods(@RequestBody Collection<WmsGoods> wmsGoodsList) {
+	public GagaResponse saveFreeGoods(@RequestBody Collection<IfIncomelot> wmsGoodsList) {
 		goodsService.saveFreeGoods(wmsGoodsList);
 		return super.ok(message.getMessage("SUCC_0001"));
 	}

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

@@ -71,7 +71,7 @@
 		<div class="panelStyle">
 			<ul class="panelBar">
 				<li class="right">
-					<button type="button" class="btn btn-primary btn-lg"  id="btnCreateFreeGoods">사은품 등록</button>
+					
 					검색결과 : <strong><span id="gridRowTotalCount">0</span> 건</strong>&nbsp;
 					쪽번호 <span id="pgNo">0</span>/ <strong id="endPgNo">0</strong>&nbsp;&nbsp;
 					<select id="pageSize" name="pageSize">
@@ -279,32 +279,6 @@
 	});
 	
 	
-	// 사은품 등록 클릭시
-	$('#btnCreateFreeGoods').on('click', function() {
-		
-		//선택된 상품
-		var selectedData = gridOptions.api.getSelectedRows();
-		
-		if (selectedData.length == 0) {
-			mcxDialog.alert('선택된 행이 없습니다.');
-			return;
-		}
-		
-		mcxDialog.confirm('사은품 등록을 하시겠습니까?', {
-			cancelBtnText: "취소",
-			sureBtnText: "확인",
-			sureBtnClick: function(){
-				var jsonData = JSON.stringify(selectedData);
-				gagajf.ajaxJsonSubmit('/goods/free/goods/save', jsonData, fnCreateFreeGoodsCollback);
-			}
-		});
-	});
-	
-	var fnCreateFreeGoodsCollback = function(result){
-		fnGoodsWmsIncomelotListSearch('BASIC');
-	}
-	
-	
 	$(document).ready(function() {
 
 		cfnCreateCalendar('#sellTerms', 'stDate', 'edDate', true, '등록일');

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

@@ -70,6 +70,7 @@
 		<div class="panelStyle">
 			<ul class="panelBar">
 				<li class="right">
+					<button type="button" class="btn btn-primary btn-lg"  id="btnCreateFreeGoods">사은품 등록</button>
 					검색결과 : <strong><span id="gridRowTotalCount">0</span> 건</strong>&nbsp;
 					쪽번호 <span id="pgNo">0</span>/ <strong id="endPgNo">0</strong>&nbsp;&nbsp;
 					<select id="pageSize" name="pageSize">
@@ -247,6 +248,32 @@
 		cfnCreateCombo(actionUrl, $('#goodsWmsIncomelotForm select[name=brandCd]'), "[전체]", "");
 	});
 	
+	// 사은품 등록 클릭시
+	$('#btnCreateFreeGoods').on('click', function() {
+		
+		//선택된 상품
+		var selectedData = gridOptions.api.getSelectedRows();
+		
+		if (selectedData.length == 0) {
+			mcxDialog.alert('선택된 행이 없습니다.');
+			return;
+		}
+		
+		mcxDialog.confirm('사은품 등록을 하시겠습니까?', {
+			cancelBtnText: "취소",
+			sureBtnText: "확인",
+			sureBtnClick: function(){
+				var jsonData = JSON.stringify(selectedData);
+				gagajf.ajaxJsonSubmit('/goods/free/goods/save', jsonData, fnCreateFreeGoodsCollback);
+			}
+		});
+	});
+	
+	var fnCreateFreeGoodsCollback = function(result){
+		
+	}
+	
+	
 	$(document).ready(function() {
 
 		cfnCreateCalendar('#sellTerms', 'stDate', 'edDate', true, '등록일');