전시 - 카테고리별 상품전시 개발중

src/main/java/com/style24/admin/biz/dao/TsaDisplayDao.java

@@ -193,35 +193,4 @@ public interface TsaDisplayDao {
 	 */
 	Collection<CategoryGoods> getCategoryGoodsList(CategoryGoods categoryGoods);
 
-	/**
-	 * 카테고리별상품전시 상품이동
-	 * @return
-	 * @author bin2107
-	 * @since 2021. 2. 15
-	 */
-	void moveCategoryGoods(CategoryGoods categoryGoods);
-
-	/**
-	 * 카테고리별상품전시 상품삭제
-	 * @return
-	 * @author bin2107
-	 * @since 2021. 2. 15
-	 */
-	void deleteCategoryGoods(CategoryGoods categoryGoods);
-
-	/**
-	 * 카테고리별상품전시 상품이동시 전시순위 조회
-	 * @return
-	 * @author bin2107
-	 * @since 2021. 2. 15
-	 */
-	int getCategoryGoodsDispOrd(CategoryGoods categoryGoods);
-
-	/**
-	 * 카테고리별상품전시 상품추가
-	 * @return
-	 * @author bin2107
-	 * @since 2021. 2. 15
-	 */
-	void insertCategoryGoods(CategoryGoods categoryGoods);
 }

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

