기획전 상품목록 vw_stock->tb_goods_stock 변경

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

@@ -439,9 +439,10 @@
 	<select id="getPlanGoodsList" parameterType="Plan" resultType="Plan">
 		/* TssPlan.getPlanGoodsList */
 		SELECT Q.*
-		    , (CASE WHEN Q.GOODS_TYPE = 'G056_N' THEN (SELECT IFNULL(SUM(CURR_STOCK_QTY - BASE_STOCK_QTY),0) FROM VW_STOCK WHERE GOODS_CD = Q.GOODS_CD) 
-		            ELSE (SELECT IFNULL(SUM(CURR_STOCK_QTY - BASE_STOCK_QTY),0) FROM VW_STOCK_COMPOSE WHERE GOODS_CD = Q.GOODS_CD) 
-		            END) AS STOCK_QTY_SUM
+		   -- , (CASE WHEN Q.GOODS_TYPE = 'G056_N' THEN (SELECT IFNULL(SUM(CURR_STOCK_QTY - BASE_STOCK_QTY),0) FROM VW_STOCK WHERE GOODS_CD = Q.GOODS_CD) 
+		   --         ELSE (SELECT IFNULL(SUM(CURR_STOCK_QTY - BASE_STOCK_QTY),0) FROM VW_STOCK_COMPOSE WHERE GOODS_CD = Q.GOODS_CD) 
+		   --         END) AS STOCK_QTY_SUM
+		    , IFNULL((SELECT STOCK_QTY FROM TB_GOODS_STOCK WHERE GOODS_CD = Q.GOODS_CD),0) AS STOCK_QTY_SUM        
 		    , FN_GET_USER_NM(REG_NO) AS REG_NM
 		    , FN_GET_USER_NM(UPD_NO) AS UPD_NM
 		    , (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG  WHERE GOODS_CD = Q.GOODS_CD AND COLOR_CD = Q.MAIN_COLOR_CD AND DEFAULT_IMG_YN = 'Y' ) AS SYS_IMG_NM

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

@@ -46,7 +46,7 @@
 						<col/>
 					</colgroup>
 					<tr>
-						<th>브랜드<em class="required" title="필수"></em></th>
+						<th>업체/브랜드<em class="required" title="필수"></em></th>
 						<td colspan="3">
 							<select name="selSupplyCompCd" id="selSupplyCompCd" disabled="disabled" class="w40p">
 								<option value="">[선택]</option>