From 2632e1b05c4f68cc49b9acb3b3a8847cc0ed86e2 Mon Sep 17 00:00:00 2001 From: LSH Date: 星期三, 27 十二月 2023 08:46:02 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion --- src/main/java/com/zy/asrs/service/NodeService.java | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/NodeService.java b/src/main/java/com/zy/asrs/service/NodeService.java index 2de56d4..0f6a79d 100644 --- a/src/main/java/com/zy/asrs/service/NodeService.java +++ b/src/main/java/com/zy/asrs/service/NodeService.java @@ -1,10 +1,13 @@ package com.zy.asrs.service; +import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.IService; import com.core.common.R; +import com.zy.asrs.entity.ManLocDetl; import com.zy.asrs.entity.Node; import com.zy.asrs.entity.param.InitPakoutParam; import com.zy.asrs.entity.param.PakinParam; +import com.zy.system.entity.User; import java.util.List; @@ -20,9 +23,11 @@ Node selectByUuid(String uuid, Long hostId, Integer type, Long parentId); - R stockPakin(PakinParam number, Long userId, Long hostId); + R stockPakin(PakinParam number, Long userId, Long hostId, User user); - R initPakout(List<InitPakoutParam> params, Long userId, Long hostId); + R initPakout(List<InitPakoutParam> params, Long userId, Long hostId,User user); - void locMove(String sourceLocNo, String targetLocNo, Long userId); + void locMove(String sourceLocNo, String targetLocNo, Long userId,User user); + + Page<Node> getPage(Page<Node> page); } -- Gitblit v1.9.1