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

src/main/java/com/style24/scm/biz/web/TssGoodsController.java

@@ -11,6 +11,7 @@ import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletRequest;
 import javax.swing.ImageIcon;
 
+import com.style24.core.biz.service.TscExcelService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
@@ -96,6 +97,9 @@ public class TssGoodsController extends TssBaseController {
 	@Autowired
 	private ObjectMapper mapper;
 
+	@Autowired
+	private TscExcelService excelService;
+
 	private static final int EXCEL_ROW_COUNT = 500;
 
 	/**
@@ -1267,7 +1271,7 @@ public class TssGoodsController extends TssBaseController {
 				"niContent19", "niContent20", "niContent21", "niContent22", "niContent23", "niContent24",
 				"niContent25", "niContent26", "niContent27", "niContent28"};
 
-			ecxelGoodsList = GagaExcelUtil.getList(GagaFileUtil.getConcatenationPath(targetPath, goodsMass.getExcelFileNm()), 0, goodsNames, 0);
+			ecxelGoodsList = excelService.getExcelList(GagaFileUtil.getConcatenationPath(targetPath, goodsMass.getExcelFileNm()), 0, goodsNames, 0);
 
 			//건수
 			if (ecxelGoodsList != null && ecxelGoodsList.size() > 100) {  //안전인증 로직 추가로 건수 줄임
@@ -1327,7 +1331,7 @@ public class TssGoodsController extends TssBaseController {
 			"niContent17", "niContent18", "niContent19", "niContent20", "niContent21", "niContent22", "niContent23",
 			"niContent24", "niContent25", "niContent26", "niContent27", "niContent28"};
 
-		ecxelGoodsList = GagaExcelUtil.getList(GagaFileUtil.getConcatenationPath(targetPath, goodsMass.getExcelFileNm()), 0, goodsNames, 0);
+		ecxelGoodsList = excelService.getExcelList(GagaFileUtil.getConcatenationPath(targetPath, goodsMass.getExcelFileNm()), 0, goodsNames, 0);
 
 		// 입점담당자
 		if (!"G001_B000".equals(TssSession.getInfo().getRoleCd()) && !"G001_E000".equals(TssSession.getInfo().getRoleCd())) {

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

@@ -74,6 +74,7 @@
 			<col width="7%"/>
 			<col width="7%"/>
 			<col width="7%"/>
+			<col width="7%"/>
 			<col width="5%"/>
 		</colgroup>
 		<tr th:if="${goods.selfGoodsYn == 'Y' and goods.goodsType == 'G056_N'}">
@@ -93,6 +94,7 @@
 			<th>상품코드</th>
 			<th>옵션1(색상)</th>
 			<th>옵션2(사이즈)</th>
+			<th>옵션코드</th>
 			<th>추가가격</th>
 			<th>노출순서</th>
 			<th>노출여부</th>
@@ -109,13 +111,15 @@
 			<td th:rowspan="${goodsSize.rcount}" th:text="${goodsSize.compsGoodsCd}" th:if="${goodsSize.rnum == 1}"></td>
 			<td><th:block th:text="${goodsSize.optCd1}"></th:block>
 				<input type="hidden" name="compsGoodsCd" th:value="${goodsSize.compsGoodsCd}" />
-				<input type="hidden" name="optCd" th:value="${goodsSize.optCd}" />
 				<input type="hidden" name="optCd1" th:value="${goodsSize.optCd1}" />
 				<input type="hidden" name="hidOptCd1" th:value="${goodsSize.optCd1}" />
 			</td>
 			<td><th:block th:text="${goodsSize.optCd2}"></th:block>
 				<input type="hidden" name="optCd2" th:value="${goodsSize.optCd2}" />
 			</td>
+			<td><th:block th:text="${goodsSize.optCd}"></th:block>
+				<input type="hidden" name="optCd" th:value="${goodsSize.optCd}" />
+			</td>
 			<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>
@@ -180,6 +184,7 @@
 		addOptionHtml += '	</td>\n';
 		addOptionHtml += '	<td><input type="text" name="optCd2" class="W100" maxlength="30"/>\n';
 		addOptionHtml += '	</td>\n';
+		addOptionHtml += '	<td></td>\n';
 		addOptionHtml += '	<td><input type="text" class="w100p aR" name="addPrice"  maxlength="7"  data-valid-type="numeric" value="0"/>\n';
 		addOptionHtml += '		<input type="hidden" name="hidAddPrice" />\n';
 		addOptionHtml += '	</td>\n';