diff --git a/task/ParseCallOff.go b/task/ParseCallOff.go index 7ab7201..552e211 100644 --- a/task/ParseCallOff.go +++ b/task/ParseCallOff.go @@ -5,7 +5,11 @@ import ( ) var ParsedStatus int +var ParseToyotaCallOffFileStatus int +var ParseToyotaCallOffStatus int +var WriteDeliveryOrderDataStatus int +// 解析hongda发运文件 func StartParseCallOff() { if ParsedStatus == 1 { return @@ -18,3 +22,43 @@ func StartParseCallOff() { svr := services.NewHondaCalloffService() svr.AnalysisTask() } + +func ParsedToyotaCallOffFile() { + if ParseToyotaCallOffFileStatus == 1 { + return + } else { + ParseToyotaCallOffFileStatus = 1 + defer func() { + ParseToyotaCallOffFileStatus = 0 + }() + } + svr := services.NewToyotaCalloffService() + svr.ParseToyotaCallOffFile() +} + + +func ParsedToyotaCallOff() { + if ParseToyotaCallOffStatus == 1 { + return + } else { + ParseToyotaCallOffStatus = 1 + defer func() { + ParseToyotaCallOffStatus = 0 + }() + } + svr := services.NewToyotaCalloffService() + svr.ParseToyotaCallOffCache() +} + +func WriteDeliveryOrderToPLC() { + if WriteDeliveryOrderDataStatus == 1 { + return + } else { + WriteDeliveryOrderDataStatus = 1 + defer func() { + WriteDeliveryOrderDataStatus = 0 + }() + } + svr := services.NewToyotaDeliveryOrderService() + svr.WriteDeliveryDataToPLC() +} \ No newline at end of file diff --git a/task/scheduler.go b/task/scheduler.go index 447562b..0192e4b 100644 --- a/task/scheduler.go +++ b/task/scheduler.go @@ -1,6 +1,8 @@ package task import ( + "LAPP_ACURA_MOM_BACKEND/conf" + baseModel "LAPP_ACURA_MOM_BACKEND/models/base" "github.com/robfig/cron" ) @@ -19,42 +21,26 @@ import ( func Start() error { c := cron.New() var err error - // 传递demand数据到阿里云 - err = c.AddFunc("*/5 * * * * ?", StartParseCallOff) - if err != nil { - return err + if conf.DbConfig.Project == baseModel.PROJECT_ACURA { + // 解析HondaCallOff + err = c.AddFunc("*/5 * * * * ?", StartParseCallOff) + if err != nil { + return err + } + } else { + err = c.AddFunc("*/5 * * * * ?", ParsedToyotaCallOffFile) + if err != nil { + return err + } + err = c.AddFunc("*/5 * * * * ?", ParsedToyotaCallOff) + if err != nil { + return err + } + err = c.AddFunc("*/5 * * * * ?", WriteDeliveryOrderToPLC) + if err != nil { + return err + } } - //err = c.AddFunc("*/5 * * * * ?", ReportSerialOrderFromMes) - //if err != nil { - // return err - //} - // 传递demand cache数据到阿里云 - //err = c.AddFunc("0 */5 * * * ?", TransferArtDemandCacheToPortal) - //if err != nil { - // return err - //} - // - //err = c.AddFunc("0 0,30 * * * ?", CreateParseFromDBByTimeTask) - //if err != nil { - // return err - //} - // - //err = c.AddFunc("0 4,36 * * * ?", CreateParseFromDBByDayTask) - //if err != nil { - // return err - //} - // - //err = c.AddFunc("*/5 * * * * ?", ParseWorkOrderFromDB) - //if err != nil { - // return err - //} - - // 添加派工 - //err = c.AddFunc("*/3 * * * * ?", StartApsRelease) - //if err != nil { - // return err - //} - c.Start() select {}