Merge remote-tracking branch 'origin/develop' into jsh77b

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

@@ -1860,7 +1860,7 @@ public class TsaGoodsController extends TsaBaseController {
 	@PostMapping("/ep/skip/list")
 	@ResponseBody
 	public GagaMap goodsEpSkipList(@RequestBody GoodsSearch goodsSearch) {
-
+		log.info("[goodsEpSkipList] goodsSearch = {}", goodsSearch);
 		GagaMap result = new GagaMap();
 
 		// 입점업체담당자는 업체코드 설정
@@ -1896,7 +1896,7 @@ public class TsaGoodsController extends TsaBaseController {
 		goodsSearch.setRegNo(TsaSession.getInfo().getUserNo()); // 엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
 		goodsSearch.setPageable(new TscPageRequest(goodsSearch.getPageNo() - 1, goodsSearch.getPageSize()));
 		goodsSearch.getPageable().setTotalCount(goodsService.getGoodsEpSkipCount(goodsSearch));
-
+		log.info("[goodsEpSkipList] goodsSearch = {}", goodsSearch);
 		result.set("pageing", goodsSearch);
 		result.set("goodsEpSkipList", goodsService.getGoodsEpSkipList(goodsSearch));
 

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

@@ -131,6 +131,7 @@ public class Delivery extends TscBaseDomain {
 	private int currPrice;
 	private int saleAmt;
 	private int realOrdAmt;
+	private int stockQty;
 	
 	private Double delvFeeRate;
 	

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

@@ -575,8 +575,8 @@
 					FROM TB_SEARCH_DATA
 					WHERE REG_NO = #{regNo}
 					GROUP BY SEARCH_CD) D
-				WHERE C.GOODS_CD LIKE D.SEARCH_CD||'%'
-				OR C.SUPPLY_GOODS_CD LIKE D.SEARCH_CD||'%'
+				WHERE C.GOODS_CD LIKE CONCAT(D.SEARCH_CD,'%')
+				OR C.SUPPLY_GOODS_CD LIKE CONCAT(D.SEARCH_CD,'%')
 			) A
 			WHERE 1 = 1
 		</if>
@@ -635,8 +635,8 @@
 							WHERE REG_NO = #{regNo}
 							GROUP BY SEARCH_CD
 							) D
-						WHERE C.GOODS_CD LIKE D.SEARCH_CD||'%'
-						OR C.SUPPLY_GOODS_CD LIKE D.SEARCH_CD||'%'
+						WHERE C.GOODS_CD LIKE CONCAT(D.SEARCH_CD,'%')
+						OR C.SUPPLY_GOODS_CD LIKE CONCAT(D.SEARCH_CD,'%')
 					) G
 					JOIN ( SELECT @rownum := 0) R
 					WHERE 1 = 1
@@ -661,13 +661,13 @@
 
 	<sql id="getGoodsCategoryListCondition_sql">
 		<if test='goodsCd != null and goodsCd != ""'>
