From 8ad0785d63f57d6d7ace4831fabe6981f9186580 Mon Sep 17 00:00:00 2001 From: zhangxin Date: Fri, 31 Dec 2021 16:29:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=9E=E5=86=B2=E6=A0=87?= =?UTF-8?q?=E8=AF=86=E5=9B=9E=E5=86=99=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dao/jit/PackOrderStatus.dao.go | 2 +- dao/jit/implments/PackOrderStatus.dao.impl.go | 12 ++++++------ dao/om/SerialOrder.dao.go | 2 +- dao/om/implments/SerialOrder.dao.impl.go | 11 ++++++----- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dao/jit/PackOrderStatus.dao.go b/dao/jit/PackOrderStatus.dao.go index ad41ff7..8c2085b 100644 --- a/dao/jit/PackOrderStatus.dao.go +++ b/dao/jit/PackOrderStatus.dao.go @@ -218,7 +218,7 @@ type PackOrderStatusDAO interface { ******************************************************************************/ UpdateWhere([]grmi.Predicate, *model.PackOrderStatus, ...string) error SelectUnFlushBackAndUpdateSign(now string) (int64, error) - UpdateBackFlushFlag(start string, end string, packOrderIdLi []string) (int64, error) + UpdateBackFlushFlag(packOrderIdLi []string) (int64, error) } /****************************************************************************** diff --git a/dao/jit/implments/PackOrderStatus.dao.impl.go b/dao/jit/implments/PackOrderStatus.dao.impl.go index 5ed32aa..7604c1c 100644 --- a/dao/jit/implments/PackOrderStatus.dao.impl.go +++ b/dao/jit/implments/PackOrderStatus.dao.impl.go @@ -342,12 +342,11 @@ func (impl *PackOrderStatusDAOImplement) SelectUnFlushBackAndUpdateSign(now stri * @Reference LAPP_ACURA_MOM_BACKEND/dao/jit/PackOrderStatusDAO.UpdateBackFlushFlag * ******************************************************************************/ -func (impl *PackOrderStatusDAOImplement) UpdateBackFlushFlag(start string, end string, packOrderIdLi []string) (int64, error) { - where := fmt.Sprintf("%s = ? and %s >= ? and %s <= ?", +func (impl *PackOrderStatusDAOImplement) UpdateBackFlushFlag(packOrderIdLi []string) (int64, error) { + where := fmt.Sprintf("%s = ? and %s = ?", meta.PackOrderStatus_PlantNr.ColumnName, - meta.PackOrderStatus_CreateTime.ColumnName, - meta.PackOrderStatus_CreateTime.ColumnName) - parameters := []interface{}{impl.plantNr, start, end} + meta.PackOrderStatus_BackflushedToggle.ColumnName) + parameters := []interface{}{impl.plantNr, 0} inStr := fmt.Sprintf(" and %s in ( ", meta.PackOrderStatus_PackOrderId.ColumnName) for index, packOrderId := range packOrderIdLi { if index != 0 { @@ -356,8 +355,9 @@ func (impl *PackOrderStatusDAOImplement) UpdateBackFlushFlag(start string, end s inStr += `'` + packOrderId + `'` } inStr += " ) " + where += inStr updateMap := make(map[string]bool) updateMap[meta.PackOrderStatus_BackflushedToggle.Name] = true count, err := impl.session.Table(impl.meta.TableName).Where(where, parameters...).Cols(meta.PackOrderStatus_BackflushedToggle.ColumnName).Update(&updateMap) return count, err -} \ No newline at end of file +} diff --git a/dao/om/SerialOrder.dao.go b/dao/om/SerialOrder.dao.go index b433e57..dbadd60 100644 --- a/dao/om/SerialOrder.dao.go +++ b/dao/om/SerialOrder.dao.go @@ -400,7 +400,7 @@ type SerialOrderDAO interface { * ******************************************************************************/ SelectSerialOrderIdBySyncKey(syncKeyLi []string) ([]string, error) - UpdateBackFlushFlag(start string, end string, serialOrderIdLi []string) (int64, error) + UpdateBackFlushFlag(serialOrderIdLi []string) (int64, error) SelectTraceOrder(workLineId , serialOrderId , start, end string, status int, pageNumber int64, pageSize int64) (grmi.PagingResult, error) } diff --git a/dao/om/implments/SerialOrder.dao.impl.go b/dao/om/implments/SerialOrder.dao.impl.go index db56caa..1c31cc3 100644 --- a/dao/om/implments/SerialOrder.dao.impl.go +++ b/dao/om/implments/SerialOrder.dao.impl.go @@ -599,12 +599,12 @@ func (impl *SerialOrderDAOImplement) SelectSerialOrderIdBySyncKey(syncKeyLi []st * @Reference LAPP_ACURA_MOM_BACKEND/dao/om/SerialOrderDAO.UpdateBackFlushFlag * ******************************************************************************/ -func (impl *SerialOrderDAOImplement) UpdateBackFlushFlag(start string, end string, serialOrderIdLi []string) (int64, error) { - where := fmt.Sprintf("%s = ? and %s >= ? and %s <= ?", +func (impl *SerialOrderDAOImplement) UpdateBackFlushFlag(serialOrderIdLi []string) (int64, error) { + where := fmt.Sprintf("%s = ? and %s = ?", meta.SerialOrder_PlantNr.ColumnName, - meta.SerialOrder_CreateTime.ColumnName, - meta.SerialOrder_CreateTime.ColumnName) - parameters := []interface{}{impl.plantNr, start, end} + meta.SerialOrder_BackFlushFlag.ColumnName, + ) + parameters := []interface{}{impl.plantNr, 0} inStr := fmt.Sprintf(" and %s in ( ", meta.SerialOrder_SerialOrderId.ColumnName) for index, serialOrderId := range serialOrderIdLi { if index != 0 { @@ -613,6 +613,7 @@ func (impl *SerialOrderDAOImplement) UpdateBackFlushFlag(start string, end strin inStr += `'` + serialOrderId + `'` } inStr += " ) " + where += inStr updateMap := make(map[string]bool) updateMap[meta.SerialOrder_BackFlushFlag.Name] = true count, err := impl.session.Table(impl.meta.TableName).Where(where, parameters...).Cols(meta.SerialOrder_BackFlushFlag.ColumnName).Update(&updateMap)