From 8e943b7104561c3b14cf223016698709c5ade4b5 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 03 二月 2026 15:37:26 +0800
Subject: [PATCH] #pda料箱组托和换码
---
src/main/java/com/zy/asrs/controller/NodeController.java | 95 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 72 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/NodeController.java b/src/main/java/com/zy/asrs/controller/NodeController.java
index 8d9aace..94c8ee4 100644
--- a/src/main/java/com/zy/asrs/controller/NodeController.java
+++ b/src/main/java/com/zy/asrs/controller/NodeController.java
@@ -15,6 +15,8 @@
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;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.NodeService;
import com.zy.common.entity.NodeExcel;
@@ -46,13 +48,13 @@
private ManLocDetlMapper manLocDetlMapper;
@RequestMapping(value = "/node/{id}/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "response.node_detail")
public R get(@PathVariable("id") String id) {
return R.ok(nodeService.selectById(String.valueOf(id)));
}
@RequestMapping(value = "/node/list/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "response.node_list")
public R list(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam(required = false)String orderByField,
@@ -67,7 +69,7 @@
}
@RequestMapping(value = "/node/list/tree/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "response.node_tree_list")
public R listTree(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam(required = false)String orderByField,
@@ -78,11 +80,13 @@
convert(param, wrapper);
hostEq(wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.parse("0-鎿嶄綔鎴愬姛").add(nodeService.selectList(wrapper));
+ R r = R.ok();
+ r.put("data",nodeService.selectList(wrapper));
+ return r;
}
@RequestMapping(value = "/node/tree/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "response.node_tree")
public R tree(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam(required = false)String orderByField,
@@ -93,7 +97,9 @@
convert(param, wrapper);
hostEq(wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.parse("0-鎿嶄綔鎴愬姛").add(nodeService.selectList(wrapper));
+ R r = R.ok();
+ r.put("data",nodeService.selectList(wrapper));
+ return r;
}
private void convert(Map<String, Object> map, EntityWrapper wrapper){
@@ -110,16 +116,16 @@
}
@RequestMapping(value = "/node/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "response.node_add")
public R add(Node node) {
Node node1 = nodeService.selectByUuid(node.getName());
if (!Cools.isEmpty(node1)) {
- throw new CoolException("璇ョ紪鍙�/鍚嶇О宸插瓨鍦�");
+ throw new CoolException("response.code_or_name_exists");
}
if (node.getType() != 1) {
Node parentNode = nodeService.selectById(node.getParentId());
if (parentNode == null || parentNode.getStatus() == 0) {
- return R.error(node.getType()==2?"鎵�灞炰粨搴撲笉瀛樺湪":"鎵�灞炲簱鍖轰笉瀛樺湪");
+ return R.error(node.getType()==2?"response.parent_warehouse_not_exist":"response.parent_zone_not_exist");
}
node.setParentName(parentNode.getName());
node.setLevel(parentNode.getLevel() + 1);
@@ -144,19 +150,19 @@
@RequestMapping(value = "/node/update/auth")
- @ManagerAuth
- public R update(Node node){
+ @ManagerAuth(memo = "response.node_update")
+ public R update(Node node) {
Node node1 = nodeService.selectByUuid(node.getName());
if (!Cools.isEmpty(node1)) {
- throw new CoolException("璇ョ紪鍙�/鍚嶇О宸插瓨鍦�");
+ throw new CoolException("response.code_or_name_exists");
}
if (Cools.isEmpty(node) || null==node.getId()){
- return R.error();
+ return R.error("response.param_error");
}
if (node.getType() != 1) {
Node parentNode = nodeService.selectById(node.getParentId());
if (parentNode == null || parentNode.getStatus() == 0) {
- return R.error(node.getType()==2?"鎵�灞炰粨搴撲笉瀛樺湪":"鎵�灞炲簱鍖轰笉瀛樺湪");
+ return R.error(node.getType()==2?"response.parent_warehouse_not_exist":"response.parent_zone_not_exist");
}
node.setParentName(parentNode.getName());
node.setLevel(parentNode.getLevel() + 1);
@@ -176,11 +182,11 @@
}
@RequestMapping(value = "/node/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "response.node_delete")
public R delete(@RequestParam String param){
List<Node> list = JSONArray.parseArray(param, Node.class);
if (Cools.isEmpty(list)){
- return R.error();
+ return R.error("response.param_error");
}
for (Node entity : list){
nodeService.delete(new EntityWrapper<>(entity));
@@ -189,7 +195,7 @@
}
@RequestMapping(value = "/node/delete0/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "response.node_delete")
public R delete(@RequestParam(value="ids[]") Long[] ids){
for (Long id : ids){
nodeService.deleteById(id);
@@ -198,7 +204,7 @@
}
@RequestMapping(value = "/node/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "response.node_export")
public R export(@RequestBody JSONObject param){
EntityWrapper<Node> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
@@ -230,7 +236,9 @@
public R query(@RequestBody JSONObject param) {
Wrapper<Node> wrapper = new EntityWrapper<Node>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
if (null != nodeService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(Node.class, String.valueOf(param.get("key"))));
+ R r = R.parse(BaseRes.REPEAT);
+ r.put("data", getComment(Node.class, String.valueOf(param.get("key"))));
+ return r;
}
return R.ok();
}
@@ -251,7 +259,9 @@
map.put("val", node.getName());
result.add(map);
}
- return R.ok().add(result);
+ R r = R.ok();
+ r.put("data",result);
+ return r;
}
@PostMapping(value = "/node/tree/auth")
@@ -277,7 +287,7 @@
List<NodeExcel> excels = new ArrayList<>();
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf-8");
- String fileName = URLEncoder.encode("璐т綅妗ｆExcel瀵煎叆妯℃澘", "UTF-8");
+ String fileName = URLEncoder.encode("response.node_excel_template_name", "UTF-8");
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
EasyExcel.write(response.getOutputStream(), NodeExcel.class)
.registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
@@ -287,12 +297,51 @@
// excel瀵煎叆
@PostMapping(value = "/node/excel/import/auth")
- @ManagerAuth(memo = "璐т綅妗ｆ鏁版嵁瀵煎叆")
+ @ManagerAuth(memo = "response.node_excel_import")
@Transactional
public R nodeExcelImport(MultipartFile file) throws IOException {
NodeExcelListener listener = new NodeExcelListener(getUserId(), getHostId());
EasyExcel.read(file.getInputStream(), NodeExcel.class, listener).sheet().doRead();
- return R.ok("鎴愬姛鍚屾"+listener.getTotal()+"涓揣浣�");
+ R r = R.ok("response.sync_success_count");
+ r.put("count", listener.getTotal());
+ return r;
+ }
+
+ /*************************************** 鍏ュ簱鍑虹浉鍏� ***********************************************/
+
+ @RequestMapping("/work/stock/pakin")
+ @ManagerAuth(memo = "response.inbound")
+ public R stockPakin(@RequestBody PakinParam number) {
+ return nodeService.stockPakin(number, getUserId(), getHostId());
+ }
+
+ @RequestMapping("/work/stock/pakout")
+ @ManagerAuth(memo = "response.outbound")
+ public R initPakout(@RequestBody List<InitPakoutParam> params) {
+ return nodeService.initPakout(params, getUserId(), getHostId());
+ }
+
+ @PostMapping(value = "/work/empty/stock")
+ public R getGroupEmptyStock(@RequestParam(required = false) String sourceLocNo) {
+ List<Node> allEmptys = nodeService.selectList(new EntityWrapper<Node>()
+ .eq("type","3"));
+ R r = R.ok();
+ r.put("data", allEmptys);
+ return r;
+ }
+ @RequestMapping("/work/move/start")
+ @ManagerAuth(memo = "response.location_transfer")
+ public R locMoveStart(@RequestParam String sourceLocNo,
+ @RequestParam String targetLocNo) {
+ nodeService.locMove(sourceLocNo, targetLocNo, getUserId());
+ return R.ok("response.move_start_success");
+ }
+ @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