-			AND UPPER(G.GOODS_CD) LIKE CONCAT('%',UPPER(#{goodsCd}),'%')
+			AND UPPER(G.GOODS_CD) LIKE CONCAT(UPPER(#{goodsCd}),'%')
 		</if>
 		<if test='supplyGoodsCd != null and supplyGoodsCd != ""'>
 			AND G.SUPPLY_GOODS_CD = #{supplyGoodsCd}
 		</if>
 		<if test='goodsNm != null and goodsNm != ""'>
-			AND UPPER(G.GOODS_NM) LIKE CONCAT('%',UPPER(#{goodsNm}),'%')
+			AND UPPER(G.GOODS_NM) LIKE CONCAT(UPPER(#{goodsNm}),'%')
 		</if>
 		<if test='goodsStat != null and goodsStat != ""'>
 			AND G.GOODS_STAT = #{goodsStat}
@@ -884,8 +884,8 @@
 			WHERE REG_NO = #{regNo}
 			GROUP BY SEARCH_CD
 			) D
-			WHERE G.GOODS_CD LIKE D.SEARCH_CD||'%'
-			OR G.SUPPLY_GOODS_CD LIKE D.SEARCH_CD||'%'
+			WHERE G.GOODS_CD LIKE CONCAT(D.SEARCH_CD,'%')
+			OR G.SUPPLY_GOODS_CD LIKE CONCAT(D.SEARCH_CD,'%')
 			) G
 		</if>
 		WHERE A.GOODS_CD = G.GOODS_CD
@@ -961,8 +961,8 @@
 					WHERE REG_NO = #{regNo}
 					GROUP BY SEARCH_CD
 					) D
-					WHERE G.GOODS_CD LIKE D.SEARCH_CD||'%'
-					OR G.SUPPLY_GOODS_CD LIKE D.SEARCH_CD||'%'
+					WHERE G.GOODS_CD LIKE CONCAT(D.SEARCH_CD,'%')
+					OR G.SUPPLY_GOODS_CD LIKE CONCAT(D.SEARCH_CD,'%')
 					) G
 				</if>
 				JOIN ( SELECT @rownum := 0) R
@@ -1020,8 +1020,8 @@
 			WHERE REG_NO = #{regNo}
 			GROUP BY SEARCH_CD
 			) D
-			WHERE G.GOODS_CD LIKE D.SEARCH_CD||'%'
-			OR G.SUPPLY_GOODS_CD LIKE D.SEARCH_CD||'%'
+			WHERE G.GOODS_CD LIKE CONCAT(D.SEARCH_CD,'%')
+			OR G.SUPPLY_GOODS_CD LIKE CONCAT(D.SEARCH_CD,'%')
 			) G
 		</if>
 		WHERE A.GOODS_CD = G.GOODS_CD
@@ -1104,8 +1104,8 @@
 							WHERE REG_NO = #{regNo}
 							GROUP BY SEARCH_CD
 							) D
-							WHERE G.GOODS_CD LIKE D.SEARCH_CD||'%'
-							OR G.SUPPLY_GOODS_CD LIKE D.SEARCH_CD||'%'
+							WHERE G.GOODS_CD LIKE CONCAT(D.SEARCH_CD,'%')
+							OR G.SUPPLY_GOODS_CD LIKE CONCAT(D.SEARCH_CD,'%')
 							) G
 						</if>
 					   JOIN ( SELECT @rownum := 0) R
