12.23_2

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

@@ -36,7 +36,9 @@ public class Delivery extends TscBaseDomain {
 	private String GoodsStatNm;
 	private String supplyCompCd;
 	private String searchTxt;
-
+	private String colorCd;
+	private String sysImgNm;
+	
 	
 	/* 위로  작성  ('' ) ( '')*/
 	
@@ -156,7 +158,7 @@ public class Delivery extends TscBaseDomain {
 	private Integer chasu;
 	private String extmallNm;
 	private String productId;
-	private String colorCd;
+
 	private String recipTelno;
 	private String recipPhnno;
 	private String recipPostNo;

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

@@ -265,10 +265,10 @@
 			, G.BRAND_CD
 			, B.BRAND_KNM
 			, DL.DELV_LOC_NM
-			, GI.IMG_TYPE
-			, GI.IMG_PATH1
+			, (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG  WHERE GOODS_CD = DBG.GOODS_CD AND COLOR_CD = DBG.COLOR_CD AND DEFAULT_IMG_YN = 'Y' ) AS SYS_IMG_NM
 			, G.GOODS_NM
 			, DBG.GOODS_CD
+			, DBG.COLOR_CD			
 			, DBG.SIZE_CD
 			, FN_GET_CODE_NM('G008', G.GOODS_STAT) AS GOODS_STAT
 			, DBG.DELV_BAN_STDT 
@@ -278,7 +278,6 @@
 		INNER JOIN TB_DELIVERY_LOC DL   ON DBG.DELV_LOC_CD = DL.DELV_LOC_CD
 		INNER JOIN TB_GOODS        G    ON DBG.GOODS_CD = G.GOODS_CD
 		INNER JOIN TB_BRAND        B    ON G.BRAND_CD = B.BRAND_CD
-		LEFT OUTER JOIN TB_GOODS_IMG GI ON G.GOODS_CD = GI.GOODS_CD
 		WHERE 1=1
 		<if test='supplyCompCd != null and supplyCompCd != ""'>
 			AND G.SUPPLY_COMP_CD = #{supplyCompCd}
@@ -314,6 +313,7 @@
 			, UPD_DT = NOW()
 		WHERE DELV_BAN_GOODS_SQ = #{delvBanGoodsSq}
 		  AND GOODS_CD          = #{goodsCd}
+		  AND COLOR_CD          = #{colorCd}
 		  AND SIZE_CD           = #{sizeCd}
 	</update>
 
@@ -323,16 +323,16 @@
 		SELECT 
 		      G.BRAND_CD
 			, B.BRAND_KNM
-			, GI.IMG_PATH1
+			, (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG  WHERE GOODS_CD = S.GOODS_CD AND COLOR_CD = S.OPT_CD1 AND DEFAULT_IMG_YN = 'Y' ) AS SYS_IMG_NM	
 			, G.GOODS_NM
 			, G.GOODS_CD
+			, S.OPT_CD1 AS COLOR_CD 
 			, S.OPT_CD2 AS SIZE_CD
 			, G.GOODS_STAT
 			, (SELECT CD_NM FROM TB_COMMON_CODE WHERE CD_GB = 'G008' AND CD =G.GOODS_STAT) AS GOODS_STAT_NM
 		FROM  TB_GOODS G
 		INNER JOIN TB_BRAND B  ON G.BRAND_CD = B.BRAND_CD
-		INNER JOIN TB_OPTION S ON G.GOODS_CD = S.GOODS_CD
-		LEFT OUTER JOIN TB_GOODS_IMG GI ON G.GOODS_CD = GI.GOODS_CD		
+		INNER JOIN TB_OPTION S ON G.GOODS_CD = S.GOODS_CD			
 		WHERE 1=1
 		<if test='supplyCompCd != null and supplyCompCd != ""'>
 			AND G.SUPPLY_COMP_CD = #{supplyCompCd}
@@ -370,6 +370,7 @@
 		INSERT INTO TB_DELIVERY_BAN_GOODS (
 			  DELV_LOC_CD
 			, GOODS_CD
+			, COLOR_CD
 			, SIZE_CD
 			, DELV_BAN_STDT
 			, DELV_BAN_EDDT
@@ -382,6 +383,7 @@
 		VALUES (
 			  #{delvLocCd}
 			, #{goodsCd}
+			, #{colorCd}
 			, #{sizeCd}
 			, replace(#{delvBanStdt},'-','')
 			, replace(#{delvBanEddt},'-','')

style24.admin/src/main/webapp/WEB-INF/views/delivery/BanGoodsRegistForm.html

@@ -12,6 +12,7 @@
  * VER  DATE         AUTHOR      DESCRIPTION
  * ===  ===========  ==========  ==================================
  * 1.0  2020.11.11   moon        최초 작성
+ * 1.1  2020.11.23   moon        이미지관련 수정 
  *******************************************************************************
  -->
 	<div class="modalPopup" data-width="1200">
@@ -117,18 +118,15 @@
 	var columnBanDefs = [
 		{width: 42, minWidth: 42, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
 		{headerName: "브랜드",	field: "brandKnm", width: 150, minWidth: 80, cellClass: 'text-center'},
-		{headerName: "이미지",	field: "imgPath1", width: 130, height: 80, cellClass: 'text-center'
+		{headerName: "이미지",	field: "sysImgNm", width: 130, height: 80, cellClass: 'text-center'
 			,cellRenderer: function(params) {
-				if (params.data.imgType == "A"){
-					return '<img width="60" src="'+ params.value + '" alt=""/>';
-				}else{
-					return '<img width="60" src="'+ params.value + '" alt=""/>';
-				}
+				return '<img width="60" src="'+ _goodsUrl+ "/" +params.value + '" alt=""/>';
 			}
 		},
-		{headerName: "상품명",	field: "goodsNm", width: 330, minWidth: 100},
-		{headerName: "상품코드",	field: "goodsCd", width: 150, minWidth: 100, cellClass: 'text-center'},
-		{headerName: "사이즈",	field: "sizeCd", width: 150, minWidth: 100, cellClass: 'text-center'},
+		{headerName: "상품명",	field: "goodsNm",     width: 330, minWidth: 100},
+		{headerName: "상품코드",	field: "goodsCd",     width: 150, minWidth: 100, cellClass: 'text-center'},
+		{headerName: "컬러",	    field: "colorCd",     width: 100, minWidth: 100, cellClass: 'text-center'},
+		{headerName: "사이즈",	field: "sizeCd",      width: 100, minWidth: 100, cellClass: 'text-center'},
 		{headerName: "상품상태",	field: "goodsStatNm", width: 150, minWidth: 100, cellClass: 'text-center'},
 	];
 
@@ -190,11 +188,12 @@
 	            $.each(gridData, function(idx, item) {
 	                var param = new Object;
 
-	                param.goodsCd = item.goodsCd;
-	                param.sizeCd = item.sizeCd;
+	                param.goodsCd     = item.goodsCd;
+	                param.colorCd     = item.colorCd;
+	                param.sizeCd      = item.sizeCd;
 	                param.delvBanStdt = delvBanStdt;
 	                param.delvBanEddt = delvBanEddt;
-	                param.delvLocCd = delvLocCd;
+	                param.delvLocCd   = delvLocCd;
 
 	                createData.push(param);
 	            });

style24.admin/src/main/webapp/WEB-INF/views/delivery/BangoodsListForm.html

@@ -138,13 +138,11 @@
 		{headerName: "삭제",					field: "delYn",			width: 50,	cellClass: 'text-center'},
 		{headerName: "브랜드",				field: "brandKnm",		width: 150,	cellClass: 'text-center'},
 		{headerName: "출고처명",				field: "delvLocNm",		width: 150,	cellClass: 'text-center'},
-		{headerName: "이미지",				field: "imgPath1",		width: 100,	cellClass: 'text-center', 
+		{headerName: "이미지",				field: "sysImgNm",		width: 100,	cellClass: 'text-center', 
 			cellRenderer: function(params) {
-				if (params.data.imgType == "A"){
-					return '<img width="60" src="'+ params.value + '" alt=""/>';
-				}else{
-					return '<img width="60" src="'+ params.value + '" alt=""/>';
-				}
+
+				return '<img width="60" src="'+ _goodsUrl+ "/" +params.value + '" alt=""/>';
+
 			}
 		},
 		{headerName: "상품명",				field: "goodsNm",		width: 150,	cellClass: 'text-center'},
@@ -159,6 +157,7 @@
 				}
 			}
 		},
+		{headerName: "컬러",		    field: "colorCd",		width: 80,	cellClass: 'text-center'},
 		{headerName: "사이즈",		field: "sizeCd",		width: 80,	cellClass: 'text-center'},
 		{headerName: "상품상태",		field: "goodsStat",		width: 80,	cellClass: 'text-center'},
 		{headerName: "출고금지시작일자",	field: "delvBanStdt",	width: 150,	cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toDateFormat(params.value); }},
@@ -167,6 +166,8 @@
 	];
 
 	var gridOptions = gagaAgGrid.getGridOptions(columnDefs);
+	gridOptions.rowSelection = 'multiple';
+	
 	//gridOptions.rowHeight = 60;
 	/*************************************************************************
 	*  조회 버튼 클릭 시
@@ -281,6 +282,7 @@
 
 	                param.delvBanGoodsSq = item.delvBanGoodsSq;
 	                param.goodsCd = item.goodsCd;
+	                param.colorCd = item.colorCd;
 	                param.sizeCd = item.sizeCd;
 
 	                createData.push(param);