Parcourir la source

ISTCS-108(총알배송 제외상품 관리 메뉴 수정의 건)
-상품등록되기 전에 총알배송 제외상품 선등록 가능하게 수정
-목록에 조회조건 수정

smlee@yes24.com il y a 4 ans
Parent
commit
a39cd6fd1e

+ 3 - 15
src/main/java/com/style24/admin/biz/service/TsaGoodsService.java

@@ -4043,13 +4043,7 @@ public class TsaGoodsService {
 			throw new IllegalStateException(message.getMessage("FAIL_1001"));
 		}
 
-		GoodsSearch search = new GoodsSearch();
-		search.setConditionList(goods.getArrGoodsCd());
-		search.setSearch("searchGoodsCd");
-		int cnt = getGoodsListCount(search);
-		if (cnt < goods.getArrGoodsCd().length) {
-			throw new IllegalStateException("상품코드를 확인해주세요.");
-		}
+		
 
 		goods.setRegNo(TsaSession.getInfo().getUserNo());
 		goods.setUpdNo(TsaSession.getInfo().getUserNo());
@@ -4101,18 +4095,12 @@ public class TsaGoodsService {
 			throw new IllegalStateException("엑셀 파일의 건수를 " + EXCEL_ROW_COUNT + "건 이하로 사용하세요.");
 		}
 
-		// 검증
-		GoodsSearch search = new GoodsSearch();
-		search.setSearch("searchGoodsCd");
+
 
 		int index = 0;
 		for (Goods goods : goodsList) {
 
-			search.setGoodsCd(goods.getGoodsCd());
-			int cnt = getGoodsListCount(search);
-			if (cnt == 0) {
-				throw new IllegalStateException("상품코드를 확인해주세요.");
-			}
+
 
 			goods.setRegNo(TsaSession.getInfo().getUserNo());
 

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

@@ -5049,12 +5049,12 @@
 		/* TsaGoods.getGoodsQuikDeleverySkipCount */
 		SELECT COUNT(*)
 		FROM TB_GOODS_SHOT_DELV_SKIP A
-		INNER JOIN TB_GOODS G ON A.GOODS_CD = G.GOODS_CD
-		INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
-		INNER JOIN TB_BRAND_GROUP D ON B.BRAND_GROUP_NO  = D.BRAND_GROUP_NO
-		INNER JOIN TB_SUPPLY_COMPANY S ON G.SUPPLY_COMP_CD = S.SUPPLY_COMP_CD
+		LEFT JOIN TB_GOODS G ON A.GOODS_CD = G.GOODS_CD
+		LEFT JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
+		LEFT JOIN TB_BRAND_GROUP D ON B.BRAND_GROUP_NO  = D.BRAND_GROUP_NO
+		LEFT JOIN TB_SUPPLY_COMPANY S ON G.SUPPLY_COMP_CD = S.SUPPLY_COMP_CD
 		<if test="searchGb != null and searchGb =='EXCEL'">
-		INNER JOIN (
+		LEFT JOIN (
 		            SELECT SEARCH_CD
 		                 , TMP_DISP_ORD
 		            FROM (
@@ -5097,7 +5097,7 @@
 		FROM (
 		    SELECT A.*
 		    FROM (
-		SELECT G.GOODS_CD
+		SELECT A.GOODS_CD
 		     , G.GOODS_NM
 		     , G.GOODS_STAT
 		     , G.SUPPLY_COMP_CD
@@ -5115,12 +5115,12 @@
 		         </otherwise>
 		     </choose>
 		FROM TB_GOODS_SHOT_DELV_SKIP A
-		INNER JOIN TB_GOODS G ON A.GOODS_CD = G.GOODS_CD
-		INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
-		INNER JOIN TB_BRAND_GROUP D ON B.BRAND_GROUP_NO  = D.BRAND_GROUP_NO
-		INNER JOIN TB_SUPPLY_COMPANY S ON G.SUPPLY_COMP_CD = S.SUPPLY_COMP_CD
+		LEFT JOIN TB_GOODS G ON A.GOODS_CD = G.GOODS_CD
+		LEFT JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
+		LEFT JOIN TB_BRAND_GROUP D ON B.BRAND_GROUP_NO  = D.BRAND_GROUP_NO
+		LEFT JOIN TB_SUPPLY_COMPANY S ON G.SUPPLY_COMP_CD = S.SUPPLY_COMP_CD
 		<if test="searchGb != null and searchGb =='EXCEL'">
-		INNER JOIN (
+		LEFT JOIN (
 		            SELECT SEARCH_CD
 		                 , TMP_DISP_ORD
 		            FROM (