wms 브랜드/업체정보송신

style24.batch/src/main/java/com/style24/batch/biz/dao/TsbWmsGoodsDao.java

@@ -2,7 +2,7 @@ package com.style24.batch.biz.dao;
 
 import java.util.Collection;
 
-import com.style24.core.support.annotation.ShopDs;
+import com.style24.core.support.annotation.WmsDs;
 import com.style24.persistence.domain.GoodsIfIncomelot;
 import com.style24.persistence.domain.GoodsIfIncomelotitem;
 import com.style24.persistence.domain.GoodsIfMeasurement;
@@ -15,7 +15,7 @@ import com.style24.persistence.domain.IfProvider;
  * @author eskim
  * @since 2021. 01. 01
  */
-@ShopDs
+@WmsDs
 public interface TsbWmsGoodsDao {
 
 	/**

style24.batch/src/main/java/com/style24/batch/biz/service/TsbGoodsService.java

@@ -367,7 +367,7 @@ public class TsbGoodsService {
 	}
 
 	/**
-	 * WMS 입고정보 연용
+	 * WMS 입고정보 연동
 	 *
 	 * @return
 	 * @author eskim

style24.batch/src/main/java/com/style24/batch/biz/service/TsbWmsGoodsService.java

@@ -67,8 +67,8 @@ public class TsbWmsGoodsService {
 	 * @author eskim
 	 * @since 2021. 01. 05
 	 */
+	//@Transactional("wmsTxnManager")
 	public void saveWmsProvider(IfProvider ifProvider) {
-		//브랜드 정보 송신
 		wmsGoodsDao.saveWmsProvider(ifProvider);
 	}
 

style24.batch/src/main/java/com/style24/batch/biz/task/TsbGoodsTask.java

@@ -161,7 +161,7 @@ public class TsbGoodsTask {
 	 * @throws Exception
 	 */
 	@Scheduled(cron = "${cron.goods.infants.safe}")
-	@Scheduled(fixedDelay = 3500000)
+	//@Scheduled(fixedDelay = 3500000)
 	@Async
 	public void tsbGoodsInfantsSafeNoJob() throws Exception {
 		goodsInfantsSafeNoJob.run("cron.goods.infants.safe");
@@ -197,7 +197,7 @@ public class TsbGoodsTask {
 	 * @throws Exception
 	 */
 	@Scheduled(cron = "${cron.goods.wms.brandprovider}")
-	//@Scheduled(fixedDelay = 3500000)
+	@Scheduled(fixedDelay = 3500000)
 	@Async
 	public void tsbGoodsWmsBrandproviderJob() throws Exception {
 		goodsWmsBrandproviderJob.runById("cron.goods.wms.brandprovider");

style24.batch/src/main/java/com/style24/persistence/domain/IfBrand.java

@@ -19,7 +19,7 @@ public class IfBrand extends TscBaseDomain {
 	private String datecreated;         //생성일
 	private String statuscd;            //상태
 	private String brandCd;             //브랜드코드
-	private String dateUpdated;         //수정일
+	private String dateupdateed;        //수정일
 
 	private String supplyCompCd;       //업체코드
 	private int providerNo;            //공급처번호

style24.batch/src/main/java/com/style24/persistence/domain/IfProvider.java

@@ -15,6 +15,7 @@ import lombok.Data;
 public class IfProvider extends TscBaseDomain {
 
 	private Integer providerno;		//공급처번호
+	private int vendorno;			//벤더번호 --- 대체값 확인
 	private String providername;	//공급저명
 	private String categorytypecd;	//분류코드
 	private String distributioncd;	//유통구분

style24.batch/src/main/java/com/style24/persistence/mybatis/shop/TsbCommon.xml

@@ -2,12 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.style24.batch.biz.dao.TsbCommonDao">
 	
-	<!-- 시퀀스 값 조회 -->
-	<select id="getNextSequence" parameterType="String" resultType="String">
-		/* TsbCommon.getNextSequence */
-		SELECT ${value}.NEXTVAL AS SQ
-		FROM   DUAL
-	</select>
 	
 	<!-- WMS 연동 여부 -->
 	<select id="getWmsSyncYn" resultType="String">
@@ -18,47 +12,4 @@
 		AND CD = 'WMSSYNCYN'
 	</select>
 	
-	<!-- 기본답변문구 조회 -->
-	<select id="getBasicAnswer" parameterType="TsbBasicAnswer" resultType="TsbBasicAnswer">
-		/* TsbCommon.getBasicAnswer */
-		SELECT ANS_TITLE   --답변제목
-		     , ANS_CONTENT --답변내용
-		FROM   TB_BASIC_ANS
-		WHERE   USE_YN = 'Y'
-		<if test="ansSq != null and ansSq != ''">
-		AND     ANS_SQ = #{ansSq}
-		</if>
-		<if test="kkoCd != null and kkoCd != ''">
-		AND     KKO_CD = #{kkoCd}
-		</if>
-	</select>
-
-	<select id="getCommonCodeList" parameterType="TsbCommonCode" resultType="TsbCommonCode">
-		/* TsbCommon.getCommonCodeList */
-		SELECT CD
-		, CD_NM
-		FROM   TB_COMMON_CODE
-		WHERE  1 = 1
-		<if test="useYn != null and useYn != ''">
-			AND    USE_YN = #{useYn}
-		</if>
-		AND    CD_GB = #{cdGb}
-		<if test="cd != null and cd != ''">
-			AND    CD = #{cd}
-		</if>
-		<if test="cdNm != null and cdNm != ''">
-			AND    CD_NM = #{cdNm}
-		</if>
-		<if test="cdDesc != null and cdDesc != ''">
-			AND    CD_DESC = #{cdDesc}
-		</if>
-		<if test="exceptCds != null and exceptCds != ''">
-			AND    CD NOT IN
-			<foreach collection="exceptCds" item="item" index="index"  open="(" close=")" separator=",">
-				#{item}
-			</foreach>
-		</if>
-		ORDER  BY CD_GB, DISP_ORD
-	</select>
-	
 </mapper>

style24.batch/src/main/java/com/style24/persistence/mybatis/wms/TsbWmsGoods.xml

@@ -83,6 +83,7 @@
 	<!--WMS 업체정보 송신-->
 	<insert id="saveWmsProvider" parameterType="IfProvider" >
 		/* TsbWmsGoods.saveWmsProvider */
+		SET IDENTITY_INSERT test.dbo.TB_IF_Provider ON
 		MERGE TB_IF_PROVIDER 
 		      USING (SELECT 'AA' AS DUAL) AS B
 		         ON (PROVIDERNO = #{providerno})
@@ -100,6 +101,7 @@
 		      WHEN NOT MATCHED THEN
 		           INSERT (
 		                   PROVIDERNO
+		                 , VENDORNO  
 		                 , PROVIDERNAME
 		                 , CATEGORYTYPECD
 		                 , DISTRIBUTIONCD
@@ -113,6 +115,7 @@
 		           )
 		           VALUES (
 		                  #{providerno}
+		                , #{vendorno}
 		                , #{providername}
 		                , #{categorytypecd}
 		                , #{distributioncd}
@@ -123,12 +126,14 @@
 		                , #{dateLastmodified}
 		                , GETDATE()
 		                , GETDATE()
-		           )
+		           );
+		SET IDENTITY_INSERT test.dbo.TB_IF_Provider OFF
 	</insert>
 	
 	<!--WMS 브랜드정보 송신-->
 	<insert id="saveWmsBrand" parameterType="IfBrand" >
 		/* TsbWmsGoods.saveWmsBrand */
+		SET IDENTITY_INSERT test.dbo.TB_IF_BRAND ON
 		MERGE TB_IF_BRAND 
 		      USING (SELECT 'AA' AS DUAL) AS B
 		         ON (BRANDNO = #{brandno})
@@ -137,7 +142,7 @@
 		                   BRANDNAME = #{brandname}
 		                 , STATUSCD = #{statuscd}
 		                 , BRAND_CD = #{brandCd}
-		                 , DATEUPDATED = GETDATE()
+		                 , DATEUPDATEED = GETDATE()
 		      WHEN NOT MATCHED THEN
 		           INSERT (
 		                   BRANDNO
@@ -145,7 +150,7 @@
 		                 , STATUSCD
 		                 , BRAND_CD
 		                 , DATECREATED
-		                 , DATEUPDATED
+		                 , DATEUPDATEED
 		           )
 		           VALUES (
 		                  #{brandno}
@@ -154,7 +159,8 @@
 		                , #{brandCd}
 		                , GETDATE()
 		                , GETDATE()
-		           )
+		           );
+		SET IDENTITY_INSERT test.dbo.TB_IF_BRAND OFF
 	</insert>
 	
 	<!--WMS 브랜드업체관계정보 송신-->
@@ -168,7 +174,7 @@
 		                   PROVIDERNO = #{providerNo}
 		                 , BRAND_CD = #{brandCd}
 		                 , SUPPLY_COMP_CD = #{supplyCompCd}
-		                 , DATEUPDATED = GETDATE()
+		                 , DATEUPDATEED = GETDATE()
 		      WHEN NOT MATCHED THEN
 		           INSERT (
 		                   BRANDNO
@@ -176,7 +182,7 @@
 		                 , BRAND_CD
 		                 , SUPPLY_COMP_CD
 		                 , DATECREATED
-		                 , DATEUPDATED
+		                 , DATEUPDATEED
 		           )
 		           VALUES (
 		                  #{brandno}
@@ -185,7 +191,7 @@
 		                , #{supplyCompCd}
 		                , GETDATE()
 		                , GETDATE()
-		           )
+		           );
 	</insert>
 	
 </mapper>

style24.batch/src/main/resources/config/application-locd.yml

@@ -49,6 +49,9 @@ cron:
         relate.score: 2 22 2 29 2 ?
         summary: 2 22 2 29 2 ?
         infants.safe: 2 22 2 29 2 ?
+        wms.measurement: 2 22 2 29 2 ?
+        wms.incomelot: 2 22 2 29 2 ?
+        wms.brandprovider: 2 22 2 29 2 ?
     
     #통계
     statistics: