상품목록 엑셀조회

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

@@ -482,7 +482,7 @@ public class TsaGoodsService {
 	}
 
 	/**
-	 * 상품목록 엑셀조회용 상품 저장
+	 * 엑셀조회용 상품 저장
 	 *
 	 * @param procJob : goodsExcelUpload
 	 * @param goodsList
@@ -491,7 +491,7 @@ public class TsaGoodsService {
 	 * @since 2020. 10. 22
 	 */
 	@Transactional("shopTxnManager")
-	public void saveExceluploadGoodsList(Collection<Goods> goodsList, String excelFilename) {
+	public void saveExceluploadGoods(Collection<Goods> goodsList, String excelFilename) {
 
 		String targetPath = GagaFileUtil.getConcatenationPath(env.getProperty("upload.excel.target.path"), "excel");
 		if (goodsList == null || goodsList.isEmpty()) {
@@ -504,28 +504,22 @@ public class TsaGoodsService {
 		String goodsNumFlag = "";
 		for (Goods goods : goodsList) {
 
-			if (!StringUtils.isEmpty(goods.getGoodsCd())) {
-				goodsCdFlag = "Y";
-			}
-			if (!StringUtils.isEmpty(goods.getGoodsNum())) {
-				goodsNumFlag = "Y";
+			if (!StringUtils.isEmpty(goodsCdFlag) && !StringUtils.isEmpty(goodsNumFlag)) {
+				throw new IllegalStateException("상품코드와 원코드 중 한 개의 셀에만 값을 입력해서 조회하세요.");
 			}
 
-			if (!StringUtils.isEmpty(goodsCdFlag) && !StringUtils.isEmpty(goodsNumFlag)) {
-				throw new IllegalStateException("상품코드와 품번코드 중 한 개의 셀에만 값을 입력해서 조회하세요.");
+			if (!StringUtils.isEmpty(goods.getSupplyCompCd())) {
+				goods.setGoodsCd(goods.getSupplyCompCd());
 			}
 
 			SearchData searchData = new SearchData();
 			searchData.setRegNo(goods.getRegNo());
 			searchData.setSearchCd(goods.getGoodsCd());
-			searchData.setDispOrd(index);
-			searchData.setDummy1(goods.getGoodsNum());
-			searchData.setDummy2("Y".equals(goodsCdFlag) ? "goodsCd" : "goodsNum");
 			if (index == 0) {
 				commonService.deleteExceluploadSearCh(searchData);
 			}
 
-			commonService.createExceluploadSearchByAll(searchData);
+			commonService.createExceluploadSearch(searchData);
 			index++;
 		}
 	}

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

@@ -315,7 +315,7 @@ public class TsaGoodsController extends TsaBaseController {
 		// 입점업체담당자는 업체코드 설정
 		if ("G001_B000".equals(TsaSession.getInfo().getRoleCd())) {
 			goodsSearch.setSupplyCompCd(TsaSession.getInfo().getSupplyCompCd());
-			goodsSearch.setMdId(TsaSession.getInfo().getUserId());
+			goodsSearch.setMdId(Integer.toString(TsaSession.getInfo().getUserNo()));
 		}
 
 		// multi row 검색관련 처리
@@ -355,7 +355,7 @@ public class TsaGoodsController extends TsaBaseController {
 		// 입점업체담당자는 업체코드 설정
 		if ("G001_B000".equals(TsaSession.getInfo().getRoleCd())) {
 			goodsSearch.setSupplyCompCd(TsaSession.getInfo().getSupplyCompCd());
-			goodsSearch.setMdId(TsaSession.getInfo().getUserId());
+			goodsSearch.setMdId(Integer.toString(TsaSession.getInfo().getUserNo()));
 		}
 		goodsSearch.setRegNo(TsaSession.getInfo().getUserNo()); // 엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
 
@@ -471,7 +471,7 @@ public class TsaGoodsController extends TsaBaseController {
 	}
 
 	/**
-	 * 엑셀조회용 상품 저장- 상품목록용
+	 * 엑셀조회용 상품 저장
 	 *
 	 * @param goods
 	 * @return
@@ -479,9 +479,9 @@ public class TsaGoodsController extends TsaBaseController {
 	 * @author eskim
 	 * @since 2020. 10. 20
 	 */
-	@PostMapping("/search/goodslist/excelupload/save")
+	@PostMapping("/search/excelupload/save")
 	@ResponseBody
-	public GagaResponse saveExceluploadGoodsList(@RequestBody Goods goods) throws Exception {
+	public GagaResponse saveExceluploadGoods(@RequestBody Goods goods) throws Exception {
 
 		int cnt = 0;
 		ObjectMapper mapper = new ObjectMapper();
@@ -489,7 +489,7 @@ public class TsaGoodsController extends TsaBaseController {
 		String targetPath = GagaFileUtil.getConcatenationPath(env.getProperty("upload.excel.target.path"), "excel");
 
 		// DB 처리 시 사용되는 파라미터명(셀명) 설정
-		String[] cellName = {"goodsCd", "goodsNum"};
+		String[] cellName = {"goodsCd", "supplyGoodsCd"};
 
 		Collection<GagaMap> ecxelGoodsList = GagaExcelUtil.getList(GagaFileUtil.getConcatenationPath(targetPath, goods.getExcelFileNm()), 0, cellName, 0);
 
@@ -502,7 +502,7 @@ public class TsaGoodsController extends TsaBaseController {
 			cnt++;
 		}
 
-		goodsService.saveExceluploadGoodsList(goodsList, goods.getExcelFileNm());
+		goodsService.saveExceluploadGoods(goodsList, goods.getExcelFileNm());
 
 		// 파일 삭제
 		GagaFileUtil.deleteFile(GagaFileUtil.getConcatenationPath(targetPath, goods.getExcelFileNm()));

style24.admin/src/main/java/com/style24/persistence/mybatis/shop/TsaCommon.xml

@@ -7,7 +7,7 @@
 		/* TsaCommon.deleteExceluploadSearCh */
 		DELETE
 		FROM   TB_SEARCH_DATA
-		WHERE  REG_ID = #{regId}
+		WHERE  REG_NO = #{regNo}
 	</delete>
 
 	<!-- 엑셀조회를 위한 SEARCH 테이블  생성 -->

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

@@ -223,7 +223,7 @@
 		                           SELECT SEARCH_CD
 		                                , MIN(DISP_ORD) AS TMP_DISP_ORD
 		                           FROM TB_SEARCH_DATA
-		                           WHERE REG_NO = #{regId}
+		                           WHERE REG_NO = #{regNo}
 		                           GROUP BY SEARCH_CD) T
 		                   ) SD
 		                   ON ( (G.GOODS_CD LIKE CONCAT(SD.SEARCH_CD,'%')
@@ -331,7 +331,7 @@
 		                           SELECT SEARCH_CD
 		                                , MIN(DISP_ORD) AS TMP_DISP_ORD
 		                           FROM TB_SEARCH_DATA
-		                           WHERE REG_NO = #{regId}
+		                           WHERE REG_NO = #{regNo}
 		                           GROUP BY SEARCH_CD) T
 		                   ) SD
 		                   ON ( (G.GOODS_CD LIKE CONCAT(SD.SEARCH_CD,'%')
@@ -352,7 +352,7 @@
 		        ORDER BY G.REG_DT DESC, G.GOODS_CD
 		        </if>
 		        <if test="searchGb != null and searchGb =='EXCEL'">
-		        ORDER BY GS.TMP_DISP_ORD
+		        ORDER BY SD.TMP_DISP_ORD
 		        </if>
 		<include refid="getListPagingContion_sql"/>
 	</select>
@@ -649,7 +649,7 @@
 		                   SELECT SEARCH_CD
 		                        , MIN(DISP_ORD) AS TMP_DISP_ORD
 		                   FROM TB_SEARCH_DATA
-		                   WHERE REG_NO = #{regId}
+		                   WHERE REG_NO = #{regNo}
 		                   GROUP BY SEARCH_CD) T
 		          ) SD
 		           ON ( (G.GOODS_CD LIKE CONCAT(SD.SEARCH_CD,'%')
@@ -670,7 +670,7 @@
 		ORDER BY G.REG_DT DESC
 		</if>
 		<if test="searchGb == null or searchGb =='EXCEL'">
-		ORDER BY GS.TMP_DISP_ORD
+		ORDER BY SD.TMP_DISP_ORD
 		</if>
 	</select>
 	

style24.admin/src/main/webapp/WEB-INF/views/common/ExcelUploadPopupForm.html

@@ -14,40 +14,50 @@
  * 1.0  2020.10.22   eskim       최초 작성
  *******************************************************************************
  -->	
-	<ul class="popup modal"  data-width="600">
-		<li class="mdPopTitle">
-			<strong>엑셀업로드</strong>
-			<button type="button" class="close" onclick="uifnPopClose('popupExcelUpload')"><i class="fa fa-times"></i></button>
-		</li>
-		<li class="mdPopContent">
-		<form id="excelPopupForm" name="excelPopupForm"  action="">
-		<input type="hidden" name="procJob" id="procJob" th:value="${params.procJob}"/>
-		<input type="hidden" name="callBackFun" id="callBackFun" th:value="${params.callBackFun}"/>
-			<table class="frmStyle">
-			<colgroup>
-				<col style="width:20%;"/>
-				<col/>
-				<col style="width:20%;"/>
-			</colgroup>
-			<tbody>
-				<tr>
-					<th>파일</th>
-					<td><div class="uFile w300">
-							<input id="excelFile" name="excelFile" type="file" class="uFileInput"/>
-							<label for="excelFile" class="uFileLabel">파일선택</label>
-							<input type="hidden" name="OrgFileNm"/>
-							<input type="hidden" name="NewFileNm"/>
-						</div>
-					</td>
-				</tr>
-			</tbody>
-			</table>
-			<div class="tabBtnArea aR">
-				<button type="button" class="btn btn-success btn-lg" id="btnExcelUploadSave">저장</button>
+	<div class="modalPopup" data-width="600">
+		<div class="panelStyle">
+			<!-- TITLE -->
+			<div class="panelTitle">
+				<strong>엑셀업로드</strong>
+				<button type="button" class="close" onclick="uiPopupClose('popupExcelUpload')"><i class="fa fa-times"></i></button>
 			</div>
-		</form>	
-		</li>
-	</ul>
+			<!-- //TITLE -->
+			<!-- CONTENT -->
+			<div class="panelContent">
+			<form id="excelPopupForm" name="excelPopupForm"  action="">
+			<input type="hidden" name="procJob" id="procJob" th:value="${params.procJob}"/>
+			<input type="hidden" name="callBackFun" id="callBackFun" th:value="${params.callBackFun}"/>
+				<table class="frmStyle">
+				<colgroup>
+					<col style="width:20%;"/>
+					<col/>
+					<col style="width:20%;"/>
+				</colgroup>
+				<tbody>
+					<tr>
+						<th>파일</th>
+						<td><div class="uFile w300">
+								<input id="excelFile" name="excelFile" type="file" class="uFileInput"/>
+								<label for="excelFile" class="uFileLabel">파일선택</label>
+								<input type="hidden" name="OrgFileNm"/>
+								<input type="hidden" name="NewFileNm"/>
+							</div>
+						</td>
+					</tr>
+				</tbody>
+				</table>
+				<!-- 버튼 배치 영역 -->
+				<ul class="panelBar">
+					<li class="right">
+						<button type="button" class="btn btn-success btn-lg" id="btnExcelUploadSave">저장</button>
+					</li>	
+				</ul>
+				<!-- //버튼 배치 영역 -->
+			</form>
+			</div>
+		</div>
+		<!-- //CONTENT -->
+	</div>
 <script th:inline="javascript">
 /*<![CDATA[*/
 	
@@ -93,7 +103,7 @@
 					else eval( callback(jsonData) );
 				}
 			}
-			uifnPopClose('popupExcelUpload');
+			uiPopupClose('popupExcelUpload');
 		}
 	});	
 	

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

@@ -635,7 +635,7 @@
 					,excelFileNm : result.excelFileNm
 					};
 		var jsonData = JSON.stringify(data);
-		gagajf.ajaxJsonSubmit('/goods/search/goodslist/excelupload/save', jsonData, fnGoodsExcelUploadCallBack);
+		gagajf.ajaxJsonSubmit('/goods/search/excelupload/save', jsonData, fnGoodsExcelUploadCallBack);
 	}
 
 	var fnGoodsExcelUploadCallBack = function(result){