From bd62d9f38fd891b7b03e98f6d881df2e91f56ce1 Mon Sep 17 00:00:00 2001
From: zhangxin <Xin.zhang@le-it.com.cn>
Date: Tue, 29 Jun 2021 17:21:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A7=E5=88=B6=20?=
 =?UTF-8?q?=E4=BF=9D=E8=AF=81aps=20release=E5=92=8Cfeedback=E4=B8=8D?=
 =?UTF-8?q?=E5=90=8C=E6=97=B6=E6=89=A7=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 task/ApsRelease.go    | 36 +++++++++++++++++++++++++++++++++++-
 task/TrasnferToMes.go | 27 +--------------------------
 task/scheduler.go     |  4 ++--
 3 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/task/ApsRelease.go b/task/ApsRelease.go
index a91afd3..082a10d 100644
--- a/task/ApsRelease.go
+++ b/task/ApsRelease.go
@@ -1,12 +1,17 @@
 package task
 
 import (
+	omServices "LAPP_GAAS_GFrame_BACKEND/services/om"
 	services "LAPP_GAAS_GFrame_BACKEND/services/schedule"
 )
 
 var ApsReleaseStatus int
+var feedbackFromMesTaskStatus int
 
-func StartApsRelease()  {
+func StartApsRelease() {
+	if feedbackFromMesTaskStatus == 1 {
+		return
+	}
 	if ApsReleaseStatus == 0 {
 		ApsReleaseStatus = 1
 		defer func() {
@@ -18,3 +23,32 @@ func StartApsRelease()  {
 	plantNr := 100
 	services.ApsRelease(plantNr)
 }
+
+/******************************************************************************
+ *
+ * @Struct Name              : FeedbackFromMes
+ *-----------------------------------------------------------------------------
+ *
+ * @Description              : 从mes系统回写状态 时间等数据
+ *
+ * @Author                   : zhangxin
+ *
+ * @Date                     : 2021-05-13
+ *
+ ******************************************************************************/
+func FeedbackFromMes() {
+	if ApsReleaseStatus == 1 {
+		return
+	}
+	if feedbackFromMesTaskStatus == 0 {
+		feedbackFromMesTaskStatus = 1
+		defer func() {
+			feedbackFromMesTaskStatus = 0
+		}()
+	} else {
+		return
+	}
+	plantNr := 100
+	omServicesImpl := omServices.NewOmToMesService()
+	omServicesImpl.FeedbackFromMes(plantNr)
+}
diff --git a/task/TrasnferToMes.go b/task/TrasnferToMes.go
index 872b9ed..7020a92 100644
--- a/task/TrasnferToMes.go
+++ b/task/TrasnferToMes.go
@@ -4,7 +4,7 @@ import services "LAPP_GAAS_GFrame_BACKEND/services/om"
 
 var transferWorkOrderToMesTaskStatus int
 var transferSerialOrderToMesTaskStatus int
-var feedbackFromMesTaskStatus int
+
 /******************************************************************************
  *
  * @Struct Name              : TransferWorkOrderToMes
@@ -57,28 +57,3 @@ func TransferSerialOrderToMes()  {
 	omServices.TransferSerialOrderToMes(plantNr)
 }
 
-/******************************************************************************
- *
- * @Struct Name              : FeedbackFromMes
- *-----------------------------------------------------------------------------
- *
- * @Description              : 从mes系统回写状态 时间等数据
- *
- * @Author                   : zhangxin
- *
- * @Date                     : 2021-05-13
- *
- ******************************************************************************/
-func FeedbackFromMes()  {
-	if feedbackFromMesTaskStatus == 0 {
-		feedbackFromMesTaskStatus = 1
-		defer func() {
-			feedbackFromMesTaskStatus = 0
-		}()
-	} else {
-		return
-	}
-	plantNr := 100
-	omServices := services.NewOmToMesService()
-	omServices.FeedbackFromMes(plantNr)
-}
\ No newline at end of file
diff --git a/task/scheduler.go b/task/scheduler.go
index 5149817..7ec3e04 100644
--- a/task/scheduler.go
+++ b/task/scheduler.go
@@ -47,7 +47,7 @@ func Start() error {
 
 
 	// 添加派工
-	err = c.AddFunc("*/2 * * * * ?", StartApsRelease)
+	err = c.AddFunc("*/3 * * * * ?", StartApsRelease)
 	if err != nil {
 		return err
 	}
@@ -69,7 +69,7 @@ func Start() error {
 	if err != nil {
 		return err
 	}
-	err = c.AddFunc("*/2 * * * * ?",  FeedbackFromMes)
+	err = c.AddFunc("*/5 * * * * ?",  FeedbackFromMes)
 	if err != nil {
 		return err
 	}