From 57936e11434f6614f818a0a0a495918dc1af6dd6 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 02 十二月 2024 08:07:01 +0800
Subject: [PATCH] 单据出库完成
---
src/main/java/com/zy/asrs/controller/NodeController.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/NodeController.java b/src/main/java/com/zy/asrs/controller/NodeController.java
index a7033ed..b08ace1 100644
--- a/src/main/java/com/zy/asrs/controller/NodeController.java
+++ b/src/main/java/com/zy/asrs/controller/NodeController.java
@@ -13,7 +13,6 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.exception.CoolException;
-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;
@@ -34,8 +33,6 @@
import java.io.IOException;
import java.net.URLEncoder;
import java.util.*;
-
-import static jdk.nashorn.api.scripting.ScriptUtils.convert;
@RestController
public class NodeController extends BaseController {
@@ -65,7 +62,11 @@
convert(param, wrapper);
hostEq(wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(nodeService.selectPage(new Page<>(curr, limit), wrapper));
+ Page<Node> nodePage = nodeService.selectPage(new Page<>(curr, limit), wrapper);
+ if (nodePage.getRecords().isEmpty()) {
+ nodePage = nodeService.selectPage(new Page<>(curr, limit), new EntityWrapper<Node>().eq("id",param.get("parent_id")));
+ }
+ return R.ok(nodePage);
}
@RequestMapping(value = "/node/list/tree/auth")
@@ -306,7 +307,7 @@
}
@RequestMapping("/work/stock/pakout")
- @ManagerAuth(memo = "鐢熸垚鎷ｈ揣鍗�")
+ @ManagerAuth(memo = "鍑哄簱")
public R initPakout(@RequestBody List<InitPakoutParam> params) {
return nodeService.initPakout(params, getUserId(), getHostId());
}
@@ -324,4 +325,12 @@
nodeService.locMove(sourceLocNo, targetLocNo, getUserId());
return R.ok("绉诲簱鍚姩鎴愬姛");
}
+ @RequestMapping(value = "/node/select/{id}/auth")
+ @ManagerAuth
+ public R getById(@PathVariable("id") String id) {
+ Node node = nodeService.selectOne(new EntityWrapper<Node>()
+ .eq("uuid",id));
+ return R.ok(node);
+ }
+
}
--
Gitblit v1.9.1