From 8bee8dfd9920c3564a593e973dcf507794f8ff23 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 25 三月 2021 17:07:20 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/PriorController.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 50 insertions(+), 0 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/PriorController.java b/src/main/java/zy/cloud/wms/manager/controller/PriorController.java
index bd1cb73..f12a80e 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/PriorController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/PriorController.java
@@ -13,7 +13,11 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import zy.cloud.wms.common.web.BaseController;
+import zy.cloud.wms.manager.entity.Mat;
+import zy.cloud.wms.manager.entity.Node;
import zy.cloud.wms.manager.entity.Prior;
+import zy.cloud.wms.manager.service.MatService;
+import zy.cloud.wms.manager.service.NodeService;
import zy.cloud.wms.manager.service.PriorService;
import java.util.*;
@@ -23,6 +27,26 @@
@Autowired
private PriorService priorService;
+ @Autowired
+ private MatService matService;
+ @Autowired
+ private NodeService nodeService;
+
+ @RequestMapping(value = "/safeSto/list/auth")
+ @ManagerAuth
+ public R safeStoList(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<Prior> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(priorService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ /***************************************************/
@RequestMapping(value = "/prior/{id}/auth")
@ManagerAuth
@@ -60,6 +84,19 @@
@RequestMapping(value = "/prior/add/auth")
@ManagerAuth
public R add(Prior prior) {
+ if (prior.getMatId() != null) {
+ Mat mat = matService.selectById(prior.getMatId());
+ if (mat != null) {
+ prior.setMatnr(mat.getMatnr());
+ prior.setMaktx(mat.getMaktx());
+ }
+ }
+ if (prior.getNodeId() != null) {
+ Node node = nodeService.selectById(prior.getNodeId());
+ if (node != null) {
+ prior.setNodeName(node.getName());
+ }
+ }
prior.setCreateBy(getUserId());
prior.setCreateTime(new Date());
prior.setUpdateBy(getUserId());
@@ -75,6 +112,19 @@
if (Cools.isEmpty(prior) || null==prior.getId()){
return R.error();
}
+ if (prior.getMatId() != null) {
+ Mat mat = matService.selectById(prior.getMatId());
+ if (mat != null) {
+ prior.setMatnr(mat.getMatnr());
+ prior.setMaktx(mat.getMaktx());
+ }
+ }
+ if (prior.getNodeId() != null) {
+ Node node = nodeService.selectById(prior.getNodeId());
+ if (node != null) {
+ prior.setNodeName(node.getName());
+ }
+ }
prior.setUpdateBy(getUserId());
prior.setUpdateTime(new Date());
priorService.updateById(prior);
--
Gitblit v1.9.1