From 441a05328a262bec4a7ec91a68d38242ba1be352 Mon Sep 17 00:00:00 2001
From: zhangxin <Xin.zhang@le-it.com.cn>
Date: Wed, 12 May 2021 09:40:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=B8=8D=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E7=9A=84=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95=E7=9A=84=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 services/schedule/Scheduler.Ctrl_test.go | 72 +++++++++++++++---------
 1 file changed, 46 insertions(+), 26 deletions(-)

diff --git a/services/schedule/Scheduler.Ctrl_test.go b/services/schedule/Scheduler.Ctrl_test.go
index f9d950c..b60e018 100644
--- a/services/schedule/Scheduler.Ctrl_test.go
+++ b/services/schedule/Scheduler.Ctrl_test.go
@@ -3,12 +3,12 @@ package schedule
 import (
 	"LAPP_GAAS_GFrame_BACKEND/conf"
 	"LAPP_GAAS_GFrame_BACKEND/db"
-	"testing"
+	"LAPP_GAAS_GFrame_BACKEND/infra/logger"
 	"github.com/stretchr/testify/assert"
+	"testing"
 )
 
 func TestSchedulerSrv_ReleaseSchedule(t *testing.T) {
-	ass := assert.New(t)
 	//加载配置
 	err := conf.ReadYamlConfig("..\\..\\conf\\config.yaml")
 	if err != nil {
@@ -19,36 +19,56 @@ func TestSchedulerSrv_ReleaseSchedule(t *testing.T) {
 	if err != nil {
 		t.Fatal("init db failed, error:", err)
 	}
-	engine := db.Eloquent.Master()
-	// 初始化数据表
-	_, err = engine.ImportFile("./script/ME_Project.sql")
-	if err != nil {
-		t.Error("init data table ME_Project failed, error:", err)
-	}
-	_, err = engine.ImportFile("./script/WorkLine.sql")
-	if err != nil {
-		t.Fatal("init data table WorkLine failed, error:", err)
-	}
-	_, err = engine.ImportFile("./script/OM_WorkOrder.sql")
+	err = logger.InitConfig()
 	if err != nil {
-		t.Fatal("init data table OM_WorkOrder failed, error:", err)
+		t.Fatal("init logger config failed, error:", err.Error())
 	}
-	_, err = engine.ImportFile("./script/OM_WorkOrderQty.sql")
-	if err != nil {
-		t.Fatal("init data table OM_WorkOrderQty failed, error:", err)
-	}
-	_, err = engine.ImportFile("./script/OM_WorkOrderStatus.sql")
-	if err != nil {
-		t.Fatal("init data table OM_WorkOrderStatus failed, error:", err)
-	}
-
+	engine := db.Eloquent.Master()
+	engine.ShowSQL(true)
+	// 初始化数据表
+	//_, err = engine.ImportFile("./script/ME_Project.sql")
+	//if err != nil {
+	//	t.Error("init data table ME_Project failed, error:", err)
+	//}
+	//_, err = engine.ImportFile("./script/WorkLine.sql")
+	//if err != nil {
+	//	t.Fatal("init data table WorkLine failed, error:", err)
+	//}
+	//_, err = engine.ImportFile("./script/OM_SerialOrder.sql")
+	//if err != nil {
+	//	t.Fatal("init data table OM_SerialOrder failed, error:", err)
+	//}
+	//_, err = engine.ImportFile("./script/OM_SerialOrderStatus.sql")
+	//if err != nil {
+	//	t.Fatal("init data table OM_SerialOrderStatus failed, error:", err)
+	//}
+	//_, err = engine.ImportFile("./script/OM_SerialOrderStatusRecLst.sql")
+	//if err != nil {
+	//	t.Fatal("init data table OM_SerialOrderStatusRecLst failed, error:", err)
+	//}
+	//_, err = engine.ImportFile("./script/OM_WorkOrder.sql")
+	//if err != nil {
+	//	t.Fatal("init data table OM_WorkOrder failed, error:", err)
+	//}
+	//_, err = engine.ImportFile("./script/OM_WorkOrderStatus.sql")
+	//if err != nil {
+	//	t.Fatal("init data table OM_WorkOrderStatus failed, error:", err)
+	//}
+	//_, err = engine.ImportFile("./script/OM_WorkOrderQty.sql")
+	//if err != nil {
+	//	t.Fatal("init data table OM_WorkOrderQty failed, error:", err)
+	//}
+	//_, err = engine.ImportFile("./script/OM_WorkOrderStatusRecLst.sql")
+	//if err != nil {
+	//	t.Fatal("init data table OM_WorkOrderStatusRecLst.sql failed, error:", err)
+	//}
+	ass := assert.New(t)
 	// 指定工厂id
 	var plantNr = 100
 	// 指定产线类型
-	var workLineType = "a"
+	var workLineType = "1"
 	// 指定产线id
-	var workLineId = "test001"
-
+	var workLineId = "RB"
 	schedulerSrv := SchedulerSrv{
 		PlantNr: plantNr,
 	}