입점 상품 공지관리

style24.scm/src/main/java/com/style24/persistence/mybatis/shop/TssNotice.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.style24.admin.biz.dao.TssNoticeDao">
+<mapper namespace="com.style24.scm.biz.dao.TssNoticeDao">
 
 	<!-- 공지사항 저장 -->
 	<insert id="createNotice" parameterType="Notice" keyProperty="noticeSq">

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

@@ -708,7 +708,10 @@ public class TssGoodsController extends TssBaseController {
 
 		// 공급업체
 		String supplyCompCd = "";
-		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList(supplyCompCd, "Y"));
+		if ("G001_B000".equals(TssSession.getInfo().getRoleCd())) {
+			supplyCompCd = TssSession.getInfo().getSupplyCompCd();
+		}
+		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList(supplyCompCd, "N"));
 
 		mav.setViewName("goods/GoodsNoticeForm");
 
@@ -785,4 +788,94 @@ public class TssGoodsController extends TssBaseController {
 		return super.ok(message.getMessage("SUCC_0003"));
 	}
 
+	/**
+	 * 상품조회 팝업
+	 *
+	 * @return
+	 * @author eskim
+	 * @since 2020. 10. 26
+	 */
+	@GetMapping("/popup/list/form")
+	@ResponseBody
+	public ModelAndView relationListForm(GoodsSearch goodsSearch) {
+		ModelAndView mav = new ModelAndView();
+
+		// 공급업체
+		String supplyCompCd = "";
+		String selfYn = "Y";
+		if ("G001_B000".equals(TssSession.getInfo().getRoleCd())) {
+			supplyCompCd = TssSession.getInfo().getSupplyCompCd();
+			selfYn = "N";
+		}
+		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList(supplyCompCd, selfYn));
+		//mav.addObject("supplyCompList", rendererService.getSupplyCompanyList());
+		// 상품상태
+		String[] exceptCds = {"G008_00"};
+		mav.addObject("goodsStatList", rendererService.getCommonCodeList("G008", "Y", exceptCds));
+		// 정상이월
+		mav.addObject("formalGbList", rendererService.getAvailCommonCodeList("G009"));
+		// 성별
+		mav.addObject("sexGbList", rendererService.getAvailCommonCodeList("G007"));
+		// 시즌
+		mav.addObject("seasonList", rendererService.getAvailCommonCodeList("G006"));
+		// 연령대
+		mav.addObject("ageGrpCdList", rendererService.getAvailCommonCodeList("G023"));
+		// 사용여부
+		mav.addObject("useYnList", rendererService.getAvailCommonCodeList("G002"));
+		// 품목
+		mav.addObject("itemkindList", rendererService.getAllItemkindList());
+		// 상품유형
+		mav.addObject("goodsTypeList", rendererService.getAvailCommonCodeList("G056"));
+		// MD
+		mav.addObject("brandMdList", rendererService.getBrandMdList());
+		// 년도
+		int toYear = Integer.parseInt(GagaDateUtil.getToday("yyyy")) - 4;
+		mav.addObject("styleYearList", rendererService.getYearList(toYear,0,5));
+
+		mav.addObject("params", goodsSearch);
+
+		mav.setViewName("goods/GoodsPopupListForm");
+
+		return mav;
+	}
+
+	/**
+	 * 상품조회 팝업 조회
+	 *
+	 * @return
+	 * @author eskim
+	 * @since 2020. 10. 26
+	 */
+	@PostMapping("/popup/list")
+	@ResponseBody
+	public GagaMap getPopupGoodsList(@RequestBody GoodsSearch goodsSearch) {
+
+		GagaMap result = new GagaMap();
+
+		// 입점업체담당자는 업체코드 설정
+		if ("G001_B000".equals(TssSession.getInfo().getRoleCd())) {
+			goodsSearch.setSupplyCompCd(TssSession.getInfo().getSupplyCompCd());
+			goodsSearch.setMdNo(TssSession.getInfo().getUserNo().toString());
+		}
+
+		// multi row 검색관련 처리
+		if (!StringUtils.isEmpty(goodsSearch.getCondition())) {
+			goodsSearch.setConditionList(goodsSearch.getCondition().replaceAll("\r", "").split("\n"));
+
+			if ("searchExtendGoodsCd".equals(goodsSearch.getSearch())) {
+				goodsSearch.setSearchGb("EXTEND");
+			} else if ("searchMasterGoodsCd".equals(goodsSearch.getSearch())) {
+				goodsSearch.setSearchGb("MASTER");
+			}
+		}
+
+		goodsSearch.setRegNo(TssSession.getInfo().getUserNo()); // 엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
+		goodsSearch.setPageable(new TssPageRequest(goodsSearch.getPageNo() - 1, goodsSearch.getPageSize()));
+		goodsSearch.getPageable().setTotalCount(goodsService.getGoodsListCount(goodsSearch));
+
+		result.set("pageing", goodsSearch);
+		result.set("goodsList", goodsService.getGoodsList(goodsSearch));
+
+		return result;
+	}
 }

style24.scm/src/main/webapp/WEB-INF/views/goods/GoodsNoticeForm.html

@@ -495,7 +495,7 @@
 				var jsonData = JSON.stringify($('#goodsNoticeForm').serializeObject());
 				gagajf.ajaxJsonSubmit($('#goodsNoticeForm').prop('action'), jsonData, function() {
 					$('#btnSearch').trigger('click');
-					fnGetNoticeGoodsList($('#goodsNoticeForm input[name=noticeSq]').val());
+					//fnGetNoticeGoodsList($('#goodsNoticeForm input[name=noticeSq]').val());
 					
 				});
 			}
@@ -514,6 +514,14 @@
 		var snOptions = gagaSn.getToolbarOptions('media');
 		gagaSn.createSummernote(snOptions, '#noticeContent');
 		
+		if(sessRoleCd == "G001_B000") {
+			$("#goodsPriceHstForm select[name=supplyCompCd]").val([[${sessionInfo.supplyCompCd}]]);
+			//$("#goodsPriceHstForm select[name=supplyCompCd]").attr("disabled", true);
+			//$("select[disabled]").addClass("formControl");
+			var actionUrl = '/renderer/brand/AuthBrandlist';
+			cfnCreateCombo(actionUrl, $('#goodsPriceHstForm select[name=brandCd]'), "[전체]");
+		}
+		
 	});
 	
 /*]]>*/