Browse Source

修改回冲标识回写的代码

pull/100/head
zhangxin 3 years ago
parent
commit
8ad0785d63
4 changed files with 14 additions and 13 deletions
  1. +1
    -1
      dao/jit/PackOrderStatus.dao.go
  2. +6
    -6
      dao/jit/implments/PackOrderStatus.dao.impl.go
  3. +1
    -1
      dao/om/SerialOrder.dao.go
  4. +6
    -5
      dao/om/implments/SerialOrder.dao.impl.go

+ 1
- 1
dao/jit/PackOrderStatus.dao.go View File

@ -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)
}
/******************************************************************************


+ 6
- 6
dao/jit/implments/PackOrderStatus.dao.impl.go View File

@ -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
}
}

+ 1
- 1
dao/om/SerialOrder.dao.go View File

@ -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)
}


+ 6
- 5
dao/om/implments/SerialOrder.dao.impl.go View File

@ -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)


Loading…
Cancel
Save