GFrame查询发运管理所有的订单

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

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

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
 	}