TB_GOODS product_No, product_Code 삭제

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

@@ -16,8 +16,8 @@ import lombok.Data;
 public class Goods extends TscBaseDomain {
 
 	private String goodsCd;		//상품코드
-	private int productNo;		//ProductNo(WMS)
-	private String productCode;		//ProductCode(WMS)
+//	private int productNo;		//ProductNo(WMS)
+//	private String productCode;		//ProductCode(WMS)
 	private String brandCd;		//브랜드코드
 	private String itemkindCd;		//품목코드
 	private String goodsNm;		//상품명

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

@@ -25,6 +25,6 @@ public class GoodsIfIncomelotitem extends TscBaseDomain {
 	private int normalqty;	//일반수량
 	private int brokenqty;	//불량수량
 	private int totalqty;	//총수량
-	private String modelno;	//모델번호
+	private String skumodelno;	//모델번호
 
 }

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

@@ -7,8 +7,6 @@
 		/* TsbGoods.createGoodsHst */
 		INSERT INTO TB_GOODS_HST 
 		(       GOODS_CD
-		      , PRODUCT_NO
-		      , PRODUCT_CODE
 		      , BRAND_CD
 		      , ITEMKIND_CD
 		      , GOODS_NM
@@ -64,8 +62,6 @@
 		      , UPD_DT
 		)
 		SELECT GOODS_CD            
-		     , PRODUCT_NO
-		     , PRODUCT_CODE
 		     , BRAND_CD            
 		     , ITEMKIND_CD         
 		     , GOODS_NM            
@@ -1244,7 +1240,7 @@
 		     , NORMALQTY
 		     , BROKENQTY
 		     , TOTALQTY
-		     , MODELNO
+		     , SKUMODELNO
 		     , UPD_DT
 		)
 		VALUES (
@@ -1259,7 +1255,7 @@
 		     , #{normalqty}
 		     , #{brokenqty}
 		     , #{totalqty}
-		     , #{modelno}
+		     , #{skumodelno}
 		     , NOW()
 		)
 		ON DUPLICATE KEY UPDATE
@@ -1272,7 +1268,7 @@
 		     , NORMALQTY = #{normalqty}
 		     , BROKENQTY = #{brokenqty}
 		     , TOTALQTY = #{totalqty}
-		     , MODELNO = #{modelno}
+		     , SKUMODELNO = #{skumodelno}
 		     , UPD_DT = NOW()
 	</insert>
 	
@@ -1293,8 +1289,8 @@
 		     , UPD_NO
 		     , UPD_DT 
 		)
-		SELECT Z.PRODUCTNO 
-		     , Z.PRODUCTCODE 
+		SELECT Z.PRODUCTNO
+		     , Z.PRODUCTCODE
 		     , Z.PRODUCTNAME 
 		     , Z.MODELNO 
 		     , Z.PROVIDERNO
@@ -1309,14 +1305,14 @@
 		      SELECT B.PRODUCTNO 
 		           , B.PRODUCTCODE 
 		           , MAX(B.PRODUCTNAME) AS PRODUCTNAME
-		           , MAX(CASE WHEN INSTR(B.MODELNO, '-') >= 0 THEN LEFT(B.MODELNO,11)
-		                    ELSE LEFT(B.MODELNO,10) END) AS MODELNO 
+		           , MAX(CASE WHEN INSTR(B.SKUMODELNO, '-') >= 0 THEN LEFT(B.SKUMODELNO,11)
+		                    ELSE LEFT(B.SKUMODELNO,10) END) AS MODELNO 
 		           , MAX(A.PROVIDERNO) AS PROVIDERNO
 		           , MAX(A.PROVIDERNAME) AS PROVIDERNAME
 		           , MAX(A.BRANDNO) AS BRANDNO
 		           , MAX(A.BRANDNAME) AS BRANDNAME 
 		      FROM TB_IF_INCOMELOT  A
-		      INNER JOIN TB_IF_INCOMELOTITEM B ON A.LOTNO = B.LOTNO 
+		      INNER JOIN TB_IF_INCOMELOTITEM B ON A.LOTNO = B.LOTNO
 		      WHERE 1 = 1
 		      <choose>
 		          <when test='jobdate != null and jobdate != ""'>
@@ -1336,66 +1332,10 @@
 		) Z
 		WHERE NOT EXISTS (SELECT 1 
 		                FROM TB_WMS_GOODS
-		                WHERE PRODUCT_NO = Z.PRODUCTNO
+		                WHERE MODEL_NO = Z.MODELNO /* 같은모델번호에 PRODUCT_NO 여러개 존재*/
 		                )
 	</insert>
 	
