상품 코드 생성 규칙 수정

src/main/java/com/style24/admin/biz/dao/TsaGoodsDao.java

@@ -1087,6 +1087,14 @@ public interface TsaGoodsDao {
 	 * @since 2021. 01. 05
 	 */
 	public void saveGoodsWmsIncomelot(WmsGoods wmsGoods);
+	
+	/**
+	 *  WMS 입고상품  상품 구분 저장
+	 * @param wmsGoods
+	 * @author eskim
+	 * @since 2021. 07. 07
+	 */
+	public void saveGoodsWmsIncomelotByModelNo(WmsGoods wmsGoods);
 
 	/**
 	 * 고시분류별 상품고시정보 목록

src/main/java/com/style24/admin/biz/service/TsaGoodsService.java

@@ -3847,13 +3847,7 @@ public class TsaGoodsService {
 		goods.setGoodsNum(goods.getGoodsCd());
 		// 입점상품코드
 		goods.setSupplyGoodsCd(goods.getGoodsCd());
-		// 정상가
-		goods.setListPrice(0);	// 기본처리
-		// 판매가
-		goods.setCurrPrice(0);	// 기본처리
-		// 원가
-		goods.setCostPrice(0);	// 기본처리	
-
+	
 		// 판매수수료율
 		SupplyCompany supplyCompany = new SupplyCompany();
 		supplyCompany.setSupplyCompCd(goods.getSupplyCompCd());
@@ -3903,7 +3897,7 @@ public class TsaGoodsService {
 		wmsGoods.setGoodsRegGb("G"); // G: 상품, F: 사은품
 		wmsGoods.setModelNo(goods.getGoodsCd());
 
-		goodsDao.saveGoodsWmsIncomelot(wmsGoods); // wms 상품 상품등록일 변경
+		goodsDao.saveGoodsWmsIncomelotByModelNo(wmsGoods); // wms 상품 상품등록일 변경
 
 		// 사용자 검색어를 검색어에 적용
 		String goodsSnm = goodsDao.getGoodsSnm(goods.getGoodsCd());

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

@@ -3252,7 +3252,7 @@ public class TsaGoodsController extends TsaBaseController {
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-		log.info("goods11111 = {}", goods);
+		
 		goods.setNotiListNew(notiList);
 
 		goodsService.createSalfGoodsDetail(goods);

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

@@ -3903,6 +3903,17 @@
 		WHERE PRODUCT_NO = #{productNo}
 	</update>
 	
+	<!-- WMS 입고상품 상품 구분 저장 -->
+	<update id="saveGoodsWmsIncomelotByModelNo" parameterType="WmsGoods">
+		/* TsaGoods.saveGoodsWmsIncomelotByModelNo */
+		UPDATE TB_WMS_GOODS
+		SET GOODS_REG_GB = #{goodsRegGb} /* G: 상품, F: 사은품*/
+		  , GOODS_REG_DT = NOW()
+		  , UPD_NO = #{updNo}
+		  , UPD_DT = NOW()
+		WHERE MODEL_NO = #{modelNo}
+	</update>
+	
 	<!-- 고시분류별 상품고시정보 목록 -->
 	<select id="getGoodsNotiInfoListByNotiClsf" parameterType="GoodsNotiInfo" resultType="GoodsNotiInfo">
 		/* TsaGoods.getGoodsNotiInfoListByNotiClsf */
@@ -4724,7 +4735,7 @@
 		          ,B.TOTALQTY
 		          ,B.SKUMODELNO
 		          , (CASE WHEN INSTR(REPLACE(B.SKUMODELNO, ' ' , ''), 'F20') = 1 THEN LEFT(REPLACE(B.SKUMODELNO, ' ' , ''),12)
-		                  WHEN INSTR(REPLACE(B.SKUMODELNO, ' ' , ''), '-') > 0 THEN LEFT(REPLACE(B.SKUMODELNO, ' ' , ''),11)
+		                  WHEN INSTR(REPLACE(B.SKUMODELNO, ' ' , ''), '-') > 0 AND INSTR(REPLACE(B.SKUMODELNO, ' ' , ''), '-') <![CDATA[<]]> 10 THEN LEFT(REPLACE(B.SKUMODELNO, ' ' , ''),11)
 		                  ELSE LEFT(REPLACE(B.SKUMODELNO, ' ' , ''),10) END) AS GOODS_CD
 		          FROM TB_IF_INCOMELOT A
 		          INNER JOIN TB_IF_INCOMELOTITEM B ON A.LOTNO = B.LOTNO
@@ -4773,7 +4784,7 @@
 		                ,B.TOTALQTY
 		                ,B.SKUMODELNO
 		                , (CASE WHEN INSTR(REPLACE(B.SKUMODELNO, ' ' , ''), 'F20') = 1 THEN LEFT(REPLACE(B.SKUMODELNO, ' ' , ''),12)
-		                        WHEN INSTR(REPLACE(B.SKUMODELNO, ' ' , ''), '-') > 0 THEN LEFT(REPLACE(B.SKUMODELNO, ' ' , ''),11)
+		                        WHEN INSTR(REPLACE(B.SKUMODELNO, ' ' , ''), '-') > 0 AND INSTR(REPLACE(B.SKUMODELNO, ' ' , ''), '-') <![CDATA[<]]> 10THEN LEFT(REPLACE(B.SKUMODELNO, ' ' , ''),11)
 		                        ELSE LEFT(REPLACE(B.SKUMODELNO, ' ' , ''),10) END) AS GOODS_CD
 		                FROM TB_IF_INCOMELOT A
 		                INNER JOIN TB_IF_INCOMELOTITEM B ON A.LOTNO = B.LOTNO

src/main/java/com/style24/persistence/mybatis/wms/TsaWmsGoods.xml

@@ -26,16 +26,14 @@
 		           , SUM(B.PICKING_QTY)      AS PICKING_QTY
 		           , SUM(B.EOUT_PICKING_QTY) AS EOUT_PICKING_QTY
 		           , MAX(CASE WHEN CHARINDEX('F20', REPLACE(A.SKUMODELNO, ' ', '')) = 1 THEN SUBSTRING(REPLACE(A.SKUMODELNO, ' ' , ''),13,2)
-		                      WHEN CHARINDEX('-', REPLACE(A.SKUMODELNO, ' ', '')) > 0 THEN SUBSTRING(REPLACE(A.SKUMODELNO, ' ' , ''),12,2)
+		                      WHEN CHARINDEX('-', REPLACE(A.SKUMODELNO, ' ', '')) > 0 AND CHARINDEX(REPLACE(A.SKUMODELNO, ' ' , ''), '-') <![CDATA[<]]> 10 THEN SUBSTRING(REPLACE(A.SKUMODELNO, ' ' , ''),12,2)
 		                      ELSE SUBSTRING(REPLACE(A.SKUMODELNO, ' ' , ''),11,2) END) AS WMS_COLOR_CD
 		      FROM ISTYLE24_WMSIF.DBO.TB_IF_PRODUCTSKU A
 		               INNER JOIN ISTYLE24_WMS.DBO.VW_STOCK_BY_LOCCODE B ON A.SKUCODE = B.SKU_CODE
 		      WHERE 1 = 1
 		      AND (CASE
-		               WHEN CHARINDEX('F20', REPLACE(A.SKUMODELNO, ' ', '')) = 1
-		                   THEN LEFT(REPLACE(A.SKUMODELNO, ' ', ''), 12)
-		               WHEN CHARINDEX('-', REPLACE(A.SKUMODELNO, ' ', '')) > 0
-		                   THEN LEFT(REPLACE(A.SKUMODELNO, ' ', ''), 11)
+		               WHEN CHARINDEX('F20', REPLACE(A.SKUMODELNO, ' ', '')) = 1 THEN LEFT(REPLACE(A.SKUMODELNO, ' ', ''), 12)
+		               WHEN CHARINDEX('-', REPLACE(A.SKUMODELNO, ' ', '')) > 0 AND CHARINDEX(REPLACE(A.SKUMODELNO, ' ' , ''), '-') <![CDATA[<]]> 10 THEN LEFT(REPLACE(A.SKUMODELNO, ' ', ''), 11)
 		               ELSE LEFT(REPLACE(A.SKUMODELNO, ' ', ''), 10) END) = #{goodsCd}
 		      GROUP BY A.SKUCODE, A.SKUMODELNO, A.OPTION1, A.OPTION2, A.PRODUCTNO, A.PRODUCTCODE
 		     ) Z