Merge remote-tracking branch '112.172.147.34/style' into ST24PRJ-497(입점클레임반품배송비)

pom.xml

@@ -188,6 +188,19 @@
 			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/xalan.jar</systemPath>
 		</dependency>
 		<!-- \\\ WEB-INF lib -->
+
+		<!-- /// logback 취약점 대응 -->
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>1.2.9</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-core</artifactId>
+			<version>1.2.9</version>
+		</dependency>
+		<!-- \\\ logback 취약점 대응 -->
 	</dependencies>
 	
 	<build>

src/main/java/com/style24/scm/biz/service/TssGoodsService.java

@@ -1,6 +1,8 @@
 package com.style24.scm.biz.service;
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -148,33 +150,38 @@ public class TssGoodsService {
 
 		if ("Y".equals(goodsSearch.getImageViewYn())) {
 			// 헤더 title 설정
-			String[] listTitles = {"이미지", "상품코드", "업체명", "브랜드명", "상품명", "품목",
+			String[] listTitles = {"이미지", "상품코드", "업체상품코드", "업체명", "브랜드명", "상품명", "품목",
 				"전시재고", "상품상태", "스타일년도", "시즌", "정상가", "판매가",
 				"할인율", "가격변경일", "정상이월구분", "반품가능 여부"};
 
 			// DB 처리 시 사용되는 파라미터명(셀명) 설정
-			String[] cellNames = {"SYS_IMG_NM", "GOODS_CD", "SUPPLY_COMP_CD", "BRAND_ENM", "GOODS_NM", "ITEMKIND_NM",
+			String[] cellNames = {"SYS_IMG_NM", "GOODS_CD", "SUPPLY_GOODS_CD", "SUPPLY_COMP_CD", "BRAND_ENM", "GOODS_NM", "ITEMKIND_NM",
 				"STOCK_QTY_SUM", "GOODS_STAT", "STYLE_YEAR", "SEASON_CD", "LIST_PRICE", "CURR_PRICE",
 				"DC_RATE", "PRICE_UPD_DT", "FORMAL_GB", "RETURNABLE_YN"};
 
 			String[] cellTypes = {GagaExcelConstants.CellType.IMAGE.name(),
 				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
 				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
-				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_RIGHT.name(),
 				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
-				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_RIGHT.name(),
-				GagaExcelConstants.CellType.CHAR_RIGHT.name(), GagaExcelConstants.CellType.CHAR_RIGHT.name(),
-				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
-				GagaExcelConstants.CellType.CHAR_CENTER.name()};
+				GagaExcelConstants.CellType.CHAR_RIGHT.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(), 
+				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(), 
+				GagaExcelConstants.CellType.CHAR_RIGHT.name(), GagaExcelConstants.CellType.CHAR_RIGHT.name(), 
+				GagaExcelConstants.CellType.CHAR_RIGHT.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(), 
+				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name()};
 
 			String targetPath = env.getProperty("upload.goods.view");
 			Collection<GagaMap> dataList = goodsDao.getGoodsInfoExcelList(goodsSearch); // map형식으로 조회
 			if (dataList != null && !dataList.isEmpty()) {
 				for (GagaMap gagaMap : dataList) {
 					if (!StringUtils.isBlank(gagaMap.get("SYS_IMG_NM").toString())) {
-						gagaMap.set("SYS_IMG_NM", targetPath + '/' + gagaMap.get("SYS_IMG_NM").toString() + "?RS=60");
+						try {
+							//gagaMap.set("SYS_IMG_NM", targetPath + '/' + gagaMap.get("SYS_IMG_NM").toString() + "?RS=60");
+							gagaMap.setString("SYS_IMG_NM", GagaFileUtil.getConcatenationPath(targetPath, gagaMap.getString("SYS_IMG_NM").substring(0, gagaMap.getString("SYS_IMG_NM").lastIndexOf("/") + 1) + URLEncoder.encode(GagaFileUtil.getFilename(gagaMap.getString("SYS_IMG_NM")), "UTF-8").replaceAll("\\+", "%20")) + "?RS=60");
+						} catch (UnsupportedEncodingException e) {
+							//throw new IllegalStateException(e);
+						}
 					} else {
-						gagaMap.set("SYS_IMG_NM", env.getProperty("domain.uximage") + "/image/no.png");
+						gagaMap.set("SYS_IMG_NM", "//image.istyle24.com/Style24/images/mo/thumb/bg_item_none.png?RS=60");
 					}
 				}
 			}
@@ -188,24 +195,24 @@ public class TssGoodsService {
 
 		} else {
 			// 헤더 title 설정
-			String[] listTitles = {"상품코드", "업체명", "브랜드명", "상품명", "품목",
+			String[] listTitles = {"상품코드", "업체상품코드", "업체명", "브랜드명", "상품명", "품목",
 				"전시재고", "상품상태", "스타일년도", "시즌", "정상가", "판매가",
 				"할인율", "가격변경일", "정상이월구분", "반품가능 여부"};
 
 			// DB 처리 시 사용되는 파라미터명(셀명) 설정
-			String[] cellNames = {"GOODS_CD", "SUPPLY_COMP_CD", "BRAND_ENM", "GOODS_NM", "ITEMKIND_NM",
+			String[] cellNames = {"GOODS_CD", "SUPPLY_GOODS_CD", "SUPPLY_COMP_CD", "BRAND_ENM", "GOODS_NM", "ITEMKIND_NM",
 				"STOCK_QTY_SUM", "GOODS_STAT", "STYLE_YEAR", "SEASON_CD", "LIST_PRICE", "CURR_PRICE",
 				"DC_RATE", "PRICE_UPD_DT", "FORMAL_GB", "RETURNABLE_YN"};
 
 			String[] cellTypes = {
 				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
 				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
-				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_RIGHT.name(),
-				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
-				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_RIGHT.name(),
-				GagaExcelConstants.CellType.CHAR_RIGHT.name(), GagaExcelConstants.CellType.CHAR_RIGHT.name(),
 				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
-				GagaExcelConstants.CellType.CHAR_CENTER.name()};
+				GagaExcelConstants.CellType.CHAR_RIGHT.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(), 
+				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(), 
+				GagaExcelConstants.CellType.CHAR_RIGHT.name(), GagaExcelConstants.CellType.CHAR_RIGHT.name(), 
+				GagaExcelConstants.CellType.CHAR_RIGHT.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(), 
+				GagaExcelConstants.CellType.CHAR_CENTER.name(),	GagaExcelConstants.CellType.CHAR_CENTER.name()};
 
 			Collection<GagaMap> dataList = goodsDao.getGoodsInfoExcelList(goodsSearch);
 

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

@@ -390,6 +390,7 @@
 		{headerName: "브랜드", field: "brandCd", width: 80, cellClass: 'text-center'},
 		{headerName: "브랜드명", field: "brandEnm", width: 130, cellClass: 'text-center'},
 		{headerName: "상품코드", field: "goodsCd", width: 140, cellClass: 'text-center'},
+		{headerName: "업체상품코드", field: "supplyGoodsCd", width: 140, cellClass: 'text-center'},
 		{headerName: "상품명", field: "goodsNm", width: 200, cellClass: 'text-left'
 			,cellRenderer: function(params) {
 				return '<a href="javascript:void(0);">' + params.value + '</a>';