From b5b1e08632b780133bb2346c017d6dab3c1e5533 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 22 七月 2025 14:46:50 +0800
Subject: [PATCH] #库位状态变更日志
---
src/main/java/com/zy/asrs/controller/ManLocDetlController.java | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ManLocDetlController.java b/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
index 85bc07c..178eef4 100644
--- a/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
@@ -1,5 +1,6 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
@@ -10,12 +11,14 @@
import com.zy.asrs.entity.param.LocDetlAdjustParam;
import com.zy.asrs.service.ManLocDetlService;
import com.zy.common.web.BaseController;
+import com.zy.system.entity.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
import java.util.Map;
@RestController
@@ -76,7 +79,8 @@
@RequestMapping("/manLocDetl/adjust/start")
@ManagerAuth(memo = "搴撳瓨璋冩暣")
public R locDetlAdjustStart(@RequestBody LocDetlAdjustParam param) {
- manLocDetlService.adjustLocDetl(param, getUserId(),getUser());
+ User user = getUser();
+ manLocDetlService.adjustLocDetl(param, getUserId(), user == null ? "" : user.getUsername());
return R.ok("搴撳瓨璋冩暣鎴愬姛");
}
@@ -93,6 +97,16 @@
Page<ManLocDetl> all = manLocDetlService.selectAllPage(manLocDetlPage);
return R.ok().add(all);
}
+
+ /*
+ 骞冲簱绉诲簱
+ */
+ @RequestMapping("/node/move/start")
+ public R nodeMoveStart(@RequestParam String sourceLocNo, @RequestParam String targetLocNo){
+ manLocDetlService.updateLocNo(targetLocNo,sourceLocNo);
+ return R.ok();
+ }
+
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
@@ -110,7 +124,34 @@
}
}
+ @RequestMapping(value = "/manLocDetl/export/auth")
+ @ManagerAuth(memo = "搴撲綅鏄庣粏瀵煎嚭")
+ public synchronized R export(@RequestBody JSONObject param){
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ EntityWrapper<ManLocDetl> wrapper = new EntityWrapper<>();
+ Map<String, Object> map = excludeTrash(param.getJSONObject("locDetl"));
+ String row = "";
+ if (map.get("row") != null) {
+ String chooseRow = (String) map.get("row");
+ if (chooseRow.length() == 1) {
+ row = "0" + chooseRow;
+ map.remove("row");
+ }else {
+ row = chooseRow;
+ map.remove("row");
+ }
+ }
+ convert(map, wrapper);
+ if (!row.equals("")){
+ wrapper.and()
+ .where("loc_no like '" +row +"%'");
+ }
+ List<ManLocDetl> list = manLocDetlService.selectList(wrapper);
+ list.forEach(m -> {
+ m.setMatnr(m.getMatnr() + " ");
+ });
-
+ return R.ok(exportSupport(list, fields));
+ }
}
--
Gitblit v1.9.1