From 62999445ef31e034ee74e585061a68e0c9ce12e4 Mon Sep 17 00:00:00 2001
From: zhangxin <xin.zhang@le-it.com.cn>
Date: Thu, 13 Jan 2022 10:01:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=8Emes=E4=B8=80=E6=AC=A1=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A510=E6=9D=A1=E6=94=B9=E4=B8=BA=E4=B8=80=E6=AC=A1?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=89=80=E6=9C=89=E7=AC=A6=E5=90=88=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dao/api/ACCWOWORKORDERHEADER.dao.go           |  1 +
 .../ACCWOWORKORDERHEADER.dao.impl.go          | 35 +++++++++++++++++++
 services/om/implments/OmToMes.serivce.impl.go |  2 +-
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/dao/api/ACCWOWORKORDERHEADER.dao.go b/dao/api/ACCWOWORKORDERHEADER.dao.go
index b497a79..d753a01 100644
--- a/dao/api/ACCWOWORKORDERHEADER.dao.go
+++ b/dao/api/ACCWOWORKORDERHEADER.dao.go
@@ -236,6 +236,7 @@ type ACCWOWORKORDERHEADERDAO interface {
 	 *
 	 ******************************************************************************/
 	UpdateForQty(*model.ACCWOWORKORDERHEADER, int) error
+	SelectWithoutLimit(predicates []grmi.Predicate, orderByFields []grmi.Field) ([]model.ACCWOWORKORDERHEADER, error)
 }
 
 /******************************************************************************
diff --git a/dao/api/implments/ACCWOWORKORDERHEADER.dao.impl.go b/dao/api/implments/ACCWOWORKORDERHEADER.dao.impl.go
index 6d13fbb..332a605 100644
--- a/dao/api/implments/ACCWOWORKORDERHEADER.dao.impl.go
+++ b/dao/api/implments/ACCWOWORKORDERHEADER.dao.impl.go
@@ -305,4 +305,39 @@ func (impl *ACCWOWORKORDERHEADERDAOImplement) UpdateForQty(entity *model.ACCWOWO
 		return grmi.NewBusinessError("对应的mes WorkOrder数据已更新")
 	}
 	return nil
+}
+
+/******************************************************************************
+ *
+ * @Reference LAPP_GAAS_GFrame_BACKEND/dao/api/ACCWOWORKORDERHEADERDAO.Select
+ *
+ ******************************************************************************/
+func (impl *ACCWOWORKORDERHEADERDAOImplement) SelectWithoutLimit(predicates []grmi.Predicate, orderByFields []grmi.Field) ([]model.ACCWOWORKORDERHEADER, error) {
+
+	parameters := []interface{}{}
+	where := "1 = 1"
+
+	session := impl.session.Table(impl.meta.TableName)
+	if predicates != nil {
+		for _, predicate := range predicates {
+			where += predicate.Build()
+			parameters = append(parameters, predicate.Values...)
+		}
+		session = session.Where(where, parameters...)
+	} else {
+		session = session.Where(where, parameters...)
+	}
+
+	if orderByFields != nil {
+		for _, field := range orderByFields {
+			session = session.OrderBy(field.ColumnName)
+		}
+	}
+
+	data := make([]model.ACCWOWORKORDERHEADER, 0, 10)
+	err := session.Find(&data)
+	if err != nil {
+		return nil, grmi.NewDataBaseError(err)
+	}
+	return data, nil
 }
\ No newline at end of file
diff --git a/services/om/implments/OmToMes.serivce.impl.go b/services/om/implments/OmToMes.serivce.impl.go
index bb2eb94..a7ae8d6 100644
--- a/services/om/implments/OmToMes.serivce.impl.go
+++ b/services/om/implments/OmToMes.serivce.impl.go
@@ -294,7 +294,7 @@ func (impl *OmToMesServiceImplement) FeedbackFromMes(plantNr int) {
 	serialOrderStatusRecDao := dal.NewSerialOrderStatusRecLstDAO(session, plantNr, user)
 
 	// 获取status是 MesOrderStatusRelease 的header list
-	headerLi, err := headerDao.Select([]grmi.Predicate{apiMeta.ACCWOWORKORDERHEADER_STATUS.NewPredicate(grmi.Equal, model.MesOrderStatusRelease)}, []grmi.Field{apiMeta.ACCWOWORKORDERHEADER_WONO}, 10)
+	headerLi, err := headerDao.SelectWithoutLimit([]grmi.Predicate{apiMeta.ACCWOWORKORDERHEADER_STATUS.NewPredicate(grmi.Equal, model.MesOrderStatusRelease)}, []grmi.Field{apiMeta.ACCWOWORKORDERHEADER_WONO})
 	if err != nil {
 		log.Error("FeedbackFromMes get header data from mes db failed, error:"+err.Error(), "feedback id:"+feedbackId)
 		_ = mesSession.Rollback()
-- 
2.30.1.windows.1