侧边栏搜索

services/jit/ShipOrder.service.go

@@ -155,6 +155,27 @@ type ShipOrderService interface {
 	 *
 	 ******************************************************************************/
 	Select(*models.Usertab, map[string]string) ([]model.ShipOrder, error)
+	/******************************************************************************
+	 *
+	 * @Function Name            : SelectList
+	 *-----------------------------------------------------------------------------
+	 *
+	 * @Description              : 查询ShipOrder
+	 *
+	 * @Function Parameters      : 当前访问人员信息
+	 *
+	 * @Function Parameters      : 查询参数
+	 *
+	 * @Return Value             : 查询结果
+	 *
+	 * @Return Value             : 执行时发生的错误
+	 *
+	 * @Author                   : 代码生成器创建
+	 *
+	 * @Date                     : 2021-08-13 13:42:26
+	 *
+	 ******************************************************************************/
+	SelectList(*models.Usertab, string) ([]model.ShipOrder, error)
 	/******************************************************************************
 	 *
 	 * @Function Name            : Update

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

@@ -419,6 +419,7 @@ func (impl *ShipOrderServiceImplement) Select(user *models.Usertab, urlParameter
 
 	condition := DefaultConditionOfShipOrderAndPaging
 	engine := db.Eloquent.Master()
+	engine.ShowSQL(true)
 	session := engine.NewSession()
 	defer session.Close()
 	predicates, err := condition.BuildPredicates(urlParameters)
@@ -426,7 +427,40 @@ func (impl *ShipOrderServiceImplement) Select(user *models.Usertab, urlParameter
 		return nil, err
 	}
 	dao := dal.NewShipOrderDAO(session, user.Pid, user.Userid)
+	result, err := dao.Select(predicates, condition.OrderByFields)
+	if err != nil {
+		return nil, err
+	}
+	return result, nil
+}
+
+/******************************************************************************
+ *
+ * @Reference LAPP_GAAS_GFrame_BACKEND/services/jit/ShipOrderService.SelectList
+ *
+ ******************************************************************************/
+func (impl *ShipOrderServiceImplement) SelectList(user *models.Usertab, deliverDate string) ([]model.ShipOrder, error) {
 
+	grmi.Log(user, "/services/jit/implments/ShipOrder.SelectList.impl.go", "SelectShipOrder", "查询ShipOrder")
+
+	condition := DefaultConditionOfShipOrderAndPaging
+	engine := db.Eloquent.Master()
+	engine.ShowSQL(true)
+	session := engine.NewSession()
+	defer session.Close()
+	var predicates []grmi.Predicate
+	if !utils.ValueIsEmpty(deliverDate){
+		predicates = []grmi.Predicate{
+			meta.ShipOrder_DeliverDate.NewPredicate(grmi.Equal, deliverDate),
+			meta.ShipOrder_Status.NewPredicate(grmi.NotEqual, basmodel.WO_STATUS_FINISHED),
+		}
+	}else{
+		predicates = []grmi.Predicate{
+			meta.ShipOrder_Status.NewPredicate(grmi.NotEqual, basmodel.WO_STATUS_FINISHED),
+		}
+	}
+	predicates = append(predicates,)
+	dao := dal.NewShipOrderDAO(session, user.Pid, user.Userid)
 	result, err := dao.Select(predicates, condition.OrderByFields)
 	if err != nil {
 		return nil, err
@@ -532,6 +566,10 @@ func (impl *ShipOrderServiceImplement) ScanCarPackOrders(user *models.Usertab, s
 		session.Rollback()
 		return true, grmi.NewBusinessError("包装单信息不存在!")
 	}
+	if packInfo.Status != basmodel.WO_STATUS_FINISHED{
+		session.Rollback()
+		return true, grmi.NewBusinessError("包装单状态未完成!")
+	}
 	//第二步:根据包装单信心，查询对应的发运单项信息
 	itemInfo, err := lstDao.SelectOne(shipOrderId, packInfo.MaterialId)
 	if err != nil {

web/controllers/jit/ShipOrder.rest.go

@@ -323,7 +323,7 @@ func RegisterDeleteShipOrder(party router.Party, path string, method func(*model
  * @Date                     : 2021-10-25 13:36:01
  *
  ******************************************************************************/
-func RegisterSelectShipOrder(party router.Party, path string, method func(*models.Usertab, map[string]string) ([]model.ShipOrder, error)) {
+func RegisterSelectShipOrder(party router.Party, path string, method func(*models.Usertab, string) ([]model.ShipOrder, error)) {
 
 	party.Get(path, func(ctx iris.Context) {
 		user, ok := jwts.ParseToken(ctx)
@@ -332,7 +332,8 @@ func RegisterSelectShipOrder(party router.Party, path string, method func(*model
 			return
 		}
 
-		result, err := method(user, ctx.URLParams())
+		deliverDate := ctx.URLParam("deliverDate")
+		result, err := method(user, deliverDate)
 		if err != nil {
 			supports.Error(ctx, iris.StatusBadRequest, err.Error(), nil)
 			return

web/controllers/jit/jit.go

@@ -37,7 +37,7 @@ func RegisterRoutes() {
 		// ShipOrder删除多条
 		// RegisterDeleteShipOrder(shiporder, "/delete", serviceOfShipOrder.Delete)
 		// ShipOrder查询多条
-		RegisterSelectShipOrder(shiporder, "/selectlist", serviceOfShipOrder.Select)
+		RegisterSelectShipOrder(shiporder, "/selectlist", serviceOfShipOrder.SelectList)
 		// ShipOrder查询多条并分页
 		RegisterQueryShipOrder(shiporder, "/query", serviceOfShipOrder.SelectAndPaging)
 		// ShipOrder查询一条