-	<!--WMS 상품 저장-->
-	<insert id="saveWmsGoods_ORG" parameterType="GoodsIfIncomelot" >
-		/* TsbGoods.saveWmsGoods_ORG */
-		INSERT INTO TB_WMS_GOODS (
-		       PRODUCT_NO 
-		     , PRODUCT_CODE 
-		     , PRODUCT_NAME 
-		     , MODEL_NO 
-		     , PROVIDER_NO
-		     , PROVIDER_NAME
-		     , BRAND_NO
-		     , BRAND_NAME
-		     , REG_NO
-		     , REG_DT
-		     , UPD_NO
-		     , UPD_DT 
-		)
-		SELECT B.PRODUCTNO 
-		     , B.PRODUCTCODE 
-		     , B.PRODUCTNAME 
-		     , LEFT(B.MODELNO,10) AS MODELNO 
-		     , A.PROVIDERNO
-		     , A.PROVIDERNAME
-		     , A.BRANDNO
-		     , A.BRANDNAME 
-		     , #{regNo}
-		     , NOW()
-		     , #{updNo}
-		     , NOW()
-		FROM TB_IF_INCOMELOT  A
-		INNER JOIN TB_IF_INCOMELOTITEM B ON A.LOTNO = B.LOTNO 
-		WHERE 1 = 1
-		<choose>
-		    <when test='jobdate != null and jobdate != ""'>
-		AND A.DATEINCOME >= DATE_FORMAT(DATE_FORMAT(#{jobdate}, '%Y%m%d'), '%Y%m%d%H%i%S') 
-		<![CDATA[
-		AND A.DATEINCOME < DATE_FORMAT(DATE_ADD(DATE_FORMAT(#{jobdate}, '%Y%m%d'), INTERVAL 1 DAY), '%Y%m%d%H%i%S')
-		]]>
-		    </when>
-		    <otherwise>
-		AND A.DATEINCOME >= DATE_FORMAT(DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -1 DAY), '%Y%m%d'), '%Y%m%d%H%i%S') 
-		<![CDATA[
-		AND A.DATEINCOME < DATE_FORMAT(DATE_ADD(DATE_FORMAT(NOW(), '%Y%m%d'), INTERVAL 1 DAY), '%Y%m%d%H%i%S')
-		]]>
-		    </otherwise>
-		</choose>
-		ON DUPLICATE KEY UPDATE
-		       PRODUCT_NAME = IF(GOODS_REG_GB IS NULL, B.PRODUCTNAME, TB_WMS_GOODS.PRODUCT_NAME)
-		     , MODEL_NO = IF(GOODS_REG_GB IS NULL, B.MODELNO, TB_WMS_GOODS.MODEL_NO)
-		     , PROVIDER_NO = IF(GOODS_REG_GB IS NULL, A.PROVIDERNO, TB_WMS_GOODS.PROVIDER_NO)
-		     , PROVIDER_NAME = IF(GOODS_REG_GB IS NULL, A.PROVIDERNAME, TB_WMS_GOODS.PROVIDER_NAME)
-		     , BRAND_NO = IF(GOODS_REG_GB IS NULL, A.BRANDNO, TB_WMS_GOODS.BRAND_NO)
-		     , BRAND_NAME = IF(GOODS_REG_GB IS NULL, A.BRANDNAME, TB_WMS_GOODS.BRAND_NAME)
-		     , UPD_NO = #{updNo}
-		     , UPD_DT = NOW()
-	</insert>
 	
 	<!-- 공급업체 목록 -->
 	<select id="getSupplyCompanyList" resultType="IfProvider">
@@ -1456,8 +1396,8 @@
 	<!-- 상품 목록 -->
 	<select id="getGoodsList" resultType="IfProduct">
 		/* TsbGoods.getGoodsList */
-		SELECT G.PRODUCT_NO AS PRODUCTNO
-		     , G.PRODUCT_CODE AS PRODUCTCODE
+		SELECT A.PRODUCT_NO AS PRODUCTNO
+		     , A.PRODUCT_CODE AS PRODUCTCODE
 		     , G.GOODS_NM AS PRODUCTNAME
 		     , B.BRAND_NO AS BRANDNO
 		     , B.BRAND_ENM AS BRANDNAME
@@ -1475,13 +1415,23 @@
 		     , G.SUPPLY_COMP_CD
 		     , (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG  WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = G.MAIN_COLOR_CD AND DEFAULT_IMG_YN = 'Y' ) AS SYS_IMG_NM
 		FROM   TB_GOODS G
+		INNER JOIN TB_OPTION A ON G.GOODS_CD = A.GOODS_CD
 		INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
-		INNER JOIN TB_SUPPLY_COMPANY C ON G.SUPPLY_COMP_CD = B.SUPPLY_COMP_CD
+		INNER JOIN TB_SUPPLY_COMPANY C ON G.SUPPLY_COMP_CD = C.SUPPLY_COMP_CD
 		WHERE  G.SELF_GOODS_YN  = 'Y'  /* 자사 */
-		AND G.UPD_DT >= DATE_FORMAT(DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -1 DAY), '%Y%m%d'), '%Y%m%d%H%i%S') 
-		<![CDATA[
-		AND G.UPD_DT < DATE_FORMAT(DATE_FORMAT(NOW(), '%Y%m%d'), '%Y%m%d%H%i%S')
-		]]>
+		AND (G.UPD_DT >= DATE_FORMAT(DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -1 DAY), '%Y%m%d'), '%Y%m%d%H%i%S') 
+		     <![CDATA[
+		     AND G.UPD_DT < DATE_FORMAT(DATE_FORMAT(NOW(), '%Y%m%d'), '%Y%m%d%H%i%S')
+		     ]]>
+		    ) OR
+		    ((SELECT COUNT(1) 
+		     FROM TB_GOODS_IMG
+		     WHERE GOODS_CD = G.GOODS_CD
+		     AND REG_DT >= DATE_FORMAT(DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -1 DAY), '%Y%m%d'), '%Y%m%d%H%i%S') 
+		     <![CDATA[ 
+		     AND REG_DT < DATE_FORMAT(DATE_FORMAT(NOW(), '%Y%m%d'), '%Y%m%d%H%i%S')
+		     ]]>
+		    ) > 0)
 	</select>
 	
 	<!-- TB_IF_PRODUCTSKU 삭제 -->