Merge branch 'develop' into feature_CustomizedQuery

dao/jit/ShipOrder.dao.go

@@ -303,6 +303,24 @@ type ShipOrderDAO interface {
 	 *
 	 ******************************************************************************/
 	SelectWithStatus(predicates []grmi.Predicate, orderByFields []grmi.Field, status int, formalStatus int) ([]model.ShipOrderWithStatus, error)
+	/******************************************************************************
+	 *
+	 * @Description              : 查询ShipOrder和状态
+	 *
+	 * @Function Parameters      : 当前访问人员信息
+	 *
+	 * @Function Parameters      : 查询参数
+	 *
+	 * @Return Value             : 查询结果
+	 *
+	 * @Return Value             : 执行时发生的错误
+	 *
+	 * @Author                   : zhangxin
+	 *
+	 * @Date                     : 2022-03-10
+	 *
+	 ******************************************************************************/
+	SelectOrderWithStatus(predicates []grmi.Predicate, orderByFields []grmi.Field) ([]model.ShipOrderWithStatus, error)
 }
 
 /******************************************************************************

dao/jit/implments/ShipOrder.dao.impl.go

@@ -458,3 +458,44 @@ func (impl *ShipOrderDAOImplement) SelectWithStatus(predicates []grmi.Predicate,
 	}
 	return data, nil
 }
+
+/******************************************************************************
+ *
+ * @Reference LAPP_ACURA_MOM_BACKEND/dao/jit/ShipOrderDAO.SelectOrderWithStatus
+ *
+ ******************************************************************************/
+func (impl *ShipOrderDAOImplement) SelectOrderWithStatus(predicates []grmi.Predicate, orderByFields []grmi.Field) ([]model.ShipOrderWithStatus, error) {
+
+	parameters := []interface{}{impl.plantNr}
+	where := fmt.Sprintf("%s = ?", meta.ShipOrder_PlantNr.ColumnName)
+
+	condition := fmt.Sprintf("%s = %s and %s = %s",
+		meta.ShipOrder_PlantNr.ColumnName,
+		meta.ShipOrderStatus_PlantNr.ColumnName,
+		meta.ShipOrder_ShipOrderId.ColumnName,
+		meta.ShipOrderStatus_ShipOrderId.ColumnName)
+	session := impl.session.Table(impl.meta.TableName).Join("LEFT", meta.ShipOrderStatus.TableName, condition)
+	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...)
+	}
+
+	session = session.OrderBy(meta.ShipOrder_PlantNr.ColumnName)
+	if orderByFields != nil {
+		for _, field := range orderByFields {
+			session = session.OrderBy(field.ColumnName)
+		}
+	}
+
+	data := make([]model.ShipOrderWithStatus, 0, 10)
+	err := session.Find(&data)
+	if err != nil {
+		return nil, grmi.NewDataBaseError(err)
+	}
+	return data, nil
+}

services/jit/ShipOrder.service.go

@@ -335,7 +335,7 @@ type ShipOrderService interface {
 	 * @Date                     : 2022-03-09
 	 *
 	 ******************************************************************************/
-	SelectShipDataBySerialOrderId(user *global.User, serialOrderId string) ([]model.ShipOrder, error)
+	SelectShipDataBySerialOrderId(user *global.User, serialOrderId string) ([]model.ShipOrderWithStatus, error)
 }
 
 /******************************************************************************

services/jit/implments/ShipOrder.service.impl.go

@@ -1651,7 +1651,7 @@ func (impl *ShipOrderServiceImplement) PermitTrough(workPlaceConfig *baseModel.W
 }
 
 // SelectShipDataBySerialOrderId 通过工单查询发运单
-func (impl *ShipOrderServiceImplement) SelectShipDataBySerialOrderId(user *global.User, serialOrderId string) ([]model.ShipOrder, error) {
+func (impl *ShipOrderServiceImplement) SelectShipDataBySerialOrderId(user *global.User, serialOrderId string) ([]model.ShipOrderWithStatus, error) {
 	grmi.Log(user, "/services/jit/implments/ShipOrder.service.impl.go", "SelectShipDataBySerialOrderId", "通过工单ID查询发运单")
 
 	engine := db.Eloquent.Master()
@@ -1666,7 +1666,7 @@ func (impl *ShipOrderServiceImplement) SelectShipDataBySerialOrderId(user *globa
 	if len(shipOrderIdLi) == 0 {
 		return nil, grmi.NewBusinessError("当前工单没有进入到发运单中")
 	}
-	shipOrderLi, err := shipOrderDao.Select([]grmi.Predicate{
+	shipOrderLi, err := shipOrderDao.SelectOrderWithStatus([]grmi.Predicate{
 		meta.ShipOrder_ShipOrderId.NewPredicate(grmi.Include, shipOrderIdLi...),
 	}, []grmi.Field{meta.ShipOrder_CreateTime})
 	if err != nil {

web/controllers/jit/ShipOrder.rest.go

@@ -672,7 +672,7 @@ func RegisterSelectShipOrderWithStatus(party router.Party, path string, method f
  * @Date                     : 2022-03-09
  *
  ******************************************************************************/
-func RegisterSelectShipOrderBySerialOrderId(party router.Party, path string, method func(*global.User, string) ([]model.ShipOrder, error)) {
+func RegisterSelectShipOrderBySerialOrderId(party router.Party, path string, method func(*global.User, string) ([]model.ShipOrderWithStatus, error)) {
 
 	party.Get(path, func(ctx iris.Context) {
 		user, ok := jwts.ParseToken(ctx)