Merge branch 'develop' into bin2107

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/java/com/style24/persistence/mybatis/shop/TsaGoods.xml

@@ -4052,6 +4052,9 @@
 		     , #{updNo}
 		     , NOW()
 		)
+		ON DUPLICATE KEY UPDATE
+		       UPD_NO = #{updNo}
+		      ,UPD_DT = NOW()
 	</insert>
 	
 	<!-- WMS 입고상품 사은품 상품 구분 저장 -->

src/main/webapp/WEB-INF/views/board/FaqDetailForm.html

@@ -59,7 +59,7 @@
 						<tr>
 							<th>표시순서<i class="required" title="필수" aria-hidden="true"></i></th>
 							<td>
-								<input type="text" class="w100 text-right" name="dispOrd" placeholder="" maxlength="5" required="required" data-valid-type="numeric" data-valid-name="표시순서" />
+								<input type="text" class="w100 text-right" name="dispOrd" placeholder="" maxlength="4" required="required" data-valid-type="numeric" data-valid-name="표시순서" />
 								<span class="infoTxt cBlue marL10"><i class="fa fa-info-circle" aria-hidden="true"></i>TOP 10 노출 순서</span>
 							</td>
 							<th>사용여부<em class="required" title="필수"></em></th>
@@ -125,7 +125,7 @@
 							</td>
 							<th>표시순서<i class="required" title="필수" aria-hidden="true"></i></th>
 							<td>
-								<input type="text" class="w100 text-right" name="dispOrd" placeholder="" maxlength="5" required="required" data-valid-type="numeric" data-valid-name="표시순서" th:field="*{dispOrd}"/>
+								<input type="text" class="w100 text-right" name="dispOrd" placeholder="" maxlength="4" required="required" data-valid-type="numeric" data-valid-name="표시순서" th:field="*{dispOrd}"/>
 								<span class="infoTxt cBlue marL10"><i class="fa fa-info-circle" aria-hidden="true"></i>TOP 10 노출 순서</span>
 							</td>
 							<th>조회수</th>

src/main/webapp/WEB-INF/views/business/AflinkForm.html

@@ -123,7 +123,7 @@
 							<tr>
 								<th>표시순서<i class="star"></i></th>
 								<td>
-									<input type="text" class="w100 text-right" name="dispOrd" placeholder="" maxlength="5" required="required" data-valid-type="numeric" data-valid-name="표시순서" />
+									<input type="text" class="w100 text-right" name="dispOrd" placeholder="" maxlength="4" required="required" data-valid-type="numeric" data-valid-name="표시순서" />
 								</td>
 							</tr>
 							<tr>

src/main/webapp/WEB-INF/views/business/BrandForm.html

@@ -130,7 +130,7 @@
 						</td>
 						<th>노출순서<i class="required" title="필수"></i></th>
 						<td class="infoTxt">
-							<input type="text" class="w100 aR" name="dispOrd" maxlength="5" required="required" data-valid-name="노출순서" data-valid-type="numeric"/>
+							<input type="text" class="w100 aR" name="dispOrd" maxlength="4" required="required" data-valid-name="노출순서" data-valid-type="numeric"/>
 						</td>
 						<!-- <th>브랜드명노출언어<i class="required" title="필수"></i></th>
 						<td>

src/main/webapp/WEB-INF/views/display/CategoryForm.html

@@ -127,7 +127,7 @@
 					<tr>
 						<th>노출순서<i class="required" title="필수"></i></th>
 						<td>
-							<input type="text" class="aR w100" name="dispOrd" maxlength="5" required="required" data-valid-type="integer" data-valid-name="노출순서"/>
+							<input type="text" class="aR w100" name="dispOrd" maxlength="4" required="required" data-valid-type="integer" data-valid-name="노출순서"/>
 						</td>
 						<th>정상이월구분</th>
 						<td>

src/main/webapp/WEB-INF/views/display/LookbookBannerPopupForm.html

@@ -167,7 +167,7 @@
 		html += '			</td>';
 		html += '			<th>이미지설명</th>';
 		html += '			<td><textarea class="textareaR4" name="imgDesc" id="imgDesc'+bannerIdx+'"></textarea></td>';
-		html += '			<td><input name="dispOrd" type="text" class="w80" placeholder="전시순서" style="margin-left:5px; text-align:center"/>';
+		html += '			<td><input name="dispOrd" type="text" class="w80" placeholder="전시순서" maxlength="4" style="margin-left:5px; text-align:center"/>';
 		//html += '			<button type="button" class="btn btn-success btn-lg" onclick="fnAddPicker(this);">피커추가</button>';
 		html += '			<button type="button" class="btn btn-danger btn-lg" onclick="fnDeleteBanner(this);">삭제</button></td>';
 		html += '		</tr>';*/
