|
|
|
@@ -1,6 +1,5 @@ |
|
|
|
package com.ffii.fpsms.modules.common.scheduler.service |
|
|
|
|
|
|
|
import com.ffii.core.utils.JwtTokenUtil |
|
|
|
import com.ffii.fpsms.m18.service.M18DeliveryOrderService |
|
|
|
import com.ffii.fpsms.m18.service.M18GrnCodeSyncService |
|
|
|
import com.ffii.fpsms.m18.service.M18MasterDataService |
|
|
|
@@ -72,7 +71,9 @@ open class SchedulerService( |
|
|
|
const val JO_PLAN_START_DEFAULT_CRON: String = "15 0 0 * * *" |
|
|
|
} |
|
|
|
|
|
|
|
var logger: Logger = LoggerFactory.getLogger(JwtTokenUtil::class.java) |
|
|
|
/** Class logger (was incorrectly wired to JwtTokenUtil, so all scheduler lines showed under that category). */ |
|
|
|
private val logger: Logger = LoggerFactory.getLogger(SchedulerService::class.java) |
|
|
|
|
|
|
|
val dataStringFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd") |
|
|
|
val dateTimeStringFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss") |
|
|
|
val defaultCronExpression = "0 0 2 31 2 *"; |
|
|
|
@@ -563,7 +564,6 @@ open class SchedulerService( |
|
|
|
} |
|
|
|
|
|
|
|
open fun getM18BomShopPushAllBoms() { |
|
|
|
logger.info("M18 BOM Shop - push all BOMs to udfBomForShop") |
|
|
|
val currentTime = LocalDateTime.now() |
|
|
|
try { |
|
|
|
val summary = bomM18ShopBulkPushService.pushAllBomsToM18ShopIfAllowed() |
|
|
|
@@ -580,7 +580,16 @@ open class SchedulerService( |
|
|
|
), |
|
|
|
start = currentTime, |
|
|
|
) |
|
|
|
logger.info("M18 BOM Shop batch done: ${summary.toLogQuery()}") |
|
|
|
if (summary.skippedBecauseFeatureDisabled) { |
|
|
|
logger.debug( |
|
|
|
"M18 BOM Shop bulk skipped ({}) — set {}={} to run pushes", |
|
|
|
summary.toLogQuery(), |
|
|
|
SettingNames.M18_BOM_SHOP_SYNC_ENABLED, |
|
|
|
Settings.VALUE_BOOLEAN_TRUE, |
|
|
|
) |
|
|
|
} else { |
|
|
|
logger.info("M18 BOM Shop batch done: {}", summary.toLogQuery()) |
|
|
|
} |
|
|
|
} catch (e: Exception) { |
|
|
|
logger.error("M18 BOM Shop batch failed: ${e.message}", e) |
|
|
|
saveSyncLog( |
|
|
|
|
