Merge remote-tracking branch 'origin/develop' into jsh77b

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

@@ -2593,7 +2593,7 @@ public class TsaMarketingController extends TsaBaseController {
 	@ResponseBody
 	public GagaMap createExceluploadGoods(@RequestBody Plan param) throws Exception {
 		String targetPath = env.getProperty("upload.excel.target.path") + "/excel/";
-		String[] goodsNames = {"planDtlSq", "goodsCd"};
+		String[] goodsNames = {"planDtlSq", "goodsCd", "dispOrd"};
 
 		Collection<GagaMap> ecxelGoodsList = GagaExcelUtil.getList(GagaFileUtil.getConcatenationPath(targetPath, param.getExcelFileNm()), 0, goodsNames, 0);
 

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

@@ -834,7 +834,8 @@
 			               , TG.REG_DT                              
 			               , TG.UPD_NO                                                                    
 			               , TG.UPD_DT     
-			               , TG.PLAN_DTL_SQ                          
+			               , TG.PLAN_DTL_SQ
+			               , TG.DISP_ORD
 			         FROM TB_GOODS G
 					        JOIN ( SELECT @rownum := 0) R
 					        INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
@@ -842,7 +843,7 @@
 			         WHERE 1=1
 			         	 AND TG.PLAN_DTL_SQ = #{planDtlSq}
 			         	 AND TG.DEL_YN = 'N'
-			         ORDER BY G.REG_DT DESC, G.GOODS_CD
+			         ORDER BY TG.DISP_ORD, G.GOODS_CD
 		<include refid="getListPagingCondition_sql"/>
 		)Q
 	</select>
@@ -919,6 +920,7 @@
 			      DUPLICATE KEY
 			   UPDATE
 			        DEL_YN = 'N'
+			      , DISP_ORD = #{dispOrd}
 		          , UPD_DT = now()
 		          , UPD_NO = #{updNo}                                  
 	</insert>

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

@@ -1996,11 +1996,11 @@
 				return false;
 			}
 