@@ -369,7 +369,7 @@
 				html += '			</td>';
 				html += '			<th>이미지설명</th>';
 				html += '			<td><textarea class="textareaR4" name="imgDesc" id="imgDesc'+i+'">'+lookbookBannerList[i].imgDesc+'</textarea></td>';
-				html += '			<td><input name="dispOrd" type="text" class="w80" placeholder="전시순서" style="margin-left:5px; text-align:center" value="'+lookbookBannerList[i].dispOrd+'"/>';
+				html += '			<td><input name="dispOrd" type="text" class="w80" placeholder="전시순서" maxlength="4" style="margin-left:5px; text-align:center" value="'+lookbookBannerList[i].dispOrd+'"/>';
 				html += '				<button type="button" class="btn btn-success btn-lg" onclick="fnAddPicker(this);">피커추가</button>';
 				html += '				<button type="button" class="btn btn-danger btn-lg" onclick="fnDeleteBanner(this);">삭제</button></td>';
 				html += '		</tr>';*/
@@ -414,7 +414,7 @@
 		html += '			<span id="dpLocAnsContent'+bannerImgRow+'">0</span>/4,000Byte';
 		html += '			</th>';
 		html += '			<td><textarea class="textareaR4" style="resize: none;" name="imgDesc" id="imgDesc'+bannerImgRow+'" onkeyup="cfnGetTextLength(this, 4000, $(\'#dpLocAnsContent\'+'+bannerImgRow+'));" >'+desc+'</textarea></td>';
-		html += '			<td><input name="dispOrd" type="text" class="w80" placeholder="전시순서" style="margin-left:5px; text-align:center" value="'+dispord+'"/>';
+		html += '			<td><input name="dispOrd" type="text" class="w80" placeholder="전시순서" maxlength="4" style="margin-left:5px; text-align:center" value="'+dispord+'"/>';
 		if(imgPath!=''){
 			html += '				<button type="button" class="btn btn-success btn-lg" onclick="fnAddPicker(this,\''+imgPath+'\');">피커추가</button>';
 		}

src/main/webapp/WEB-INF/views/display/MainContentsPopupForm.html

@@ -98,7 +98,7 @@
 			html += '<select name="edTimeMin" required="required" data-valid-name="노출기간 종료시간">';
 			html += fnCreateTimeOption(60, dispEddt[1].split(":")[1]);
 			html += '</select>';