@@ -197,32 +197,40 @@ public class TsaDisplayService {
 				int cnt = 0;
 				for (String cateCd : goodsCategory.getCateCdArr()) {
 					if(StringUtils.isNotEmpty(cateCd)){
-						goodsCategory.setCateCd(cateCd);
-						goodsCategory.setCateGb(goodsCategory.getCateGbArr()[cnt]);
-						goodsCategory.setCateType(goodsCategory.getCateTypeArr()[cnt]);
-						displayDao.saveGoodsCategory(goodsCategory);
+						//goodsCategory.setCateCd(cateCd);
+						//goodsCategory.setCateGb(goodsCategory.getCateGbArr()[cnt]);
+						//goodsCategory.setCateType(goodsCategory.getCateTypeArr()[cnt]);
+						//displayDao.saveGoodsCategory(goodsCategory);
 
 						if(!"G031_20".equals(goodsCategory.getCateType())){
-							if(StringUtils.isNotEmpty(goodsCategory.getCateCd3Arr()[cnt])){
-								String[] cate3Array = goodsCategory.getCateCd3Arr()[cnt].split(",");
-								if(cate3Array[1].equals("N")){
-									goodsCategory.setCateCd(cate3Array[0]);
+							if(StringUtils.isNotEmpty(goodsCategory.getCateCd1Arr()[cnt])){
+								String[] cate1Array = goodsCategory.getCateCd1Arr()[cnt] .split(",");
+								if(cate1Array[1].equals("Y")){
+									goodsCategory.setCateCd(cate1Array[0]);
 									displayDao.saveGoodsCategory(goodsCategory);
 								}
 							}
 
 							if(StringUtils.isNotEmpty(goodsCategory.getCateCd2Arr()[cnt])){
 								String[] cate2Array = goodsCategory.getCateCd2Arr()[cnt] .split(",");
-								if(cate2Array[1].equals("N")){
+								if(cate2Array[1].equals("Y")){
 									goodsCategory.setCateCd(cate2Array[0]);
 									displayDao.saveGoodsCategory(goodsCategory);
 								}
 							}
 
-							if(StringUtils.isNotEmpty(goodsCategory.getCateCd1Arr()[cnt])){
-								String[] cate1Array = goodsCategory.getCateCd1Arr()[cnt] .split(",");
-								if(cate1Array[1].equals("N")){
-									goodsCategory.setCateCd(cate1Array[0]);
+							if(StringUtils.isNotEmpty(goodsCategory.getCateCd3Arr()[cnt])){
+								String[] cate3Array = goodsCategory.getCateCd3Arr()[cnt].split(",");
+								if(cate3Array[1].equals("Y")){
+									goodsCategory.setCateCd(cate3Array[0]);
+									displayDao.saveGoodsCategory(goodsCategory);
+								}
+							}
+
+							if(StringUtils.isNotEmpty(goodsCategory.getCateCd4Arr()[cnt])){
+								String[] cate4Array = goodsCategory.getCateCd4Arr()[cnt].split(",");
+								if(cate4Array[1].equals("Y")){
+									goodsCategory.setCateCd(cate4Array[0]);
 									displayDao.saveGoodsCategory(goodsCategory);
 								}
 							}
@@ -252,16 +260,10 @@ public class TsaDisplayService {
 	 */
 	@Transactional("shopTxnManager")
 	public void deleteGoodsCategoryList(GoodsCategory goodsCategory) {
-		for (int i=0; i<goodsCategory.getCateCdArr().length; i++){
-			GoodsCategory goodsCategoryData = new GoodsCategory();
-			goodsCategoryData.setGoodsCd(goodsCategory.getGoodsCd());
-			goodsCategoryData.setCateCd(goodsCategory.getCateCdArr()[i]);
-			goodsCategoryData.setCateCd1(goodsCategory.getCateCd1Arr()[i]);
-			goodsCategoryData.setCateCd2(goodsCategory.getCateCd2Arr()[i]);
-			goodsCategoryData.setCateCd3(goodsCategory.getCateCd3Arr()[i]);
-			goodsCategoryData.setCateCd4(goodsCategory.getCateCd4Arr()[i]);
-			goodsCategoryData.setCateType(goodsCategory.getCateTypeArr()[i]);
-			this.deleteGoodsCategory(goodsCategoryData);
+		for(int i=0; i<goodsCategory.getGoodsList().size(); i++){
+			goodsCategory.setGoodsCd(goodsCategory.getGoodsList().get(i).getGoodsCd());
+			goodsCategory.setCateNo(goodsCategory.getGoodsList().get(i).getCateCd());
+			this.deleteGoodsCategory(goodsCategory);
 		}
 	}
 
@@ -297,13 +299,15 @@ public class TsaDisplayService {
 	 * @since 2021. 2. 15
 	 */
 	public void moveCategoryGoods(CategoryGoods categoryGoods){
+		GoodsCategory goodsCategory = new GoodsCategory();
+		goodsCategory.setRegNo(categoryGoods.getRegNo());
 		for(int i=0; i<categoryGoods.getGoodsList().size(); i++){
-			categoryGoods.setGoodsCd(categoryGoods.getGoodsList().get(i).getGoodsCd());
-			int dispOrd = displayDao.getCategoryGoodsDispOrd(categoryGoods);
-			categoryGoods.setDispOrd(dispOrd);
-			displayDao.moveCategoryGoods(categoryGoods);
+			goodsCategory.setGoodsCd(categoryGoods.getGoodsList().get(i).getGoodsCd());
+			goodsCategory.setCateCd(categoryGoods.getAddCateNo());
+			displayDao.saveGoodsCategory(goodsCategory);
 			if("move".equals(categoryGoods.getMode())){
-				displayDao.deleteCategoryGoods(categoryGoods);
+				goodsCategory.setCateNo(categoryGoods.getCateNo());
+				displayDao.deleteGoodsCategory(goodsCategory);
 			}
 		}
 	}
@@ -315,10 +319,11 @@ public class TsaDisplayService {
 	 * @since 2021. 2. 15
 	 */
 	public void deleteCategoryGoods(CategoryGoods categoryGoods){
+		GoodsCategory goodsCategory = new GoodsCategory();
 		for(int i=0; i<categoryGoods.getGoodsList().size(); i++){
-			categoryGoods.setGoodsCd(categoryGoods.getGoodsList().get(i).getGoodsCd());
-			categoryGoods.setCateNo(categoryGoods.getGoodsList().get(i).getCateNo());
-			displayDao.deleteCategoryGoods(categoryGoods);
+			goodsCategory.setGoodsCd(categoryGoods.getGoodsList().get(i).getGoodsCd());
+			goodsCategory.setCateNo(categoryGoods.getGoodsList().get(i).getCateNo());
+			displayDao.deleteGoodsCategory(goodsCategory);
 		}
 	}
 
@@ -329,11 +334,12 @@ public class TsaDisplayService {
 	 * @since 2021. 2. 15
 	 */
 	public void insertCategoryGoods(CategoryGoods categoryGoods){
+		GoodsCategory goodsCategory = new GoodsCategory();
+		goodsCategory.setRegNo(categoryGoods.getRegNo());
 		for(int i=0; i<categoryGoods.getMultiGoods().length; i++){
-			categoryGoods.setGoodsCd(categoryGoods.getMultiGoods()[i]);
-			int dispOrd = displayDao.getCategoryGoodsDispOrd(categoryGoods);
-			categoryGoods.setDispOrd(dispOrd);
-			displayDao.insertCategoryGoods(categoryGoods);
+			goodsCategory.setGoodsCd(categoryGoods.getMultiGoods()[i]);
+			goodsCategory.setCateCd((categoryGoods.getCateNo()).toString());
+			displayDao.saveGoodsCategory(goodsCategory);
 		}
 	}
 

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

@@ -270,6 +270,7 @@ public class TsaDisplayController extends TsaBaseController {
 	@PostMapping("/goods/category/save")
 	@ResponseBody
 	public GagaResponse saveGoodsCategory(@RequestBody GoodsCategory goodsCategory) {
+		log.info("saveGoodsCategory goodsCategory::::::::{}",goodsCategory);
 		displayService.saveGoodsCategory(goodsCategory);
 		return super.ok(message.getMessage("SUCC_0001"));
 	}

src/main/java/com/style24/persistence/domain/CategoryGoods.java

@@ -47,6 +47,7 @@ public class CategoryGoods extends TscBaseDomain {
 
 	private String mode;
 	private String addCateNo;
+	private Integer cateCd;
 	List<CategoryGoods> goodsList;
 
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)

src/main/java/com/style24/persistence/domain/GoodsCategory.java

@@ -6,6 +6,8 @@ import com.style24.persistence.TscPageRequest;
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 상품별 카테고리 Domain
  * @author eskim
@@ -69,6 +71,7 @@ public class GoodsCategory extends TscBaseDomain {
 	private String cateCd3;
 	private String cateCd4;
 	private String cateCd5;
+	private Integer cateNo;
 
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private String[] cateCdArr;
@@ -92,6 +95,8 @@ public class GoodsCategory extends TscBaseDomain {
 
 	private String goodsCds;
 
+	List<CategoryGoods> goodsList;
+
 	// Pagination
 	private TscPageRequest pageable;
 	private int pageNo = 1;

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

@@ -821,120 +821,10 @@
 	<delete id="deleteGoodsCategory" parameterType="GoodsCategory">
 		/* TsaDisplay.deleteGoodsCategory */
 		DELETE
-		FROM TB_CATE_GOODS
-		WHERE GOODS_CD = #{goodsCd}
-		<choose>
-		<when test="cateType == 'G031_20' and cateCd != null and cateCd != ''">
-		AND CATE_NO = #{cateCd}
-		</when>
-		<otherwise>
-		AND CATE_NO IN (
-			SELECT CATE_CD FROM
-			(
-				SELECT CATE1_NO AS CATE_CD
-				, CATE1_NO
-				, CATE2_NO
-				, CATE3_NO
-				, CATE4_NO
-				, CATE_TYPE
-				FROM TB_CATE_4SRCH
-				<if test="cateCd != null and cateCd1 != cateCd">
-				WHERE EXISTS (
-					SELECT 1 FROM (
-						SELECT COUNT(*) AS CATE_CNT
-						 FROM (
-							SELECT CATE_NO
-							FROM TB_CATE_GOODS
-							WHERE GOODS_CD = #{goodsCd}
-							AND CATE_NO IN (
-							    	SELECT LEAF_CATE_NO
-									FROM TB_CATE_4SRCH
-									WHERE CATE1_NO  = #{cateCd1}
-								)
-							) ALIAS_FOR_SUBQUERY
-						) ALIAS_FOR_SUBQUERY
-					<![CDATA[WHERE CATE_CNT < 2 ]]>
-				)
-				</if>
-				UNION ALL
-				SELECT CATE2_NO AS CATE_CD
-					, CATE1_NO
-					, CATE2_NO
-					, CATE3_NO
-					, CATE4_NO
-					, CATE_TYPE
-				FROM TB_CATE_4SRCH
-				<if test="cateCd != null and cateCd1 != cateCd and cateCd2 != cateCd">
-				WHERE EXISTS (
-					SELECT 1 FROM (
-						SELECT COUNT(*) AS CATE_CNT
-						FROM (
-							SELECT CATE_NO
-							FROM TB_CATE_GOODS
-							WHERE GOODS_CD = #{goodsCd}
-							AND CATE_NO IN (
-							    SELECT LEAF_CATE_NO
-								FROM TB_CATE_4SRCH
-								WHERE CATE2_NO = #{cateCd2}
-							)
-						) ALIAS_FOR_SUBQUERY
-					) ALIAS_FOR_SUBQUERY
-					<![CDATA[WHERE CATE_CNT < 2 ]]>
-				)
-				</if>
-				UNION ALL
-				SELECT CATE3_NO AS CATE_CD
-					, CATE1_NO
-					, CATE2_NO
-					, CATE3_NO
-					, CATE4_NO
-					, CATE_TYPE
-				FROM TB_CATE_4SRCH
-				<if test="cateCd != null and cateCd == cateCd4">
-				WHERE EXISTS (
-					SELECT 1 FROM (
-						SELECT COUNT(*) AS CATE_CNT
-						FROM (
-							SELECT CATE_NO
-							FROM TB_CATE_GOODS
-							WHERE GOODS_CD = #{goodsCd}
-							AND CATE_NO IN (
-							    	SELECT LEAF_CATE_NO
-									FROM TB_CATE_4SRCH
-									WHERE CATE3_NO = #{cateCd3}
-							)
-						) ALIAS_FOR_SUBQUERY
-					) ALIAS_FOR_SUBQUERY
-					<![CDATA[WHERE CATE_CNT < 2 ]]>
-				)
-				</if>
-				UNION ALL
-				SELECT CATE4_NO AS CATE_CD
-				, CATE1_NO
-				, CATE2_NO
-				, CATE3_NO
-				, CATE4_NO
-				, CATE_TYPE
-				FROM TB_CATE_4SRCH
-			) ALIAS_FOR_SUBQUERY
-			<if test="cateCd != null and cateCd1 == cateCd">
-				WHERE CATE1_NO = #{cateCd}
-			</if>
-			<if test="cateCd != null and cateCd2 == cateCd">
-				WHERE CATE2_NO = #{cateCd}
-			</if>
-			<if test="cateCd != null and cateCd3 == cateCd">
-				WHERE CATE3_NO = #{cateCd}
-			</if>
-			<if test="cateCd != null and cateCd4 == cateCd">
-				WHERE CATE4_NO = #{cateCd}
-			</if>
-			<if test="cateCd == null or cateCd == ''">
-				WHERE CATE_TYPE = 'G031_10'
-			</if>
-		)
-		</otherwise>
-		</choose>
+		FROM 	TB_CATE_GOODS
+		WHERE 	1=1
+		AND		GOODS_CD = #{goodsCd}
+		AND 	CATE_NO = #{cateNo}
 	</delete>
 
 	<select id="getCategoryGoodsListCount" parameterType="CategoryGoods" resultType="int">
@@ -982,6 +872,9 @@
 			) G
 		</if>
 		WHERE A.GOODS_CD = G.GOODS_CD
+		<if test="goodsCd != null and goodsCd !='' and searchGb !='EXCEL'">
+			AND G.GOODS_CD = #{goodsCd}
+		</if>
 	</select>
 
 	<select id="getCategoryGoodsList" parameterType="CategoryGoods" resultType="CategoryGoods">
@@ -1048,6 +941,9 @@
 				</if>
 				JOIN ( SELECT @rownum := 0) R
 				WHERE A.GOODS_CD = G.GOODS_CD
+				<if test="goodsCd != null and goodsCd !='' and searchGb !='EXCEL'">
+					AND G.GOODS_CD = #{goodsCd}
+				</if>
 				ORDER BY A.DISP_ORD ASC, G.UPD_DT DESC, G.CURR_PRICE DESC, G.GOODS_CD ASC
 		<include refid="getListPagingCondition_sql"/>
 	</select>
@@ -1192,59 +1088,4 @@
 			<include refid="getListPagingCondition_sql"/>
 	</select>
 
-	<select id="getCategoryGoodsDispOrd" parameterType="CategoryGoods" resultType="int">
-		SELECT IFNULL((MAX(DISP_ORD)+1),1) AS DISP_ORD
-		FROM TB_CATE_GOODS
-		WHERE CATE_NO = #{addCateNo}
-	</select>
-
-	<insert id="moveCategoryGoods" parameterType="CategoryGoods">
-		INSERT INTO TB_CATE_GOODS(
-			CATE_NO
-			,GOODS_CD
-			,DISP_ORD
-			,REG_NO
-			,REG_DT
-		)VALUES (
-			#{addCateNo}
-			,#{goodsCd}
-			,#{dispOrd}
-			,#{regNo}
-			,NOW()
-		)
-		ON DUPLICATE KEY UPDATE
-		REG_NO = #{regNo}
-		,REG_DT = NOW()
-	</insert>
-
-	<delete id="deleteCategoryGoods" parameterType="CategoryGoods">
-		DELETE FROM TB_CATE_GOODS
-		WHERE 1=1
-		AND CATE_NO = #{cateNo}
-		AND GOODS_CD = #{goodsCd}
-	</delete>
-
-	<!-- 카테고리별 상품추가 저장 -->
-	<insert id="insertCategoryGoods" parameterType="GoodsCategory">
-		/* TsaDisplay.insertCategoryGoods */
-		INSERT INTO TB_CATE_GOODS(
-								  CATE_NO
-								 ,GOODS_CD
-								 ,DISP_ORD
-								 ,REG_NO
-								 ,REG_DT
-		)
-		VALUES (
-				#{cateNo}
-			   	,#{goodsCd}
-			    ,(SELECT	IFNULL((MAX(DISP_ORD) + 1), 1) AS DISP_ORD
-				 FROM	TB_CATE_GOODS ALIAS_FOR_SUBQUERY
-				 WHERE   CATE_NO = #{cateNo})
-			   	,#{regNo}
-			    ,NOW()
-		)
-		ON DUPLICATE KEY UPDATE
-				REG_NO = #{regNo}
-				,REG_DT = NOW()
-	</insert>
 </mapper>

src/main/webapp/WEB-INF/views/display/CategoryGoodsForm.html

@@ -186,9 +186,6 @@
 
 	let columnDefs1 = [
 		{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
-		/*{headerName: 'No', width: 60, cellClass: 'text-center',
-			valueGetter: function(params) { return cfnGridNumner('searchForm',params.node.rowIndex, 'A');}
-		},*/
 		{headerName: "상품코드", field: "goodsCd", width: 150, cellClass: 'text-center'},
 		{headerName: "상품타이틀명", field: "goodsTnm", width: 150, cellClass: 'text-center'},
 		{headerName: "상품명", field: "goodsNm", width: 200, cellClass: 'text-center'},
@@ -211,6 +208,34 @@
 	let gridOptions = gagaAgGrid.getGridOptions(columnDefs1);
 	gridOptions.rowSelection = "multiple";
 
+	/**
+	 * 엑셀 상품 조회
+	 */
+	$("#btnExcelSearch").on('click', function(){
+		cfnExcelUploadPopup('goodsExcelUpload', 'goodsExcelUpload');
+	});
+
+	var goodsExcelUpload = function(result){
+		var data = {procJob : result.procJob
+			,excelFileNm : result.excelFileNm
+		};
+		var jsonData = JSON.stringify(data);
+		gagajf.ajaxJsonSubmit('/goods/search/excelupload/save', jsonData, fnGoodsExcelUploadCallBack);
+	}
+
+	var fnGoodsExcelUploadCallBack = function(result){
+		$("#searchForm input[name=searchGb]").val("EXCEL");
+		fnCategoryGoodsListSearch();
+	}
+
+	/**
+	 * 상품조회 버튼 클릭시
+	 */
+	$("#btnSearch").on('click', function(){
+		$("#searchForm input[name=searchGb]").val("BASIC");
+		gagaPaging.load(1);
+	});
+
 	/**
 	 * 상품추가 버튼 클릭 시
 	 */
@@ -251,13 +276,19 @@
 			return false;
 		}
 
-		var data = {
-			mode : 'delete'
-			,goodsList : selectData
-		};
+		mcxDialog.confirm('삭제 하시겠습니까?', {
+			cancelBtnText: "취소",
+			sureBtnText: "확인",
+			sureBtnClick: function () {
+				var data = {
+					mode : 'delete'
+					,goodsList : selectData
+				};
 
-		var jsonData = JSON.stringify(data);
-		gagajf.ajaxJsonSubmit('/display/category/goods/delete', jsonData, fnCategoryGoodsListSearch);
+				var jsonData = JSON.stringify(data);
+				gagajf.ajaxJsonSubmit('/display/category/goods/delete', jsonData, fnCategoryGoodsListSearch);
+			}
+		});
 	});
 
 	/**
@@ -280,15 +311,21 @@
 			return false;
 		}
 
-		var data = {
-			mode : 'copy'
-			,cateNo : $("#cateCd").val()
-			,addCateNo : $("#addCateCd").val()
-			,goodsList : selectData
-		};
+		mcxDialog.confirm('복사 하시겠습니까?', {
+			cancelBtnText: "취소",
+			sureBtnText: "확인",
+			sureBtnClick: function () {
+				var data = {
+					mode : 'copy'
+					,cateNo : $("#cateCd").val()
+					,addCateNo : $("#addCateCd").val()
+					,goodsList : selectData
+				};
 
-		var jsonData = JSON.stringify(data);
-		gagajf.ajaxJsonSubmit('/display/category/goods/move', jsonData, fnCategoryGoodsListSearch);
+				var jsonData = JSON.stringify(data);
+				gagajf.ajaxJsonSubmit('/display/category/goods/move', jsonData, fnCategoryGoodsListSearch);
+			}
+		});
 	});
 
 	/**
@@ -310,15 +347,23 @@
 			mcxDialog.alert("상품을 이동할 카테고리가 동일합니다.");
 			return false;
 		}
-		var data = {
-			mode : 'move'
-			,cateNo : $("#cateCd").val()
-			,addCateNo : $("#addCateCd").val()
-			,goodsList : selectData
-		};
 
-		var jsonData = JSON.stringify(data);
-		gagajf.ajaxJsonSubmit('/display/category/goods/move', jsonData, fnCategoryGoodsListSearch);
+		mcxDialog.confirm('이동 하시겠습니까?', {
+			cancelBtnText: "취소",
+			sureBtnText: "확인",
+			sureBtnClick: function () {
+				var data = {
+					mode : 'move'
+					,cateNo : $("#cateCd").val()
+					,addCateNo : $("#addCateCd").val()
+					,goodsList : selectData
+				};
+
+				var jsonData = JSON.stringify(data);
+				gagajf.ajaxJsonSubmit('/display/category/goods/move', jsonData, fnCategoryGoodsListSearch);
+			}
+		});
+
 	});
 
 	/**

src/main/webapp/WEB-INF/views/display/GoodsCategoryForm.html

@@ -332,7 +332,8 @@
 			{headerName: "카테고리1", field: "cateCd1", width: 150, cellClass: 'text-left', hide: true},
 			{headerName: "카테고리2", field: "cateCd2", width: 150, cellClass: 'text-left', hide: true},
 			{headerName: "카테고리3", field: "cateCd3", width: 150, cellClass: 'text-left', hide: true},
-			{headerName: "카테고리4", field: "cateCd4", width: 150, cellClass: 'text-left', hide: true}
+			{headerName: "카테고리4", field: "cateCd4", width: 150, cellClass: 'text-left', hide: true},
+			{headerName: "상품코드", field: "goodsCd", width: 150, cellClass: 'text-left', hide: true}
 		];
 
 		// Get GridOptions
@@ -527,21 +528,16 @@
 				cancelBtnText: "취소",
 				sureBtnText: "확인",
 				sureBtnClick: function(){ //debugger;
-					gagajf.ajaxFormSubmit($('#goodsCateForm').prop('action'), "#goodsCateForm", fnGoodsCateSaveCallBack);
+					gagajf.ajaxFormSubmit($('#goodsCateForm').prop('action'), "#goodsCateForm", fnGoodsCateCallBack);
 				}
 			});
 		});
 
-		var fnGoodsCateSaveCallBack = function(){
-			console.log('save success@');
-			$('#btnCateInit').click();
-		};
-
 		// 검색조건 초기화
 		$('#btnCateInit').on('click', function() {
 			$("#goodsCateForm")[0].reset();
 			var html = '<option value="">[선택]</option>';
-			for(var i=2; i<5; i++){
+			for(var i=2; i<6; i++){
 				for(var j=1; j<5; j++){
 					$("#selCate"+j+''+i).html(html);
 				}
@@ -555,58 +551,28 @@
 
 		// 전시카테고리 삭제
 		$("#btnCateDelete").on("click", function(){
-			var data = gridCategoryOptions.api.getSelectedRows();
-			if(data.length == 0){
+			var selectData = gridCategoryOptions.api.getSelectedRows();
+			if(selectData.length == 0){
 				mcxDialog.alert('삭제할 카테고리를 선택하세요.');
 				return false;
 			}
 
-			var goodsCd = '';
-			var cateCdArr = [];
-			var cateCd1Arr = [];
-			var cateCd2Arr = [];
-			var cateCd3Arr = [];
-			var cateCd4Arr = [];
-			var cateTypeArr = [];
-			data.forEach(function(row){
-				console.log('goodsCd:'+row.goodsCd);
-				console.log('cateType:'+row.cateType);
-				console.log('cateCd:'+row.cateCd);
-
-				console.log('catecd1:'+row.cateCd1);
-				console.log('catecd2:'+row.cateCd2);
-				console.log('catecd3:'+row.cateCd3);
-				console.log('catecd4:'+row.cateCd4);
-
-				cateCdArr.push(row.cateCd);
-				cateCd1Arr.push(row.cateCd1);
-				cateCd2Arr.push(row.cateCd2);
-				cateCd3Arr.push(row.cateCd3);
-				cateCd4Arr.push(row.cateCd4);
-				goodsCd = row.goodsCd;
-				cateTypeArr.push(row.cateType);
-			});
-
-			applyData = {cateCdArr : cateCdArr
-				, cateCd1Arr : cateCd1Arr
-				, cateCd2Arr : cateCd2Arr
-				, cateCd3Arr : cateCd3Arr
-				, cateCd4Arr : cateCd4Arr
-				, goodsCd : goodsCd
-				, cateTypeArr : cateTypeArr
+			var data = {
+				goodsList : selectData
 			};
 
-			var jsonData = JSON.stringify(applyData);
+			var jsonData = JSON.stringify(data);
 			mcxDialog.confirm('삭제하시겠습니까?', {
 				cancelBtnText: "취소",
 				sureBtnText: "확인",
 				sureBtnClick: function(){
-					gagajf.ajaxJsonSubmit($('#deleteForm').prop('action'), jsonData, fnGoodsCateDeleteCallBack);
+					gagajf.ajaxJsonSubmit($('#deleteForm').prop('action'), jsonData, fnGoodsCateCallBack);
 				}
 			});
 		});
 
-		var fnGoodsCateDeleteCallBack = function(){
+		// 저장,삭제 콜백
+		var fnGoodsCateCallBack = function(){
 			$('#btnCateInit').click();
 			fnDisplayCategorySearch();
 		};

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

@@ -14,7 +14,7 @@
  * 1.0  2020.10.26   eskim       최초 작성
  *******************************************************************************
  -->
-	<div class="modalPopup" data-width="1700">
+	<div class="modalPopup" data-width="full" data-height="870">
 	<div class="panelStyle">
 		<!-- TITLE -->
 		<div class="panelTitle">
@@ -224,7 +224,7 @@
 					<span class="btnRight" style="margin-top: 4px;">쪽번호 <span id="pgNo">0</span>/ <strong id="endPgNo">0</strong>&nbsp;&nbsp;</span>
 				</li>
 			</ul>
-			<div id="gridPopupGoodsList" style="width: 100%; height: 400px;" class="ag-theme-balham lh60"></div>
+			<div id="gridPopupGoodsList" style="width: 100%; height: 350px;" class="ag-theme-balham lh60"></div>
 			<!-- 버튼 배치 영역 -->
 			<ul class="panelBar">
 				<li class="center">