사이즈별 현황

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

@@ -266,8 +266,6 @@ public class TsaGoodsController extends TsaBaseController {
 		mav.addObject("useYnList", rendererService.getAvailCommonCodeList("G002"));
 		// 정보고시 분류별 항목
 		mav.addObject("niItemCdList", rendererService.getAvailCommonCodeList("G005"));
-		// 공급업체
-//		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList());
 
 		mav.setViewName("goods/NotiinfoForm");
 
@@ -432,11 +430,14 @@ public class TsaGoodsController extends TsaBaseController {
 	public ModelAndView listForm() {
 		ModelAndView mav = new ModelAndView();
 
-		mav.addObject("siteList", rendererService.getAvailCommonCodeList("G000"));
 		// 공급업체
 		String supplyCompCd = "";
-		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList(supplyCompCd, "Y"));
-		//mav.addObject("supplyCompList", rendererService.getSupplyCompanyList());
+		String selfYn = "Y";
+		if ("G001_B000".equals(TsaSession.getInfo().getRoleCd())) {
+			supplyCompCd = TsaSession.getInfo().getSupplyCompCd();
+			selfYn = "N";
+		}
+		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList(supplyCompCd, selfYn));
 		// 상품상태
 		String[] exceptCds = {"G008_00"};
 		mav.addObject("goodsStatList", rendererService.getCommonCodeList("G008", "Y", exceptCds));
@@ -713,12 +714,14 @@ public class TsaGoodsController extends TsaBaseController {
 	public ModelAndView detailForm(Goods goods) {
 		ModelAndView mav = new ModelAndView();
 
+		// 공급업체
 		String supplyCompCd = "";
+		String selfYn = "Y";
 		if ("G001_B000".equals(TsaSession.getInfo().getRoleCd())) {
 			supplyCompCd = TsaSession.getInfo().getSupplyCompCd();
+			selfYn = "N";
 		}
-		// 공급업체
-		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList(supplyCompCd));
+		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList(supplyCompCd, selfYn));
 
 		String[] goodsStatExceptCds = {"G008_00"};
 		mav.addObject("goodsStatList", rendererService.getCommonCodeList("G008", "Y", goodsStatExceptCds));
@@ -1113,12 +1116,14 @@ public class TsaGoodsController extends TsaBaseController {
 	public ModelAndView itemkindForm() {
 		ModelAndView mav = new ModelAndView();
 
+		// 공급업체
 		String supplyCompCd = "";
+		String selfYn = "Y";
 		if ("G001_B000".equals(TsaSession.getInfo().getRoleCd())) {
 			supplyCompCd = TsaSession.getInfo().getSupplyCompCd();
+			selfYn = "N";
 		}
-		// 공급업체
-		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList(supplyCompCd));
+		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList(supplyCompCd, selfYn));
 		// 시즌
 		mav.addObject("seasonList", rendererService.getAvailCommonCodeList("G006"));
 		// 년도
@@ -1165,7 +1170,12 @@ public class TsaGoodsController extends TsaBaseController {
 	public ModelAndView priceForm() {
 		ModelAndView mav = new ModelAndView();
 		// 공급업체
-		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList());
+		String supplyCompCd = "";
+		if ("G001_B000".equals(TsaSession.getInfo().getRoleCd())) {
+			supplyCompCd = TsaSession.getInfo().getSupplyCompCd();
+		}
+		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList(supplyCompCd, "N"));
+
 		// 상품상태
 		String[] exceptCds = {"G008_00"};
 		mav.addObject("goodsStatList", rendererService.getCommonCodeList("G008", "Y", exceptCds));
@@ -1188,13 +1198,12 @@ public class TsaGoodsController extends TsaBaseController {
 		ModelAndView mav = new ModelAndView();
 
 		// 사이트
-		mav.addObject("siteList", rendererService.getAvailCommonCodeList("G000"));
 		String supplyCompCd = "";
 		if ("G001_B000".equals(TsaSession.getInfo().getRoleCd())) {
 			supplyCompCd = TsaSession.getInfo().getSupplyCompCd();
 		}
 		// 공급업체
-		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList(supplyCompCd));
+		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList(supplyCompCd, "Y"));
 		// 상품상태
 		// mav.addObject("goodsStatList",
 		// rendererService.getAvailCommonCodeList("G008"));
@@ -1395,12 +1404,9 @@ public class TsaGoodsController extends TsaBaseController {
 	public ModelAndView epSkipForm() {
 		ModelAndView mav = new ModelAndView();
 
-		String supplyCompCd = "";
-		if ("G001_B000".equals(TsaSession.getInfo().getRoleCd())) {
-			supplyCompCd = TsaSession.getInfo().getSupplyCompCd();
-		}
 		// 공급업체
-		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList(supplyCompCd));
+		String supplyCompCd = "";
+		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList(supplyCompCd,"Y"));
 		// 상품상태
 		String[] exceptCds = {"G001_00"};
 		mav.addObject("goodsStatList", rendererService.getCommonCodeList("G008", "Y", exceptCds));
@@ -1530,14 +1536,9 @@ public class TsaGoodsController extends TsaBaseController {
 	public ModelAndView reserveSellForm() {
 		ModelAndView mav = new ModelAndView();
 
-		// 사이트
-		mav.addObject("siteList", rendererService.getAvailCommonCodeList("G000"));
-		String supplyCompCd = "";
-		if ("G001_B000".equals(TsaSession.getInfo().getRoleCd())) {
-			supplyCompCd = TsaSession.getInfo().getSupplyCompCd();
-		}
 		// 공급업체
-		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList(supplyCompCd));
+		String supplyCompCd = "";
+		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList(supplyCompCd,"Y"));
 		// 상품상태
 		String[] exceptCds = {"G008_00"};
 		mav.addObject("goodsStatList", rendererService.getCommonCodeList("G008", "Y", exceptCds));
