입점상품 관련

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

@@ -716,12 +716,13 @@ public class TsaGoodsController extends TsaBaseController {
 
 		// 공급업체
 		String supplyCompCd = "";
-		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(supplyCompCd));
+//		String selfYn = "Y";
+//		if ("G001_B000".equals(TsaSession.getInfo().getRoleCd())) {
+//			supplyCompCd = TsaSession.getInfo().getSupplyCompCd();
+//			selfYn = "N";
+//		}
+//		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList(supplyCompCd, selfYn));
 
 		String[] goodsStatExceptCds = {"G008_00"};
 		mav.addObject("goodsStatList", rendererService.getCommonCodeList("G008", "Y", goodsStatExceptCds));
@@ -745,8 +746,9 @@ public class TsaGoodsController extends TsaBaseController {
 		// 상품구분
 		mav.addObject("goodsGbList", rendererService.getAvailCommonCodeList("G073"));
 		// 유통구분
-		String[] distributionGbExceptCds = {"G065_20"};
-		mav.addObject("distributionGbList", rendererService.getCommonCodeList("G065", "Y", distributionGbExceptCds));
+		//String[] distributionGbExceptCds = {"G065_20"};
+		//mav.addObject("distributionGbList", rendererService.getCommonCodeList("G065", "Y", distributionGbExceptCds));
+		mav.addObject("distributionGbList", rendererService.getCommonCodeList("G065", "Y"));
 		// 상품연령대
 		mav.addObject("ageGrpCdList", rendererService.getAvailCommonCodeList("G023"));
 		// 년도

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

@@ -1758,7 +1758,7 @@
 		      , UPD_NO = #{updNo}
 		      , UPD_DT = NOW()
 		      <if test='selfGoodsYn != null and selfGoodsYn == "N"'>
-		      , CURR_ON_STOCK_QTY = #{currOnStockQty}
+		      , CURR_STOCK_QTY = #{currStockQty}
 		      </if>
 	</update>
 	

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

@@ -749,6 +749,7 @@
 				$("#goodsDetailForm").find("#selfGoodsDpTitle").html('원코드');
 				$("#goodsDetailForm").find("#selfGoodsDpTxt").html('<div id="supplyGoodsCdTxt"></div>');
 				$('#goodsDetailForm').find('#supplyGoodsCdTxt').html(result.supplyGoodsCd);
+				$('#goodsDetailForm select[name=distributionGb]').attr('readonly', true);
 			}
 			$('#goodsDetailForm input[name=delvFee]').val(result.delvFee.addComma());
 			$('#goodsDetailForm input[name=pntPrate]').val(result.pntPrate);