-			html += '<input name="dispOrd" type="text" class="w80"placeholder="전시순서" style="margin-left:5px; text-align:center" value="'+result[i].dispOrd+'"/>';
+			html += '<input name="dispOrd" type="text" class="w80"placeholder="전시순서" maxlength="4" style="margin-left:5px; text-align:center" value="'+result[i].dispOrd+'"/>';
 			html += '</td>';
 			if(contentsLoc!='SCM002' && contentsLoc!='SCM003'){
 				html += '<td class="aL">';
@@ -670,7 +670,7 @@
 		html += '<select name="edTimeMin" required="required" data-valid-name="노출기간 종료시간">';
 		html += fnCreateTimeOption(60,59);
 		html += '</select>\n';
-		html += '<input name="dispOrd" type="text" class="w80"placeholder="전시순서" style="margin-left:5px; text-align:center"/>\n';
+		html += '<input name="dispOrd" type="text" class="w80"placeholder="전시순서" maxlength="4" style="margin-left:5px; text-align:center"/>\n';
 		html += '</td>\n';
 		html += '<td class="aL">\n';
 		if(contentsLoc!='SCM002' && contentsLoc!='SCM003' && contentsLoc!='SMM011' && contentsLoc!='SBM012' && contentsLoc!='SBMM012' && contentsLoc!='SMM003' && contentsLoc!='SMM004' && contentsLoc!='SMM006'

src/main/webapp/WEB-INF/views/display/MainGnbContentsPopupForm.html

@@ -126,7 +126,7 @@
 		html += '			<select name="edTimeMin" required="required" data-valid-name="노출기간 종료시간">';
 		html += fnCreateTimeOption(60,59);
 		html += '			</select>';
-		html += '			<input name="dispOrd" type="text" class="w80"placeholder="전시순서" style="margin-left:5px; text-align:center"/>';
+		html += '			<input name="dispOrd" type="text" class="w80"placeholder="전시순서" maxlength="4" style="margin-left:5px; text-align:center"/>';
 		html += '		</td>';
 		html += '		<td class="aL cateTypeBtnArea">';
 		html += '		<button type="button" class="btn btn-danger btn-lg" onclick="fnDeleteContentsRow(this);">삭제</button></td>';
@@ -674,7 +674,7 @@
 			html += '			<select name="edTimeMin" required="required" data-valid-name="노출기간 종료시간">';
 			html += fnCreateTimeOption(60, dispEddt[1].split(":")[1]);
 			html += '			</select>';
-			html += '			<input name="dispOrd" type="text" class="w80"placeholder="전시순서" style="margin-left:5px; text-align:center" value="'+result[i].strTitle3+'"/>';
+			html += '			<input name="dispOrd" type="text" class="w80"placeholder="전시순서" maxlength="4" style="margin-left:5px; text-align:center" value="'+result[i].strTitle3+'"/>';
 			html += '		</td>';
 			html += '		<td class="aL cateTypeBtnArea">';
 			html += '		<button type="button" class="btn btn-danger btn-lg" onclick="fnDeleteContentsRow(this);">삭제</button></td>';
@@ -892,7 +892,7 @@
 			html += '			<select name="edTimeMin" required="required" data-valid-name="노출기간 종료시간">';
 			html += fnCreateTimeOption(60, dispEddt[1].split(":")[1]);
 			html += '			</select>';
-			html += '			<input name="dispOrd" type="text" class="w80"placeholder="전시순서" style="margin-left:5px; text-align:center" value="'+result[i].dispOrd+'"/>';
+			html += '			<input name="dispOrd" type="text" class="w80"placeholder="전시순서" maxlength="4" style="margin-left:5px; text-align:center" value="'+result[i].dispOrd+'"/>';
 			html += '			</td>';
 			html += '			<td class="aL cateTypeBtnArea">';
 			html += '			<button type="button" class="btn btn-danger btn-lg" onclick="fnDeleteContentsRow(this);">삭제</button></td>';

src/main/webapp/WEB-INF/views/display/MainMultiContentsPopupForm.html

@@ -98,7 +98,7 @@ console.log('brandGroupNo:'+brandGroupNo);
 			html += '<select name="edTimeMin" required="required" data-valid-name="노출기간 종료시간">';
 			html += fnCreateTimeOption(60, dispEddt[1].split(":")[1]);
 			html += '</select>';
-			html += '<input name="dispOrd" type="text" class="w80"placeholder="전시순서" style="margin-left:5px; text-align:center" value="'+result[i].dispOrd+'"/>';
+			html += '<input name="dispOrd" type="text" class="w80"placeholder="전시순서" maxlength="4" style="margin-left:5px; text-align:center" value="'+result[i].dispOrd+'"/>';
 			html += '</td>';
 			html += '<td class="aL">';
 			if(contentsLoc=='SMM007') {
@@ -340,7 +340,7 @@ console.log('brandGroupNo:'+brandGroupNo);
 		html += '<select name="edTimeMin" required="required" data-valid-name="노출기간 종료시간">';
 		html += fnCreateTimeOption(60, 59);
 		html += '</select>';
-		html += '<input name="dispOrd" type="text" class="w80" placeholder="전시순서" style="margin-left:5px; text-align:center"/>';
+		html += '<input name="dispOrd" type="text" class="w80" placeholder="전시순서" maxlength="4" style="margin-left:5px; text-align:center"/>';
 		html += '</td>';
 		html += '<td class="aL">';
 		if(contentsLoc=='SMM007') {

src/main/webapp/WEB-INF/views/display/PopupListForm.html

@@ -209,7 +209,7 @@
 						</td>
 						<th>우선순위<i class="required" title="필수"></i></th>
 						<td>
-							<input type="text" class="w90" name="dispOrd" id="dispOrd" required="required" data-valid-type=numeric data-valid-name="우선순위"/>
+							<input type="text" class="w90" name="dispOrd" id="dispOrd" maxlength="4" required="required" data-valid-type=numeric data-valid-name="우선순위"/>
 						</td>
 						<th>팝업구분<i class="required" title="필수"></i></th>
 						<td>

src/main/webapp/WEB-INF/views/envset/CustomerGradePolicyForm.html

@@ -136,7 +136,7 @@
 						</td>
 						<th>표시순서<i class="required" title="필수" aria-hidden="true"></i></th>
 						<td>
-							<input type="text" class="w100 aR" name="dispOrd" placeholder="" maxlength="5" required="required" data-valid-type="numeric" data-valid-name="표시순서" />
+							<input type="text" class="w100 aR" name="dispOrd" placeholder="" maxlength="4" required="required" data-valid-type="numeric" data-valid-name="표시순서" />
 						</td>
 						<th>사용여부</th>
 						<td>

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

@@ -109,7 +109,7 @@
 			<td><input type="text" class="w100p aR" name="addPrice" th:value="${goodsSize.addPrice}"  maxlength="7"  data-valid-type="numeric"/>
 				<input type="hidden" name="hidAddPrice" th:value="${goodsSize.addPrice}" />
 			</td>
-			<td><input type="text" class="w100p aC" name="dispOrd" th:value="${goodsSize.dispOrd}"  maxlength="7" data-valid-type="integer"/>
+			<td><input type="text" class="w100p aC" name="dispOrd" th:value="${goodsSize.dispOrd}"  maxlength="4" data-valid-type="integer"/>
 				<input type="hidden" name="hidDispOrd" th:value="${goodsSize.dispOrd}" />
 			</td>
 			<td><select name="dispYn" class="w100p aC">

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

@@ -102,7 +102,7 @@
 									<tr>
 										<th>노출순서<em class="required" title="필수"></em></th>
 										<td>
-											<input type="text" class="aR w100" name="dispOrd" maxlength="5" required="required" data-valid-type="integer" data-valid-name="노출순서"/>
+											<input type="text" class="aR w100" name="dispOrd" maxlength="4" required="required" data-valid-type="integer" data-valid-name="노출순서"/>
 										</td>
 									</tr>
 									<tr>

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">
@@ -100,7 +100,6 @@
 /*<![CDATA[*/
 	var sessRoleCd = [[${sessionInfo.roleCd}]];
 	var columnDefs = [
-		{width: 40, minWidth: 40, cellClass: 'text-right', headerCheckboxSelection: true, checkboxSelection: true, filter: false}, 
 		{headerName: 'No', width: 60, cellClass: 'text-center', valueGetter: function(params) { return params.node.rowIndex + 1 }},
 		{headerName: "브랜드", field: "brandCd", width: 100, cellClass: 'text-center'},
 		{headerName: "브랜드명", field: "brandEnm", width: 130, cellClass: 'text-center'},
@@ -279,32 +278,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">
@@ -98,6 +99,7 @@
 /*<![CDATA[*/
 	var sessRoleCd = [[${sessionInfo.roleCd}]];
 	var columnDefs = [
+		{width: 40, minWidth: 40, cellClass: 'text-right', headerCheckboxSelection: true, checkboxSelection: true, filter: false}, 
 		{headerName: 'No', width: 60, cellClass: 'text-center', valueGetter: function(params) { return params.node.rowIndex + 1 }},
 		{headerName: "입고번호", field: "lotno", width: 100, cellClass: 'text-center'},
 		{headerName: "브랜드", field: "brandCd", width: 100, cellClass: 'text-center'},
@@ -247,6 +249,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, '등록일');

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

@@ -72,7 +72,7 @@
 						</td>
 						<th>전시순서</th>
 						<td>
-							<input type="text" name="dispOrd" class="w100 aR" th:value="*{dispOrd}"/>
+							<input type="text" name="dispOrd" class="w100 aR" th:value="*{dispOrd}" maxlength="4"/>
 						</td>
 					</tr>
 					<tr>
@@ -477,7 +477,7 @@
 						</td>
 						<th>전시순서</th>
 						<td>
-							<input type="text" class="w100 aR" name="dispOrd"/>
+							<input type="text" class="w100 aR" name="dispOrd" maxlength="4"/>
 						</td>
 					</tr>
 					<tr>

src/main/webapp/WEB-INF/views/system/CommoncodeForm.html

@@ -91,7 +91,7 @@
 							<tr>
 								<th>표시순서<i class="required" title="필수" aria-hidden="true"></i></th>
 								<td>
-									<input type="text" class="w100 text-right" name="dispOrd" placeholder="" maxlength="5" required="required" data-valid-type="numeric" data-valid-name="표시순서" />
+									<input type="text" class="w100 text-right" name="dispOrd" placeholder="" maxlength="4" required="required" data-valid-type="numeric" data-valid-name="표시순서" />
 								</td>
 							</tr>
 							<tr>

src/main/webapp/WEB-INF/views/system/MenuForm.html

@@ -153,7 +153,7 @@
 								<tr>
 									<th>표시순서<i class="required" title="필수" aria-hidden="true"></i></th>
 									<td>
-										<input type="text" class="w100 text-right" name="dispOrd" placeholder="" maxlength="5" required="required" data-valid-type="numeric" data-valid-name="표시순서" />
+										<input type="text" class="w100 text-right" name="dispOrd" placeholder="" maxlength="4" required="required" data-valid-type="numeric" data-valid-name="표시순서" />
 									</td>
 									<th>사용여부</th>
 									<td>
@@ -251,7 +251,7 @@
 								<tr>
 									<th>표시순서<i class="required" title="필수" aria-hidden="true"></i></th>
 									<td>
-										<input type="text" class="w100 text-right" name="dispOrd" placeholder="" maxlength="5" required="required" data-valid-type="numeric" data-valid-name="표시순서" />
+										<input type="text" class="w100 text-right" name="dispOrd" placeholder="" maxlength="4" required="required" data-valid-type="numeric" data-valid-name="표시순서" />
 									</td>
 									<th>사용여부<i class="required" title="필수" aria-hidden="true"></i></th>
 									<td>