gagamel 4 yıl önce
ebeveyn
işleme
bbf3d565bf

+ 5 - 5
src/main/java/com/style24/batch/biz/job/statistics/TsbSalesUploadJob.java

@@ -43,11 +43,11 @@ public class TsbSalesUploadJob extends TsbAbstractJob<String, String, String> {
 
 	@Override
 	public String process(String result) throws Exception {
-		// 한세드림 매출반영
-		this.uploadSales(HansaeErp.ErpGb.HANSAE_DR.value());
+//		// 한세드림 매출반영
+//		this.uploadSales(HansaeErp.ErpGb.HANSAE_DR.value());
 
-//		// 한세MK 매출반영
-//		this.uploadSales(HansaeErp.ErpGb.HANSAE_MK.value());
+		// 한세MK 매출반영
+		this.uploadSales(HansaeErp.ErpGb.HANSAE_MK.value());
 
 		return "OK";
 	}
@@ -97,7 +97,7 @@ public class TsbSalesUploadJob extends TsbAbstractJob<String, String, String> {
 				log.error("매출반영결과 데이터가 없습니다. 한세 ERP 시스템담당자에게 문의해 주세요.");
 				continue;
 			}
-			
+
 			// 매출반영결과 처리
 			statisticsService.updateSalesUploadResult(erpGb, salesMap);
 

+ 7 - 6
src/main/java/com/style24/persistence/mybatis/shop/TsbStatistics.xml

@@ -962,11 +962,13 @@
 		)
 		SELECT #{erpGb}            AS ERP_GB
 		     , CONCAT(DATE_FORMAT(NOW(),'%Y%m%d%H%i%S'),
-		              LPAD(ROW_NUMBER() OVER(ORDER BY DT_SALE
-		                                            , CD_STYLE
-		                                            , CD_COLOR
-		                                            , CD_SIZE),4,'0')
-		             )             AS NO_IF
+		              (SELECT LPAD(IFNULL((SELECT CAST(MAX(SUBSTRING(NO_IF,15)) AS UNSIGNED)
+		                                   FROM   TB_HANSAE_SALES
+		                                   WHERE  ERP_GB = #{erpGb}
+		                                   AND    NO_IF LIKE CONCAT(DATE_FORMAT(NOW(),'%Y%m%d'),'%')
+		                                  ),0) + 1,4,'0')
+		               FROM   DUAL)
+		              )            AS NO_IF
 		     , DT_SALE
 		     , TP_SALE
 		     , CD_STYLE
@@ -1081,7 +1083,6 @@
 		     , UPD_DT = NOW()
 		WHERE  ERP_GB = #{ERP_GB}
 		AND    NO_IF = #{NO_IF}
-		AND    DT_SALE = #{DT_SALE}
 		AND    CD_STYLE = #{CD_STYLE}
 		AND    CD_COLOR = #{CD_COLOR}
 		AND    CD_SIZE = #{CD_SIZE}