@@ -1648,7 +1649,8 @@ public class TsaGoodsController extends TsaBaseController {
 		ModelAndView mav = new ModelAndView();
 
 		// 공급업체
-		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList());
+		String supplyCompCd = "";
+		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList(supplyCompCd, "Y"));
 
 		mav.setViewName("goods/GoodsDetailNoticeForm");
 
@@ -1737,10 +1739,14 @@ public class TsaGoodsController extends TsaBaseController {
 	public ModelAndView relationListForm(GoodsSearch goodsSearch) {
 		ModelAndView mav = new ModelAndView();
 
-		mav.addObject("siteList", rendererService.getAvailCommonCodeList("G000"));
 		// 공급업체
 		String supplyCompCd = "";
-		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList(supplyCompCd, "Y"));
+		String selfYn = "Y";
+		if ("G001_B000".equals(TsaSession.getInfo().getRoleCd())) {
+			supplyCompCd = TsaSession.getInfo().getSupplyCompCd();
+			selfYn = "N";
+		}
+		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList(supplyCompCd, selfYn));
 		//mav.addObject("supplyCompList", rendererService.getSupplyCompanyList());
 		// 상품상태
 		String[] exceptCds = {"G008_00"};
@@ -1823,14 +1829,9 @@ public class TsaGoodsController extends TsaBaseController {
 	public ModelAndView priceReserveForm() {
 		ModelAndView mav = new ModelAndView();
 
-		// 사이트
-		mav.addObject("siteList", rendererService.getAvailCommonCodeList("G000"));
-		String supplyCompCd = "";
-		if ("G001_B000".equals(TsaSession.getInfo().getRoleCd())) {
-			supplyCompCd = TsaSession.getInfo().getSupplyCompCd();
-		}
 		// 공급업체
-		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList(supplyCompCd));
+		String supplyCompCd = "";
+		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList(supplyCompCd, "Y"));
 		// 상품상태
 		String[] exceptCds = {"G008_00"};
 		mav.addObject("goodsStatList", rendererService.getCommonCodeList("G008", "Y", exceptCds));

style24.admin/src/main/java/com/style24/persistence/domain/GoodsSearch.java

@@ -57,8 +57,8 @@ public class GoodsSearch extends TscBaseDomain {
 	private String callBackFun;
 	private String applyStdt;
 	private String applyEddt;
+	private String optCd1;	//옵션1
 	private String optCd2;	//옵션2
-	private String colorCd;	//옵션1
 	private String beforSkipFlag;
 	private String goodsTnm;
 	private String imageViewYn;
@@ -109,4 +109,5 @@ public class GoodsSearch extends TscBaseDomain {
 	private int pageSize = 50;
 	private int pageUnit = 10;
 
+
 }

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

@@ -246,8 +246,11 @@
 		            INNER JOIN TB_SUPPLY_COMPANY S ON G.SUPPLY_COMP_CD = S.SUPPLY_COMP_CD
 		            INNER JOIN TB_OPTION ST ON G.GOODS_CD = ST.GOODS_CD
 		            <if test="searchGb == null or searchGb =='BASIC'">
+		                                    <if test="optCd1 == null or optCd1 != ''">
+		                                    AND ST.OPT_CD1 = #{optCd1}
+		                                    </if>
 		                                    <if test="optCd2 == null or optCd2 != ''">
-		                                    AND ST.OPT_CD2 = ${optCd2}
+		                                    AND ST.OPT_CD2 = #{optCd2}
 		                                    </if>
 		            </if>
 		            LEFT OUTER JOIN  (SELECT GOODS_CD,
@@ -394,8 +397,11 @@
 		                    INNER JOIN TB_SUPPLY_COMPANY S ON G.SUPPLY_COMP_CD = S.SUPPLY_COMP_CD
 		                    INNER JOIN TB_OPTION ST ON G.GOODS_CD = ST.GOODS_CD
 		                    <if test="searchGb == null or searchGb =='BASIC'">
+		                                            <if test="optCd1 == null or optCd1 != ''">
+		                                            AND ST.OPT_CD1 = #{optCd1}
+		                                            </if>
 		                                            <if test="optCd2 == null or optCd2 != ''">
-		                                            AND ST.OPT_CD2 = ${optCd2}
+		                                            AND ST.OPT_CD2 = #{optCd2}
 		                                            </if>
 		                    </if>
 		                    LEFT OUTER JOIN  (SELECT GOODS_CD,

style24.admin/src/main/webapp/WEB-INF/views/stock/GoodsSizeStockForm.html

@@ -75,7 +75,6 @@
 								<option value="searchGoodsNm">상품명</option>
 								<option value="searchGoodsNum">품번</option>
 								<option value="searchSupplyGoodsCd">업체상품코드</option>
-								<option value="searchRegId">등록자</option>
 							</select>
 							<input type="text" class="w150" name="condition" id="condition" maxlength="50"/>
 						</td>
@@ -108,7 +107,7 @@
 						</td>
 						<th>색상</th>
 						<td>
-							<select name="colorCd" id="colorCd">
+							<select name="optCd1" id="optCd1">
 								<option value="">[전체]</option>
 								<option th:if="${colorList}" th:each="oneData, status : ${colorList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
 							</select>