Merge branch 'develop' into bin2107

src/main/java/com/style24/admin/biz/dao/TsaGoodsDao.java

@@ -1087,6 +1087,14 @@ public interface TsaGoodsDao {
 	 * @since 2021. 01. 05
 	 */
 	public void saveGoodsWmsIncomelot(WmsGoods wmsGoods);
+	
+	/**
+	 *  WMS 입고상품  상품 구분 저장
+	 * @param wmsGoods
+	 * @author eskim
+	 * @since 2021. 07. 07
+	 */
+	public void saveGoodsWmsIncomelotByModelNo(WmsGoods wmsGoods);
 
 	/**
 	 * 고시분류별 상품고시정보 목록

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

@@ -3847,13 +3847,7 @@ public class TsaGoodsService {
 		goods.setGoodsNum(goods.getGoodsCd());
 		// 입점상품코드
 		goods.setSupplyGoodsCd(goods.getGoodsCd());
-		// 정상가
-		goods.setListPrice(0);	// 기본처리
-		// 판매가
-		goods.setCurrPrice(0);	// 기본처리
-		// 원가
-		goods.setCostPrice(0);	// 기본처리	
-
+	
 		// 판매수수료율
 		SupplyCompany supplyCompany = new SupplyCompany();
 		supplyCompany.setSupplyCompCd(goods.getSupplyCompCd());
@@ -3903,7 +3897,7 @@ public class TsaGoodsService {
 		wmsGoods.setGoodsRegGb("G"); // G: 상품, F: 사은품
 		wmsGoods.setModelNo(goods.getGoodsCd());
 
-		goodsDao.saveGoodsWmsIncomelot(wmsGoods); // wms 상품 상품등록일 변경
+		goodsDao.saveGoodsWmsIncomelotByModelNo(wmsGoods); // wms 상품 상품등록일 변경
 
 		// 사용자 검색어를 검색어에 적용
 		String goodsSnm = goodsDao.getGoodsSnm(goods.getGoodsCd());

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

@@ -705,7 +705,7 @@ public class TsaGoodsController extends TsaBaseController {
 
 			if (returnGoods.length() > 0) {
 				returnGoods = returnGoods.substring(0, returnGoods.lastIndexOf(","));
-				returnGoods = returnGoods.replaceAll(",", ",<br/>");
+				//returnGoods = returnGoods.replaceAll(",", ",\n");
 				resultFlag = "FAIL";
 				result.set("resultFlag", resultFlag);
 				result.set("returnGoods", returnGoods);
@@ -3252,7 +3252,7 @@ public class TsaGoodsController extends TsaBaseController {
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-		log.info("goods11111 = {}", goods);
+		
 		goods.setNotiListNew(notiList);
 
 		goodsService.createSalfGoodsDetail(goods);

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

@@ -3903,6 +3903,17 @@
 		WHERE PRODUCT_NO = #{productNo}
 	</update>
 	
+	<!-- WMS 입고상품 상품 구분 저장 -->
+	<update id="saveGoodsWmsIncomelotByModelNo" parameterType="WmsGoods">
+		/* TsaGoods.saveGoodsWmsIncomelotByModelNo */
+		UPDATE TB_WMS_GOODS
+		SET GOODS_REG_GB = #{goodsRegGb} /* G: 상품, F: 사은품*/
+		  , GOODS_REG_DT = NOW()
+		  , UPD_NO = #{updNo}
+		  , UPD_DT = NOW()
+		WHERE MODEL_NO = #{modelNo}
+	</update>
+	
 	<!-- 고시분류별 상품고시정보 목록 -->
 	<select id="getGoodsNotiInfoListByNotiClsf" parameterType="GoodsNotiInfo" resultType="GoodsNotiInfo">
 		/* TsaGoods.getGoodsNotiInfoListByNotiClsf */
@@ -4724,7 +4735,7 @@
 		          ,B.TOTALQTY
 		          ,B.SKUMODELNO
 		          , (CASE WHEN INSTR(REPLACE(B.SKUMODELNO, ' ' , ''), 'F20') = 1 THEN LEFT(REPLACE(B.SKUMODELNO, ' ' , ''),12)
-		                  WHEN INSTR(REPLACE(B.SKUMODELNO, ' ' , ''), '-') > 0 THEN LEFT(REPLACE(B.SKUMODELNO, ' ' , ''),11)
+		                  WHEN INSTR(REPLACE(B.SKUMODELNO, ' ' , ''), '-') > 0 AND INSTR(REPLACE(B.SKUMODELNO, ' ' , ''), '-') <![CDATA[<]]> 10 THEN LEFT(REPLACE(B.SKUMODELNO, ' ' , ''),11)
 		                  ELSE LEFT(REPLACE(B.SKUMODELNO, ' ' , ''),10) END) AS GOODS_CD
 		          FROM TB_IF_INCOMELOT A
 		          INNER JOIN TB_IF_INCOMELOTITEM B ON A.LOTNO = B.LOTNO
@@ -4773,7 +4784,7 @@
 		                ,B.TOTALQTY
 		                ,B.SKUMODELNO
 		                , (CASE WHEN INSTR(REPLACE(B.SKUMODELNO, ' ' , ''), 'F20') = 1 THEN LEFT(REPLACE(B.SKUMODELNO, ' ' , ''),12)
-		                        WHEN INSTR(REPLACE(B.SKUMODELNO, ' ' , ''), '-') > 0 THEN LEFT(REPLACE(B.SKUMODELNO, ' ' , ''),11)
+		                        WHEN INSTR(REPLACE(B.SKUMODELNO, ' ' , ''), '-') > 0 AND INSTR(REPLACE(B.SKUMODELNO, ' ' , ''), '-') <![CDATA[<]]> 10THEN LEFT(REPLACE(B.SKUMODELNO, ' ' , ''),11)
 		                        ELSE LEFT(REPLACE(B.SKUMODELNO, ' ' , ''),10) END) AS GOODS_CD
 		                FROM TB_IF_INCOMELOT A
 		                INNER JOIN TB_IF_INCOMELOTITEM B ON A.LOTNO = B.LOTNO

src/main/java/com/style24/persistence/mybatis/wms/TsaWmsGoods.xml

@@ -26,16 +26,14 @@
 		           , SUM(B.PICKING_QTY)      AS PICKING_QTY
 		           , SUM(B.EOUT_PICKING_QTY) AS EOUT_PICKING_QTY
 		           , MAX(CASE WHEN CHARINDEX('F20', REPLACE(A.SKUMODELNO, ' ', '')) = 1 THEN SUBSTRING(REPLACE(A.SKUMODELNO, ' ' , ''),13,2)
-		                      WHEN CHARINDEX('-', REPLACE(A.SKUMODELNO, ' ', '')) > 0 THEN SUBSTRING(REPLACE(A.SKUMODELNO, ' ' , ''),12,2)
+		                      WHEN CHARINDEX('-', REPLACE(A.SKUMODELNO, ' ', '')) > 0 AND CHARINDEX(REPLACE(A.SKUMODELNO, ' ' , ''), '-') <![CDATA[<]]> 10 THEN SUBSTRING(REPLACE(A.SKUMODELNO, ' ' , ''),12,2)
 		                      ELSE SUBSTRING(REPLACE(A.SKUMODELNO, ' ' , ''),11,2) END) AS WMS_COLOR_CD
 		      FROM ISTYLE24_WMSIF.DBO.TB_IF_PRODUCTSKU A
 		               INNER JOIN ISTYLE24_WMS.DBO.VW_STOCK_BY_LOCCODE B ON A.SKUCODE = B.SKU_CODE
 		      WHERE 1 = 1
 		      AND (CASE
-		               WHEN CHARINDEX('F20', REPLACE(A.SKUMODELNO, ' ', '')) = 1
-		                   THEN LEFT(REPLACE(A.SKUMODELNO, ' ', ''), 12)
-		               WHEN CHARINDEX('-', REPLACE(A.SKUMODELNO, ' ', '')) > 0
-		                   THEN LEFT(REPLACE(A.SKUMODELNO, ' ', ''), 11)
+		               WHEN CHARINDEX('F20', REPLACE(A.SKUMODELNO, ' ', '')) = 1 THEN LEFT(REPLACE(A.SKUMODELNO, ' ', ''), 12)
+		               WHEN CHARINDEX('-', REPLACE(A.SKUMODELNO, ' ', '')) > 0 AND CHARINDEX(REPLACE(A.SKUMODELNO, ' ' , ''), '-') <![CDATA[<]]> 10 THEN LEFT(REPLACE(A.SKUMODELNO, ' ', ''), 11)
 		               ELSE LEFT(REPLACE(A.SKUMODELNO, ' ', ''), 10) END) = #{goodsCd}
 		      GROUP BY A.SKUCODE, A.SKUMODELNO, A.OPTION1, A.OPTION2, A.PRODUCTNO, A.PRODUCTCODE
 		     ) Z

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