-			//ERP재고연동여부가 'Y'일 경우 수정여부 확인
-		/* 	if ( $('#goodsDetailForm input[name=erpStockLinkYn]:checked').val() == "Y"){
+			//ERP재고연동여부가 'Y'일 경우 수정여부 확인 20210824수정
+			if ( $('#goodsDetailForm input[name=erpStockLinkYn]:checked').val() == "Y"){
 				if (Number(editCurrStockQty) != Number(currStockQty) ){
 					optCheck = true;
-					mcxDialog.alertC("ERP가용재고가 변경되었습니다.<br/>확인해주세요", {
+					mcxDialog.alertC("WMS가용재고가 변경되었습니다.<br/>확인해주세요", {
 						sureBtnText: "확인",
 						sureBtnClick: function() {
 							$("#optionList tr").find("input[name=erpStockLinkYn]").eq(idx).focus();
@@ -2008,7 +2008,7 @@
 					});
 					return false;
 				}
-			} */
+			}
 
 			// 입점만 체크
 			if ("N" == $('#goodsDetailForm input[name=selfGoodsYn]').val()){

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

@@ -39,11 +39,11 @@
 			<td class="aC">
 				<img width="60" id="defaultImg" th:src="${uploadGoodsUrl+'/'+goodsColor.sysImgNm+'?RS=60'}" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/image/no.png'}+'\';'" alt="">
 				<input type="hidden" name="sysImgNmOrg" id="sysImgNmOrg" th:value="${goodsColor.sysImgNm}"/>
-			</td>	
-			<td class="aC" ><th:block th:text="${goodsColor.optCd1}">BK</th:block> 
+			</td>
+			<td class="aC" ><th:block th:text="${goodsColor.optCd1}">BK</th:block>
 				<input type="hidden" name="colorCd" id="colorCd" th:value="${goodsColor.optCd1}"/>
 			</td>
-			<td class="aC" ><th:block th:text="${goodsColor.colorEnm}">BLACK</th:block>  
+			<td class="aC" ><th:block th:text="${goodsColor.colorEnm}">BLACK</th:block>
 				<input type="hidden" name="colorNm" id="colorNm" th:value="${goodsColor.colorEnm}"/>
 			</td>
 			<td><button type="button" id="btnDefaultImg" class="btn btn-base btn-lg" onclick="fnGoodsDetailImg(this)" th:text="${#strings.isEmpty(goodsColor.sysImgNm) ?'등록':'수정'}">등록</button></td>
@@ -117,11 +117,10 @@
 				</select>
 				<input type="hidden" name="hidDispYn" th:value="${goodsSize.dispYn}"/>
 			</td>
-			<td><input type="text" class="w100p aC" name="editCurrStockQty" th:value="${goodsSize.currStockQty}" maxlength="10" data-valid-type="numeric" th:disabled="${goods.selfGoodsYn == 'Y'}"/>
+			<td><input type="text" class="w100p aC" name="editCurrStockQty" th:value="${goodsSize.currStockQty}" maxlength="10" data-valid-type="numeric" th:disabled="${goods.erpStockLinkYn == 'Y' and goods.selfGoodsYn == 'Y'}"/>  <!-- 20210824수정 -->
 				<input type="hidden" name="currStockQty" th:value="${goodsSize.currStockQty}"/>
 			</td>
-			<td><input type="text" class="w100p aC" name="editCurrStockQty" th:value="${goodsSize.storeStockQty}" maxlength="10" data-valid-type="numeric" disabled="disabled"/>
-				<input type="hidden" name="storeStockQty" th:value="${goodsSize.storeStockQty}"/>
+			<td><input type="text" class="w100p aC" name="storeStockQty" th:value="${goodsSize.storeStockQty}" maxlength="10" data-valid-type="numeric" disabled="disabled"/>
 			</td>
 			<td><input type="text" class="w100p aC"  name="baseStockQty" th:value="${goodsSize.baseStockQty}" maxlength="7" data-valid-type="integer">
 				<input type="hidden" name="hidBaseStockQty" th:value="${goodsSize.baseStockQty}"/>
@@ -134,35 +133,53 @@
 				</select>
 				<input type="hidden" name="hidSoldoutYn" th:value="${goodsSize.soldoutYn}"/>
 				<input type="hidden" name="storeMaxQty" th:value="${goodsSize.storeMaxQty}"/>
-			</td>	
+			</td>
 		</tr>
 		</th:block>
 	</table>
 <script th:inline="javascript">
 /*<![CDATA[*/
-	
+
 	var fnGoodsDetailImg = function(obj){
 		var mode= 'U';
 		var goodsCd = $('#goodsDetailForm input[name=goodsCd]').val();
 		var colorCd = $(obj).parent().parent().find("input[name=colorCd]").val();
 		var colorNm = $(obj).parent().parent().find("input[name=colorNm]").val();
-		
+
 		if (gagajf.isNull($(obj).parent().parent().find("input[name=sysImgNmOrg]").val())){
 			mode = "C";
 		}
-		
+
 		cfnOpenGoodsImagePopup(goodsCd, colorCd, colorNm, mode);
-		
+
 	}
+
+	//ERP재고연동여부 변경시 20210824수정
+	$('#goodsDetailForm input:radio[name=erpStockLinkYn]').click(function() {
+
+		if ( $('#goodsDetailForm input[name=erpStockLinkYn]:checked').val() == "Y"){
+
+			$('#goodsDetailForm input[name=editCurrStockQty]').prop("disabled", true);
+			$('#goodsDetailForm input[name=editCurrStockQty]').attr("disabled", true);
+			$('#goodsDetailForm input[name=editCurrStockQty]').addClass("formControl");
+
+		}else{
+			$('#goodsDetailForm input[name=editCurrStockQty]').prop("disabled", false);
+			$('#goodsDetailForm input[name=editCurrStockQty]').attr("disabled", false);
+			$('#goodsDetailForm input[name=editCurrStockQty]').removeClass("formControl");
+		}
+
+	});
+
 	$(document).ready(function() {
-		
+
 		//옵션/재곡 변경여부
 		$('#goodsDetailForm').find('#goodstab2').find("input, select, textarea").on('change', function() {
 			$('#goodsDetailForm').find('.tabs .tabsNav li:eq(1) a').attr("style", "color:red;");
 		});
-		
+
 	});
-	
+
 /*]]>*/
 </script>
 </html>

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

@@ -79,7 +79,7 @@
 					코너명 : <label id="cornerNm"></label>
 				</h4>
 				<div class="aR" style="float: right; margin-top: 10px;">
-					<button type="button" class="btn btn-Right btn-default btn-lg"onclick="fnGoodsExcelUpload();">엑셀상품추가</button>
+					<button type="button" class="btn btn-Right btn-default btn-lg"onclick="fnGoodsExcelUpload();">엑셀상품추가/수정</button>
 					<button type="button" class="btn btn-default btn-lg" onclick="cfnDownloadSampleFile('SF012');">엑셀상품추가 양식 다운로드</button>
 					<button type="button" class="btn btn-default btn-lg" onclick="fnOpenGoodsPopup();">상품추가</button>
 					<button type="button" class="btn btn-danger btn-lg"	onclick="fnDeleteGoods();">선택삭제</button>
@@ -357,6 +357,9 @@
 	var uploadGoodsUrl = [[${@environment.getProperty('upload.goods.view')}]];
 	var columnDefsGoods = [
 		{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
+		{headerName: "정렬"		, field:'dispOrd'		, width:50, cellClass: 'text-center'
+			, valueFormatter: function(params) { return params.value.addComma(); }
+		},
 		{headerName: "상품코드"	, field:'goodsCd'		, width:150, cellClass: 'text-left'
 			, cellRenderer: function(params) {return '<a href="javascript:void(0);">' + params.value + '</a>'; }
 		},