WMS 관련 수정

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

@@ -1088,7 +1088,7 @@
 		     , USERLASTMODIFIED
 		     , UPD_DT
 		)
-		(
+		VALUES(
 		       #{skucode}
 		     , #{productno}
 		     , #{productcode}
@@ -1100,8 +1100,8 @@
 		     , NVL(#{value4},0)
 		     , NVL(#{value5},0)
 		     , #{memo}
-		     , CONVERT(VARCHAR,#{dateinserted},20)  /* yyyy-mm-dd hh:mi:ss */
-		     , CONVERT(VARCHAR,#{datelastmodified},20) 
+		     , DATE_FORMAT(#{dateinserted}, '%Y-%m-%d %H:%i:%S')
+		     , DATE_FORMAT(#{datelastmodified}, '%Y-%m-%d %H:%i:%S')
 		     , NVL(#{isuse},'1')
 		     , #{userlastmodified}
 		     , NOW()
@@ -1114,15 +1114,15 @@
 		     , VALUE4 = NVL(#{value4},0)
 		     , VALUE5 = NVL(#{value5},0)
 		     , MEMO = #{memo}
-		     , DATEINSERTED = CONVERT(VARCHAR,#{dateinserted},20)  /* yyyy-mm-dd hh:mi:ss */
-		     , DATELASTMODIFIED = CONVERT(VARCHAR,#{datelastmodified},20) 
+		     , DATEINSERTED = DATE_FORMAT(#{dateinserted}, '%Y-%m-%d %H:%i:%S')
+		     , DATELASTMODIFIED = DATE_FORMAT(#{datelastmodified}, '%Y-%m-%d %H:%i:%S')
 		     , ISUSE = NVL(#{isuse},'1')
 		     , USERLASTMODIFIED = #{userlastmodified}
 		     , UPD_DT = NOW()
 	</insert>
 	
 	<!--입고 저장-->
-	<insert id="saveGoodsIfIncomelot" parameterType="GoodsIfMeasurement">
+	<insert id="saveGoodsIfIncomelot" parameterType="GoodsIfIncomelot">
 		/* TsbGoods.saveGoodsIfIncomelot */
 		INSERT INTO TB_IF_INCOMELOT (
 		       LOTNO
@@ -1134,14 +1134,14 @@
 		     , DATEINCOME
 		     , UPD_DT
 		)
-		(
+		VALUES (
 		       #{lotno}
 		     , #{purchaseno}
 		     , #{providerno}
 		     , #{providername}
 		     , #{brandno}
 		     , #{brandname}
-		     , CONVERT(VARCHAR,#{dateincome},20)  /* yyyy-mm-dd hh:mi:ss */
+		     , DATE_FORMAT(#{dateincome}, '%Y-%m-%d %H:%i:%S')
 		     , NOW()
 		)
 		ON DUPLICATE KEY UPDATE
@@ -1150,12 +1150,12 @@
 		     , PROVIDERNAME = #{providername}
 		     , BRANDNO = #{brandno}
 		     , BRANDNAME = #{brandname}
-		     , DATEINCOME = CONVERT(VARCHAR,#{dateincome},20)
+		     , DATEINCOME = DATE_FORMAT(#{dateincome}, '%Y-%m-%d %H:%i:%S')
 		     , UPD_DT = NOW()
 	</insert>
 	
 	<!--입고상품 저장-->
-	<insert id="saveGoodsIfIncomelotitem" parameterType="GoodsIfMeasurement">
+	<insert id="saveGoodsIfIncomelotitem" parameterType="GoodsIfIncomelotitem">
 		/* TsbGoods.saveGoodsIfIncomelotitem */
 		INSERT INTO TB_IF_INCOMELOTITEM (
 		       LOTNO
@@ -1172,11 +1172,11 @@
 		     , MODELNO
 		     , UPD_DT
 		)
-		(
+		VALUES (
 		       #{lotno}
 		     , #{itemno}
 		     , #{wmsitemno}
-		     , CONVERT(VARCHAR,#{dateincome},20)  /* yyyy-mm-dd hh:mi:ss */
+		     , DATE_FORMAT(#{dateincome}, '%Y-%m-%d %H:%i:%S')
 		     , #{productno}
 		     , #{productcode}
 		     , #{productname}
@@ -1189,7 +1189,7 @@
 		)
 		ON DUPLICATE KEY UPDATE
 		       WMSITEMNO = #{wmsitemno}
-		     , DATEINCOME = CONVERT(VARCHAR,#{dateincome},20)
+		     , DATEINCOME = DATE_FORMAT(#{dateincome}, '%Y-%m-%d %H:%i:%S')
 		     , PRODUCTNO = #{productno}
 		     , PRODUCTCODE = #{productcode}
 		     , PRODUCTNAME = #{productname}
@@ -1205,18 +1205,18 @@
 	<insert id="saveWmsGoods" parameterType="GoodsIfIncomelot" >
 		/* TsbGoods.saveWmsGoods */
 		INSERT INTO TB_WMS_GOODS (
-		       PRODUCTNO 
-		     , PRODUCTCODE 
-		     , PRODUCTNAME 
+		       PRODUCT_NO 
+		     , PRODUCT_CODE 
+		     , PRODUCT_NAME 
 		     , SKUCODE 
-		     , NORMALQTY 
-		     , BROKENQTY 
-		     , TOTALQTY 
-		     , MODELNO 
-		     , PROVIDERNO
-		     , PROVIDERNAME
-		     , BRANDNO
-		     , BRANDNAME
+		     , NORMAL_QTY 
+		     , BROKEN_QTY 
+		     , TOTAL_QTY 
+		     , MODEL_NO 
+		     , PROVIDER_NO
+		     , PROVIDER_NAME
+		     , BRAND_NO
+		     , BRAND_NAME
 		     , REG_NO
 		     , REG_DT
 		     , UPD_NO
@@ -1243,28 +1243,28 @@
 		WHERE 1 = 1
 		<choose>
 		    <when test='jobdate != null and jobdate != ""'>
-		AND A.UPD_DT >= DATE_FORMAT(DATE_FORMAT(#{jobdate}, '%Y%m%d'), '%Y%m%d%H%i%S') 
+		AND A.DATEINCOME >= DATE_FORMAT(DATE_FORMAT(#{jobdate}, '%Y%m%d'), '%Y%m%d%H%i%S') 
 		<![CDATA[
-		AND A.UPD_DT < DATE_FORMAT(DATE_ADD(DATE_FORMAT(#{jobdate}, '%Y%m%d'), INTERVAL 1 DAY), '%Y%m%d%H%i%S')
+		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.UPD_DT >= DATE_FORMAT(DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -1 DAY), '%Y%m%d'), '%Y%m%d%H%i%S') 
+		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.UPD_DT < DATE_FORMAT(DATE_ADD(DATE_FORMAT(NOW(), '%Y%m%d'), INTERVAL 1 DAY), '%Y%m%d%H%i%S')
+		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
-		       PRODUCTNAME = IF(GOODS_REG_GB IS NULL, B.PRODUCTNAME, TB_WMS_GOODS.PRODUCTNAME)
-		     , NORMALQTY = IF(GOODS_REG_GB IS NULL, B.NORMALQTY, TB_WMS_GOODS.NORMALQTY)
-		     , BROKENQTY = IF(GOODS_REG_GB IS NULL, B.BROKENQTY, TB_WMS_GOODS.BROKENQTY)
-		     , TOTALQTY = IF(GOODS_REG_GB IS NULL, B.TOTALQTY, TB_WMS_GOODS.TOTALQTY)
-		     , MODELNO = IF(GOODS_REG_GB IS NULL, B.MODELNO, TB_WMS_GOODS.MODELNO)
-		     , PROVIDERNO = IF(GOODS_REG_GB IS NULL, A.PROVIDERNO, TB_WMS_GOODS.PROVIDERNO)
-		     , PROVIDERNAME = IF(GOODS_REG_GB IS NULL, A.PROVIDERNAME, TB_WMS_GOODS.PROVIDERNAME)
-		     , BRANDNO = IF(GOODS_REG_GB IS NULL, A.BRANDNO, TB_WMS_GOODS.BRANDNO)
-		     , BRANDNAME = IF(GOODS_REG_GB IS NULL, A.BRANDNAME, TB_WMS_GOODS.BRANDNAME)
+		       PRODUCT_NAME = IF(GOODS_REG_GB IS NULL, B.PRODUCTNAME, TB_WMS_GOODS.PRODUCT_NAME)
+		     , NORMAL_QTY = IF(GOODS_REG_GB IS NULL, B.NORMALQTY, TB_WMS_GOODS.NORMAL_QTY)
+		     , BROKEN_QTY = IF(GOODS_REG_GB IS NULL, B.BROKENQTY, TB_WMS_GOODS.BROKEN_QTY)
+		     , TOTAL_QTY = IF(GOODS_REG_GB IS NULL, B.TOTALQTY, TB_WMS_GOODS.TOTAL_QTY)
+		     , 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>
@@ -1291,7 +1291,7 @@
 		]]>
 	</select>
 	
-	<!-- 공급업체 목록 -->
+	<!-- 브랜드 목록 -->
 	<select id="getBrandList" resultType="IfBrand">
 		/* TsbGoods.getBrandList */
 		SELECT A.BRAND_NO AS BRANDNO