@@ -263,7 +263,6 @@
 				<li class="right">
 				<th:block th:if="${sessionInfo.roleCd == 'G001_0000' OR sessionInfo.roleCd == 'G001_A000' OR sessionInfo.roleCd == 'G001_A101' OR sessionInfo.roleCd == 'G001_A100' OR sessionInfo.roleCd == 'G001_A001'}">
 					<button type="button" class="btn btn-info btn-sm"  onclick="fnGoodsStatArea();" >상태일괄적용</button>
-					<button type="button" class="btn btn-info btn-sm" onclick="fnGoodsStaSelfNotArea();" >입점상태일괄적용</button>
 				</th:block>	
 				</li>
 			</ul>
@@ -420,26 +419,7 @@
 					</table>
 				</li>
 			</ul>
-			<ul class="boxContent off" id="goodsStatSelfNoArea">
-				<li class="pad20">
-					<table class="frmStyle">
-						<colgroup>
-							<col width="7%"/>
-							<col/>
-						</colgroup>
-						<tr>
-							<th>상품상태</th>
-							<td>
-								<select  name="goodsStatNC" id="goodsStatNC">
-									<option value="">[선택]</option>
-									<option th:if="${goodsStatList}" th:each="oneData, status : ${goodsStatList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
-								</select>
-								<button type="button" class="btn btn-dark btn-sm" onclick="fnChangeGoodsStateSelfNo('goodsStat')">적용</button>
-							</td>
-						</tr>
-					</table>
-				</li>
-			</ul>
+			
 			<!-- 검색결과 영역 -->
 		</div>
 		</form>
@@ -1016,75 +996,10 @@
 		
 		return true;	
 	}
-	
-	// 입점 상품상태 변경시
-	var fnChangeGoodsStateSelfNo = function(proc){
-
-		var objId = '#'+proc+"NC";
-		
-		if (gagajf.isNull($(objId).val())){
-			mcxDialog.alertC('적용하실 항목을 선택(입력)해주세요.', {
-				sureBtnText: "확인",
-				sureBtnClick: function() {
-					$(objId).focus();
-				}
-			});
-			return;
-		}
-	
-		var selectedData = gridOptions.api.getSelectedRows();
-
-		if (selectedData.length == 0) {
-			mcxDialog.alert('선택된 행이 없습니다.');
-			return;
-		}
-		
-		var checkFlag = false;
-		$.each(selectedData, function(idx, item) {
-			if (item.selfGoodsYn == 'Y'){
-				checkFlag = true;
-				mcxDialog.alert(item.goodsCd + ' 자사상품은 수정하실 수 없습니다.');
-				return;
-			}
-		});
-		
-		if (checkFlag){
-			return false;
-		}
-		
-		var goodsStatVal  = '';
-
-		if (proc == "goodsStat") {
-			goodsStatVal = $(objId).val();
-		}else{
-			return;
-		}
-
-		mcxDialog.confirm('적용 하시겠습니까?', {
-			cancelBtnText: "취소",
-			sureBtnText: "확인",
-			sureBtnClick: function(){
-				var arrGoodsCd = [];
-
-				$.each(selectedData, function(idx, item) {
-					arrGoodsCd.push(item.goodsCd);
-				});
-
-				var data = {arrGoodsCd: arrGoodsCd
-							,goodsStat : goodsStatVal
-							,procJob : proc
-							};
-
-				var jsonData = JSON.stringify(data);
-				gagajf.ajaxJsonSubmit('/goods/state/update', jsonData, fnChangeGoodsStateCollback);
-
-			}
-		});
-	}
 
 	var fnChangeGoodsStateCollback = function(result){
 		if (result.resultFlag == "FAIL"){
-			mcxDialog.alert("[ " + result.returnGoods + " ]은<br/>이미지, 가격, 고시정보 가 등록되지 않아 '승인대기'나 '승인완료' 상태로 변경할 수 없습니다.<br/>상품을 확인하시고, 다시 시도해주세요.");
+			mcxDialog.alert("[ " + result.returnGoods + " ]은<br/> 필수 이미지나 가격이나 고시정보가 등록되지 않아 '승인대기'나 '승인완료' 상태로 변경할 수 없습니다.<br/>상품을 확인하시고, 다시 시도해주세요.");
 			return false;
 		}else{
 			mcxDialog.alert('성공적으로 저장되었습니다.');
@@ -1097,28 +1012,13 @@
 		if ($("#searchForm").find("#goodsStatArea").hasClass('off')) {
 			$("#searchForm").find("#goodsStatArea").removeClass('off');
 			$("#searchForm").find("#goodsStatArea").addClass('on');
-			
-			$("#searchForm").find("#goodsStatSelfNoArea").removeClass('on');
-			$("#searchForm").find("#goodsStatSelfNoArea").addClass('off');
 		}else{
 			$("#searchForm").find("#goodsStatArea").removeClass('on');
 			$("#searchForm").find("#goodsStatArea").addClass('off');
 		}
 	}
 	
-	// 입점 상태일괄변경 버튼 클릭시
-	var fnGoodsStaSelfNotArea = function(){
-		if ($("#searchForm").find("#goodsStatSelfNoArea").hasClass('off')) {
-			$("#searchForm").find("#goodsStatSelfNoArea").removeClass('off');
-			$("#searchForm").find("#goodsStatSelfNoArea").addClass('on');
-			
-			$("#searchForm").find("#goodsStatArea").removeClass('on');
-			$("#searchForm").find("#goodsStatArea").addClass('off');
-		}else{
-			$("#searchForm").find("#goodsStatSelfNoArea").removeClass('on');
-			$("#searchForm").find("#goodsStatSelfNoArea").addClass('off');
-		}
-	}
+	
 	
 	//세트상품구성 클릭 시
 	$('#btnGoodsSetMake').click(function(e) {