From a8e49e91d442a6ab4a9e3d6d1406f332339b7df6 Mon Sep 17 00:00:00 2001 From: "DESKTOP-H7A6KL3\\wenzh" Date: Tue, 11 Apr 2023 17:37:05 +0800 Subject: [PATCH] =?UTF-8?q?GFrame=E6=9F=A5=E8=AF=A2=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=89=80=E6=9C=89=E7=9A=84=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dao/jit/ShipOrder.dao.go | 2 +- dao/jit/implments/ShipOrder.dao.impl.go | 13 ++++++++----- services/jit/implments/ShipOrder.service.impl.go | 3 ++- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dao/jit/ShipOrder.dao.go b/dao/jit/ShipOrder.dao.go index c980ad5..c3e0e80 100644 --- a/dao/jit/ShipOrder.dao.go +++ b/dao/jit/ShipOrder.dao.go @@ -277,7 +277,7 @@ type ShipOrderDAO interface { * @Date : 2021-10-19 10:26:40 * ******************************************************************************/ - SelectAndPagingWithStatus(paging *grmi.Paging, predicates []grmi.Predicate, orderByFields []grmi.Field, status int, formalStatus int) (grmi.PagingResult, error) + SelectAndPagingWithStatus(paging *grmi.Paging, predicates []grmi.Predicate, orderByFields []grmi.Field, status int, formalStatus int, shipType string) (grmi.PagingResult, error) /****************************************************************************** * * @Function Name : SelectWithStatus diff --git a/dao/jit/implments/ShipOrder.dao.impl.go b/dao/jit/implments/ShipOrder.dao.impl.go index bc6e7ef..a24ed8d 100644 --- a/dao/jit/implments/ShipOrder.dao.impl.go +++ b/dao/jit/implments/ShipOrder.dao.impl.go @@ -5,6 +5,7 @@ package implments import ( "LAPP_ACURA_MOM_BACKEND/grmi" meta "LAPP_ACURA_MOM_BACKEND/meta/jit" + common "LAPP_ACURA_MOM_BACKEND/models/base" model "LAPP_ACURA_MOM_BACKEND/models/jit" "fmt" "github.com/go-xorm/xorm" @@ -353,7 +354,7 @@ func (impl *ShipOrderDAOImplement) SelectOneWithStatus(shipOrderId string) (*mod * @Reference LAPP_ACURA_MOM_BACKEND/dao/jit/ShipOrderDAO.SelectAndPaging * ******************************************************************************/ -func (impl *ShipOrderDAOImplement) SelectAndPagingWithStatus(paging *grmi.Paging, predicates []grmi.Predicate, orderByFields []grmi.Field, status int, formalStatus int) (grmi.PagingResult, error) { +func (impl *ShipOrderDAOImplement) SelectAndPagingWithStatus(paging *grmi.Paging, predicates []grmi.Predicate, orderByFields []grmi.Field, status int, formalStatus int, shipType string) (grmi.PagingResult, error) { parameters := []interface{}{impl.plantNr} where := fmt.Sprintf("%s = ?", meta.ShipOrder_PlantNr.ColumnName) @@ -374,9 +375,11 @@ func (impl *ShipOrderDAOImplement) SelectAndPagingWithStatus(paging *grmi.Paging session = session.Where(where, parameters...) } if status == 0 { - where += fmt.Sprintf(" and %s < ? ", meta.ShipOrderStatus_Status.ColumnName) - parameters = append(parameters, model.PACK_STATUS_CLOSED) - session = session.Where(fmt.Sprintf(" %s < ? ", meta.ShipOrderStatus_Status.ColumnName), model.PACK_STATUS_CLOSED) + if shipType != common.SP_TYPE_OUTER { + where += fmt.Sprintf(" and %s < ? ", meta.ShipOrderStatus_Status.ColumnName) + parameters = append(parameters, model.PACK_STATUS_CLOSED) + session = session.Where(fmt.Sprintf(" %s < ? ", meta.ShipOrderStatus_Status.ColumnName), model.PACK_STATUS_CLOSED) + } } else { where += fmt.Sprintf(" and %s = ? ", meta.ShipOrderStatus_Status.ColumnName) parameters = append(parameters, status) @@ -498,4 +501,4 @@ func (impl *ShipOrderDAOImplement) SelectOrderWithStatus(predicates []grmi.Predi return nil, grmi.NewDataBaseError(err) } return data, nil -} \ No newline at end of file +} diff --git a/services/jit/implments/ShipOrder.service.impl.go b/services/jit/implments/ShipOrder.service.impl.go index 6031e16..d4dcbbe 100644 --- a/services/jit/implments/ShipOrder.service.impl.go +++ b/services/jit/implments/ShipOrder.service.impl.go @@ -477,6 +477,7 @@ func (impl *ShipOrderServiceImplement) SelectAndPaging(user *global.User, urlPar if err != nil { return grmi.EmptyPagingResult, err } + shipType, _ := urlParameters["ShipType"] statusStr, exist := urlParameters["status"] if !exist || statusStr == "" { statusStr = "0" @@ -495,7 +496,7 @@ func (impl *ShipOrderServiceImplement) SelectAndPaging(user *global.User, urlPar } dao := dal.NewShipOrderDAO(session, user.PlantNr, user.UserId) condition.Fill(urlParameters) - result, err := dao.SelectAndPagingWithStatus(condition.Paging, predicates, condition.OrderByFields, status, formalStatus) + result, err := dao.SelectAndPagingWithStatus(condition.Paging, predicates, condition.OrderByFields, status, formalStatus, shipType) if err != nil { return grmi.EmptyPagingResult, err }