From be32a8ddbcbb4f6e7b707e6ef8d6c24c05a48897 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 16 六月 2023 16:02:55 +0800
Subject: [PATCH] #出入库日志修改
---
src/main/java/com/zy/asrs/controller/NodeController.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/NodeController.java b/src/main/java/com/zy/asrs/controller/NodeController.java
index 2128e02..918c71c 100644
--- a/src/main/java/com/zy/asrs/controller/NodeController.java
+++ b/src/main/java/com/zy/asrs/controller/NodeController.java
@@ -314,13 +314,13 @@
if (node.getType() != 3) {
return R.error("浠呭彲閫夋嫨璐т綅");
}
- return nodeService.stockPakin(number, getUserId(), getHostId());
+ return nodeService.stockPakin(number, getUserId(), getHostId(),getUser());
}
@RequestMapping("/work/stock/pakout")
@ManagerAuth(memo = "鍑哄簱")
public R initPakout(@RequestBody List<InitPakoutParam> params) {
- return nodeService.initPakout(params, getUserId(), getHostId());
+ return nodeService.initPakout(params, getUserId(), getHostId(),getUser());
}
@PostMapping(value = "/work/empty/stock")
@@ -333,7 +333,7 @@
@ManagerAuth(memo = "搴撲綅绉昏浆")
public R locMoveStart(@RequestParam String sourceLocNo,
@RequestParam String targetLocNo) {
- nodeService.locMove(sourceLocNo, targetLocNo, getUserId());
+ nodeService.locMove(sourceLocNo, targetLocNo, getUserId(),getUser());
return R.ok("绉诲簱鍚姩鎴愬姛");
}
@RequestMapping(value = "/node/select/{id}/auth")
@@ -354,11 +354,16 @@
nodeEntityWrapper.eq("name",param.getName());
nodeService.delete(new EntityWrapper<Node>().eq("parent_id",param.getValue()));
Node node = nodeService.selectOne(nodeEntityWrapper);
+ String[] string = node.getNamePath().split(",");
for (int r=param.getStartRow(); r<=param.getEndRow(); r++){
for (int b=param.getStartBay(); b<=param.getEndBay(); b++) {
for (int l=param.getStartLev(); l<=param.getEndLev(); l++) {
// 鑾峰彇搴撲綅鍙�
- String locNo = param.getName()+"-" +String.format("%02d", r) + String.format("%02d", b) + String.format("%02d", l);
+ String locNo;
+
+ locNo = param.getName()+"-" +String.format("%02d", r) + String.format("%02d", b) + String.format("%02d", l);
+
+
Date now = new Date();
Node node1 = new Node();
--
Gitblit v1.9.1