@@ -1348,7 +1348,7 @@
 		     , A.BRAND_GROUP_IMG
 		     , A.MD_TITLE
 		     ,(SELECT GROUP_CONCAT(B.GOODS_CD ORDER BY B.DISP_ORD SEPARATOR ',')
-		        FROM  TMP_CONTENTS_GOODS B
+		        FROM  TB_CONTENTS_GOODS B
 		       WHERE  1=1
 		       <if test="contentsLoc != 'SMM012'">
 		         AND  B.CATE_NO = A.CATE_NO
@@ -1360,7 +1360,7 @@
 		       </if>
 		         AND  B.CONTENTS_LOC = #{contentsLoc}) AS GOODS_CD_LIST
 		     ,(SELECT 	GROUP_CONCAT(B.GOODS_NM ORDER BY B.DISP_ORD SEPARATOR ',')
-		       FROM	TMP_CONTENTS_GOODS B
+		       FROM	TB_CONTENTS_GOODS B
 		       WHERE 1=1
 		       <if test="contentsLoc != 'SMM012'">
 		         AND B.CATE_NO = A.CATE_NO
@@ -1372,7 +1372,7 @@
 		       </if>
 		         AND B.CONTENTS_LOC = #{contentsLoc}) AS GOODS_NM_LIST
 		     ,(SELECT GROUP_CONCAT(GI.SYS_IMG_NM ORDER BY B.DISP_ORD SEPARATOR ',')
-		       FROM TMP_CONTENTS_GOODS B
+		       FROM TB_CONTENTS_GOODS B
 		       JOIN TB_GOODS G ON B.GOODS_CD = G.GOODS_CD
 		       JOIN TB_GOODS_IMG GI ON G.GOODS_CD = GI.GOODS_CD AND G.MAIN_COLOR_CD = COLOR_CD AND GI.DEFAULT_IMG_YN = 'Y'
 		       WHERE 1=1
@@ -1654,7 +1654,7 @@
 
 	<delete id="deleteContentsGoodsTemp" parameterType="Contents">
 		/* TsaDisplay.deleteContentsGoodsTemp */
-		DELETE FROM TMP_CONTENTS_GOODS
+		DELETE FROM TB_CONTENTS_GOODS
 		WHERE 1=1
 		<if test="cateNo != null and cateNo != ''">
 		AND CATE_NO = #{cateNo}
@@ -1665,7 +1665,7 @@
 
 	<insert id="saveContentsGoodsTemp" parameterType="Contents">
 		/* TsaDisplay.saveContentsGoodsTemp */
-		INSERT INTO TMP_CONTENTS_GOODS
+		INSERT INTO TB_CONTENTS_GOODS
 		(
 		    BRAND_GROUP_NO
 		    ,CATE_NO
@@ -1698,7 +1698,7 @@
 		    ,#{goodsNm}
 		    ,#{imgPath1}
 		    ,(SELECT DISP_ORD FROM (SELECT IFNULL((MAX(DISP_ORD) + 1), 1) AS DISP_ORD
-		                            FROM	TMP_CONTENTS_GOODS
+		                            FROM	TB_CONTENTS_GOODS
 		                            WHERE 1=1
 		                            <if test="cateNo != null and cateNo != ''">
 		                            AND CATE_NO = #{cateNo}
@@ -1742,7 +1742,7 @@
 		                   , DISP_ORD
 		                   , #{regNo} AS REG_NO
 		                   , NOW()
-		              FROM TMP_CONTENTS_GOODS
+		              FROM TB_CONTENTS_GOODS
 		              WHERE 1=1
 		              <if test="cateNo != null and cateNo != ''">
 		              AND CATE_NO = #{cateNo}

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

@@ -534,28 +534,28 @@
 		              <when test='search != null and search == "searchGoodsCd"'>
 		        AND (
 		              <foreach collection="conditionList" item="item" index="index" separator="or">
-		               UPPER(G.GOODS_CD) LIKE CONCAT('%',UPPER(#{item}),'%') 
+		               UPPER(G.GOODS_CD) LIKE CONCAT(UPPER(#{item}),'%') 
 		              </foreach>
 		             )
 		              </when>
 		              <when test='search != null and search == "searchGoodsNm"'>
 		        AND (
 		              <foreach collection="conditionList" item="item" index="index" separator="or">
-		               UPPER(G.GOODS_NM) LIKE CONCAT('%',UPPER(#{item}),'%')
+		               UPPER(G.GOODS_NM) LIKE CONCAT(UPPER(#{item}),'%') 
 		              </foreach>
 		             )
 		              </when>
 		               <when test='search != null and search == "searchGoodsNum"'>
 		        AND (
 		              <foreach collection="conditionList" item="item" index="index" separator="or">
-		               UPPER(G.GOODS_NUM) LIKE CONCAT('%',UPPER(#{item}),'%')
+		               UPPER(G.GOODS_NUM) LIKE CONCAT(UPPER(#{item}),'%') 
 		              </foreach>
 		             )
 		              </when>
 		              <when test='search != null and search == "searchSupplyGoodsCd"'>
 		        AND (
 		              <foreach collection="conditionList" item="item" index="index" separator="or">
-		               UPPER(G.SUPPLY_GOODS_CD) LIKE CONCAT('%',UPPER(#{item}),'%')
+		               UPPER(G.SUPPLY_GOODS_CD) LIKE CONCAT(UPPER(#{item}),'%') 
 		              </foreach>
 		             )
 		              </when>
@@ -571,7 +571,7 @@
 		            </choose>
 		        </if>
 		        <if test="goodsCd != null and goodsCd != ''">
-		        AND UPPER(G.GOODS_CD) LIKE CONCAT('%',UPPER(#{goodsCd}),'%')
+		        AND UPPER(G.GOODS_CD) LIKE CONCAT(UPPER(#{goodsCd}),'%')
 		        </if>
 		        <if test="arrGoodsCd != null and arrGoodsCd.length>0">
 		        AND UPPER(G.GOODS_CD) IN
@@ -580,7 +580,7 @@
 		            </foreach>
 		        </if>
 		         <if test="goodsNm != null and goodsNm != ''">
-		        AND UPPER(G.GOODS_NM) LIKE CONCAT('%',UPPER(#{goodsNm}),'%')
+		        AND UPPER(G.GOODS_NM) LIKE CONCAT(UPPER(#{goodsNm}),'%')
 		        </if>
 		        <if test="goodsType != null and goodsType != ''">
 		        AND G.GOODS_TYPE = #{goodsType}
@@ -1988,7 +1988,7 @@
 		                               AND GR.APPLY_EDDT >= NOW() 
 		    </if>
 		    <if test="goodsTnmRes != null and goodsTnmRes != ''">
-		                               AND UPPER(GR.GOODS_TNM) LIKE CONCAT('%',UPPER(#{goodsTnmRes}),'%')
+		                               AND UPPER(GR.GOODS_TNM) LIKE CONCAT(UPPER(#{goodsTnmRes}),'%')
 		    </if>
 		</if>
 		<if test="searchGb != null and searchGb =='EXCEL'">
@@ -2063,7 +2063,7 @@
 		                                       AND GR.APPLY_EDDT >= NOW() 
 		            </if>
 		            <if test="goodsTnmRes != null and goodsTnmRes != ''">
-		                                       AND UPPER(GR.GOODS_TNM) LIKE CONCAT('%',UPPER(#{goodsTnmRes}),'%')
+		                                       AND UPPER(GR.GOODS_TNM) LIKE CONCAT(UPPER(#{goodsTnmRes}),'%')
 		            </if>
 		        </if>
 		        <if test="searchGb != null and searchGb =='EXCEL'">
@@ -2572,7 +2572,7 @@
 		AND A.USE_YN = #{useYn}
 		</if>
 		<if test="noticeTitle != null and noticeTitle !=''">
-		AND LOWER(A.NOTICE_TITLE) LIKE CONCAT('%',LOWER(#{noticeTitle}),'%')
+		AND LOWER(A.NOTICE_TITLE) LIKE CONCAT(LOWER(#{noticeTitle}),'%')
 		</if>
 		<if test='conditionList != null and conditionList.length>0'>
 		AND A.NOTICE_SQ IN (
@@ -2586,22 +2586,22 @@
 		    <choose>
 		      <when test='search != null and search == "searchGoodsCd"'>
 		          <foreach collection="conditionList" item="item" index="index" separator="or">
-		       UPPER(G.GOODS_CD) LIKE CONCAT('%',UPPER(#{item}),'%') 
+		       UPPER(G.GOODS_CD) LIKE CONCAT(UPPER(#{item}),'%') 
 		          </foreach>
 		      </when>
 		      <when test='search != null and search == "searchGoodsNm"'>
 		          <foreach collection="conditionList" item="item" index="index" separator="or">
-		       UPPER(G.GOODS_NM) LIKE CONCAT('%',UPPER(#{item}),'%')
+		       UPPER(G.GOODS_NM) LIKE CONCAT(UPPER(#{item}),'%') 
 		          </foreach>
 		      </when>
 		      <when test='search != null and search == "searchGoodsNum"'>
 		          <foreach collection="conditionList" item="item" index="index" separator="or">
-		       UPPER(G.GOODS_NUM) LIKE CONCAT('%',UPPER(#{item}),'%')
+		       UPPER(G.GOODS_NUM) LIKE CONCAT(UPPER(#{item}),'%') 
 		          </foreach>
 		      </when>
 		      <when test='search != null and search == "searchSupplyGoodsCd"'>
 		          <foreach collection="conditionList" item="item" index="index" separator="or">
-		       UPPER(G.SUPPLY_GOODS_CD) LIKE CONCAT('%',UPPER(#{item}),'%')
+		       UPPER(G.SUPPLY_GOODS_CD) LIKE CONCAT(UPPER(#{item}),'%') 
 		          </foreach>
 		      </when>
 		    </choose>
@@ -2921,9 +2921,9 @@
 		</if>
 		<if test='brandEnm != null and brandEnm != "" '>
 		AND (
-		     D.BRAND_ENM LIKE #{brandEnm}||'%'
+		     D.BRAND_ENM LIKE CONCAT(#{brandEnm},'%')
 		     OR
-		     D.BRAND_KNM LIKE #{brandEnm}||'%'
+		     D.BRAND_KNM LIKE CONCAT(#{brandEnm},'%')
 		    )
 		</if>
 		<if test='stDate != null and stDate != "" '>
@@ -2969,7 +2969,7 @@
 		           #{videoSq}
 		         , #{goodsCd}
 		         , #{videoGb}
-		         , #{kmcKey}
+		         , CASE WHEN LENGTH(#{kmcKey}) = 0 THEN NULL ELSE #{kmcKey} END
 		         , #{kufKey}
 		         , #{dispYn}
 		         , #{regNo}
@@ -2989,7 +2989,7 @@
 		UPDATE TB_GOODS_VIDEO SET
 		           DISP_YN = #{dispYn}
 		         , VIDEO_GB = #{videoGb}
-		         , KMC_KEY = #{kmcKey}
+		         , KMC_KEY = CASE WHEN LENGTH(#{kmcKey}) = 0 THEN NULL ELSE #{kmcKey} END
 		         , UPD_NO = #{updNo}
 		         , UPD_DT = NOW()
 		WHERE VIDEO_SQ = #{videoSq}
@@ -3062,7 +3062,7 @@
 		    INNER JOIN TB_SUPPLY_COMPANY S ON G.SUPPLY_COMP_CD = S.SUPPLY_COMP_CD
 		    WHERE 1 = 1
 		    <if test="goodsCd != null and goodsCd != ''">
-		    AND UPPER(G.GOODS_CD) LIKE CONCAT('%',UPPER(#{goodsCd}),'%') 
+		    AND UPPER(G.GOODS_CD) LIKE CONCAT(UPPER(#{goodsCd}),'%') 
 		    </if>
 		    <if test="supplyCompCd != null and supplyCompCd != ''">
 		    AND G.SUPPLY_COMP_CD = #{supplyCompCd}
@@ -3399,7 +3399,7 @@
 		AND A.USE_YN = #{useYn}
 		</if>
 		<if test="adKeyword != null and adKeyword !=''">
-		AND LOWER(A.AD_KEYWORD) LIKE CONCAT('%',LOWER(#{adKeyword}),'%')
+		AND LOWER(A.AD_KEYWORD) LIKE CONCAT(LOWER(#{adKeyword}),'%')
 		</if>
 		<if test='goodsCd != null and goodsCd != "" '>
 		AND A.AD_KEYWORD_SQ IN (
@@ -3520,10 +3520,10 @@
 		<if test='condition != null and condition != "" '>
 		    <choose>
 		        <when test='search != null and search == "searchGoodsNm"'>
-		AND UPPER(G.GOODS_NM) LIKE  CONCAT('%',UPPER(#{condition}),'%')
+		AND UPPER(G.GOODS_NM) LIKE  CONCAT(UPPER(#{condition}),'%')
 		        </when>
 				<when test='search != null and search == "searchGoodsCd"'>
-		AND UPPER(G.GOODS_CD) LIKE  CONCAT('%',UPPER(#{condition}),'%')
+		AND UPPER(G.GOODS_CD) LIKE  CONCAT(UPPER(#{condition}),'%')
 				</when>
 		    </choose>
 		</if>
@@ -3609,10 +3609,10 @@
 		              <if test='condition != null and condition != "" '>
 		                  <choose>
 		                      <when test='search != null and search == "searchGoodsNm"'>
-		              AND UPPER(G.GOODS_NM) LIKE  CONCAT('%',UPPER(#{condition}),'%')
+		              AND UPPER(G.GOODS_NM) LIKE  CONCAT(UPPER(#{condition}),'%')
 		                      </when>
 		                      <when test='search != null and search == "searchGoodsCd"'>
-		              AND UPPER(G.GOODS_CD) LIKE  CONCAT('%',UPPER(#{condition}),'%')
+		              AND UPPER(G.GOODS_CD) LIKE  CONCAT(UPPER(#{condition}),'%')
 		                      </when>
 		                  </choose>
 		              </if>
@@ -3743,7 +3743,7 @@
 		      <when test='search != null and search == "searchGoodsNm"'>
 		AND (
 		      <foreach collection="conditionList" item="item" index="index" separator="or">
-		       UPPER(G.GOODS_NM) LIKE CONCAT('%',UPPER(#{item}),'%')
+		       UPPER(G.GOODS_NM) LIKE CONCAT(UPPER(#{item}),'%')
 		      </foreach>
 		     )
 		      </when>
@@ -3795,9 +3795,9 @@
 		                           AND B.SELF_YN  = 'Y'
 		                           AND B.USE_YN  = 'Y'
 		INNER JOIN TB_BRAND_SUPPLY S ON B.BRAND_CD = S.BRAND_CD
-		WHERE GOODS_REG_GB IS NULL                                     /* 온라인 미등록 상품 */
+		WHERE NULLIF(GOODS_REG_GB,'') IS NULL                                     /* 온라인 미등록 상품 */
 		<if test="modelNo != null and modelNo != ''">
-		AND UPPER(A.MODEL_NO) LIKE CONCAT('%',UPPER(#{modelNo}),'%') 
+		AND UPPER(A.MODEL_NO) LIKE CONCAT(UPPER(#{modelNo}),'%') 
 		</if>
 		<if test="stDate != null and stDate != ''">
 		AND A.REG_DT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
@@ -3847,9 +3847,9 @@
 		                           AND B.SELF_YN  = 'Y'
 		                           AND B.USE_YN  = 'Y'
 		INNER JOIN TB_BRAND_SUPPLY S ON B.BRAND_CD = S.BRAND_CD
-		WHERE GOODS_REG_GB IS NULL   /* 온라인 미등록 상품 */
+		WHERE NULLIF(GOODS_REG_GB,'') IS NULL   /* 온라인 미등록 상품 */
 		<if test="modelNo != null and modelNo != ''">
-		AND UPPER(A.MODEL_NO) LIKE CONCAT('%',UPPER(#{modelNo}),'%') 
+		AND UPPER(A.MODEL_NO) LIKE CONCAT(UPPER(#{modelNo}),'%') 
 		</if>
 		<if test="stDate != null and stDate != ''">
 		AND A.REG_DT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
@@ -3938,7 +3938,7 @@
 		        <if test="goodsCds != null and goodsCds != ''">
 		        AND    (
 		                <foreach collection="goodsCds" item="item" index="index" separator="or">
-		                UPPER(GOODS_CD) LIKE CONCAT('%',UPPER(#{item}),'%') 
+		                UPPER(GOODS_CD) LIKE CONCAT(UPPER(#{item}),'%') 
 		                </foreach>
 		               )
 		        </if>
@@ -4419,11 +4419,11 @@
 		-- LEFT OUTER JOIN TB_GOODS B ON A.GOODS_CD = B.GOODS_CD
 		WHERE 1 = 1 
 		<if test='condition != null and condition != "" '>
-		AND (UPPER(A.GOODS_NUM) LIKE CONCAT('%',UPPER(#{condition}),'%')
+		AND (UPPER(A.GOODS_NUM) LIKE CONCAT(UPPER(#{condition}),'%')
 		     OR 
-		     UPPER(A.GOODS_CD) LIKE CONCAT('%',UPPER(#{condition}),'%')
+		     UPPER(A.GOODS_CD) LIKE CONCAT(UPPER(#{condition}),'%')
 		     OR 
-		     UPPER(A.SUPPLY_GOODS_CD) LIKE CONCAT('%',UPPER(#{condition}),'%')
+		     UPPER(A.SUPPLY_GOODS_CD) LIKE CONCAT(UPPER(#{condition}),'%')
 		    )
 		</if>
 		<if test='regSuccYn != null and regSuccYn != "" '>

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

@@ -209,7 +209,9 @@
 		    AND A.FRONT_GB IN ('A','M')
 		</if> 
 		AND A.APPLY_GB IN ('A', #{applyGb})
+		<if test="socialSq != null and socialSq != ''">
 		AND A.SOCIAL_SQ != #{socialSq}
+		</if>
 		AND A.SOCIAL_STDT <![CDATA[ <= ]]> DATE_FORMAT(#{socialStdt} , '%Y-%m-%d %H:%i:%S')
 		AND A.SOCIAL_EDDT <![CDATA[ >= ]]> DATE_FORMAT(#{socialStdt} , '%Y-%m-%d %H:%i:%S');
 	</select>

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

@@ -9,28 +9,28 @@
 		              <when test='search != null and search == "searchGoodsCd"'>
 		        AND (
 		              <foreach collection="conditionList" item="item" index="index" separator="or">
-		               UPPER(G.GOODS_CD) LIKE CONCAT('%',UPPER(#{item}),'%') 
+		               UPPER(G.GOODS_CD) LIKE CONCAT(#{item},'%') 
 		              </foreach>
 		             )
 		              </when>
 		              <when test='search != null and search == "searchGoodsNm"'>
 		        AND (
 		              <foreach collection="conditionList" item="item" index="index" separator="or">
-		               UPPER(G.GOODS_NM) LIKE CONCAT('%',UPPER(#{item}),'%')
+		               UPPER(G.GOODS_NM) LIKE CONCAT(#{item},'%')
 		              </foreach>
 		             )
 		              </when>
 		              <when test='search != null and search == "searchGoodsNum"'>
 		        AND (
 		              <foreach collection="conditionList" item="item" index="index" separator="or">
-		               UPPER(G.GOODS_NUM) LIKE CONCAT('%',UPPER(#{item}),'%')
+		               UPPER(G.GOODS_NUM) LIKE CONCAT(#{item},'%')
 		              </foreach>
 		             )
 		              </when>
 		              <when test='search != null and search == "searchSupplyGoodsCd"'>
 		        AND (
 		              <foreach collection="conditionList" item="item" index="index" separator="or">
-		               UPPER(G.SUPPLY_GOODS_CD) LIKE CONCAT('%',UPPER(#{item}),'%')
+		               UPPER(G.SUPPLY_GOODS_CD) LIKE CONCAT(#{item},'%')
 		              </foreach>
 		             )
 		              </when>
@@ -41,15 +41,15 @@
 		        AND 1 = 1
 		              </when>
 		              <otherwise>
-		        AND UPPER(G.REG_ID) LIKE CONCAT('%',UPPER(#{item}),'%')
+		        AND UPPER(G.REG_ID) LIKE CONCAT(#{item},'%')
 		              </otherwise>
 		            </choose>
 		        </if>
 		        <if test="goodsCd != null and goodsCd != ''">
-		        AND UPPER(G.GOODS_CD) LIKE CONCAT('%',UPPER(#{goodsCd}),'%')
+		        AND UPPER(G.GOODS_CD) LIKE CONCAT(#{goodsCd},'%')
 		        </if>
 		         <if test="goodsNm != null and goodsNm != ''">
-		        AND UPPER(G.GOODS_NM) LIKE CONCAT('%',UPPER(#{goodsNm}),'%')
+		        AND UPPER(G.GOODS_NM) LIKE CONCAT(#{goodsNm},'%')
 		        </if>
 		        <if test="goodsType != null and goodsType != ''">
 		        AND G.GOODS_TYPE = #{goodsType}

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

@@ -692,7 +692,7 @@
 			goodsNmList = param2;
 			goodsImgList = param3;
 			// 여기서 부터 시작! 상품불러오는거 똑같이 html 추가해서 체크
-			// +) 저장할때 TMP_CONTENTS_GOODS 에 상품코드, 상품명, 상품이미지경로 추가해서 3개다 불러와서 데이터 뿌릴수 있게
+			// +) 저장할때 TB_CONTENTS_GOODS 에 상품코드, 상품명, 상품이미지경로 추가해서 3개다 불러와서 데이터 뿌릴수 있게
 			$.each(goodsCdList.split(','),function (i){
 				html += '<ul id="goodsUl'+i+'" class="item ui-state-default goodsClass" style="min-height:120px;"> ';
 				goodsImg = goodsImgList.split(',')[i];

src/main/webapp/WEB-INF/views/order/OrderSellerListForm.html

@@ -108,7 +108,7 @@
 			</div>
 		</div>
 
-		<div class="panelStyle">
+		<!--<div class="panelStyle">
 			<ul class="panelBar">
 				<li>
 					<button type="button" class="btn btn-info btn-lg" onclick="cfnDownloadSampleFile('SF020');">입점송장번호등록다운로드</button>
@@ -123,7 +123,7 @@
 			<div class="panelContent" style="overflow: hidden;">
 				<div id="gridList" style="width: 100%; height: 600px;" class="ag-theme-balham lh30"></div>
 			</div>
-		</div>
+		</div>-->
 		
 		<!-- //리스트 영역 -->
 		<label class="off">
@@ -169,19 +169,14 @@ var columnDefs = [
 	{headerName: "수령자상세주소",		field:"recipDtlAddr",		width:120, cellClass: 'text-center'},
 	{headerName: "업체상품코드",		field:"supplyGoodsCd",		width:100, cellClass: 'text-center'},
 	{headerName: "상품코드",			field:"goodsCd",			width:100, cellClass: 'text-center'},
-	{headerName: "상품명",				field:"goodsNm",			width:100, cellClass: 'text-center'},
-	{headerName: "사이즈",				field:"optCd2",				width:100, cellClass: 'text-center'},
+	{headerName: "상품명",			field:"goodsNm",			width:100, cellClass: 'text-center'},
+	{headerName: "사이즈",			field:"optCd2",				width:100, cellClass: 'text-center'},
 	{headerName: "주문수량",			field:"ordQty",				width:100, cellClass: 'text-center'},
+	{headerName: "취소수량",			field:"cnclRtnQty",			width:100, cellClass: 'text-center'},
 	{headerName: "주문금액",			field:"ordAmt",				width:100, cellClass: 'text-center'},
 	{headerName: "할인금액",			field:"totDcAmt",			width:100, cellClass: 'text-center'},
-	{headerName: "실결제금액",			field:"realOrdAmt",			width:100, cellClass: 'text-center'},
+	{headerName: "실결제금액",		field:"realOrdAmt",			width:100, cellClass: 'text-center'},
 	{headerName: "배송업체",			field:"shipCompCd",			width:150, cellClass: 'text-left'
-		, editable 			: true
-		, cellEditor		: 'agRichSelectCellEditor'
-		, cellStyle			: {color: '#fffff', 'background-color': '#aaaaff'}
-		, cellEditorParams	: {
-			values: gagaAgGrid.extractValues(shipCompanyList)
-		}
 		, valueFormatter: function (params) {
 			return gagaAgGrid.lookupValue(shipCompanyList, params.value);
 		}
@@ -189,8 +184,7 @@ var columnDefs = [
 			return gagaAgGrid.lookupKey(shipCompanyList, params.newValue);
 		}
 	},
-	{headerName: "송장",				field:"invoiceNo",			width:150, cellClass: 'text-left', editable : true
-		, cellStyle			: {color: '#fffff', 'background-color': '#aaaaff'}	}
+	{headerName: "송장",				field:"invoiceNo",			width:150, cellClass: 'text-left'}
 ];
 
 var gridOptions = gagaAgGrid.getGridOptions(columnDefs);