From ae5401a34b32643b2db847b4e5266758e63cd7aa Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 18 六月 2020 13:13:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 7009309..8ece97a 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -5,14 +5,16 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.service.LocMastService;
-import com.zy.common.web.BaseController;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.param.LocMastInitParam;
+import com.zy.asrs.service.LocMastService;
+import com.zy.common.model.Shelves;
+import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -57,7 +59,7 @@
}
@RequestMapping(value = "/locMast/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "搴撲綅娣诲姞")
public R add(LocMast locMast) {
locMast.setModiUser(getUserId());
locMast.setModiTime(new Date());
@@ -68,7 +70,7 @@
}
@RequestMapping(value = "/locMast/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "搴撲綅淇敼")
public R update(LocMast locMast){
if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
return R.error();
@@ -80,7 +82,7 @@
}
@RequestMapping(value = "/locMast/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "搴撲綅鍒犻櫎")
public R delete(@RequestParam String param){
List<LocMast> list = JSONArray.parseArray(param, LocMast.class);
if (Cools.isEmpty(list)){
@@ -93,7 +95,7 @@
}
@RequestMapping(value = "/locMast/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "搴撲綅瀵煎嚭")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
@@ -129,4 +131,45 @@
return R.ok();
}
+ @RequestMapping(value = "/locMast/init/auth")
+ @ManagerAuth(memo = "鍒濆鍖栧簱浣�")
+// @Transactional
+ public R init(LocMastInitParam param) {
+ List<LocMast> list = new ArrayList<>();
+ 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 = String.format("%02d", r) + String.format("%03d", b) + String.format("%02d", l);
+ // 鑾峰彇鍫嗗灈鏈哄彿
+ int crnNo = 0;
+ Shelves shelves = new Shelves(param.getEndRow() - param.getStartRow() + 1, param.getCrnAmount());
+ for (List<Integer> node : shelves.nodes){
+ if (node.contains(r)) {
+ crnNo = shelves.nodes.indexOf(node) + 1;
+ break;
+ }
+ }
+ LocMast locMast = new LocMast();
+ locMast.setLocNo(locNo);
+ locMast.setLocType("O");
+ locMast.setRow1(r); // 鎺�
+ locMast.setBay1(b); // 鍒�
+ locMast.setLev1(l); // 灞�
+ locMast.setCrnNo(crnNo); // 鍫嗗灈鏈�
+ if (null != param.getWhsType()) {
+ locMast.setWhsType(Long.valueOf(param.getWhsType()));
+ }
+ locMast.setAppeUser(getUserId());
+ locMast.setAppeTime(new Date());
+ locMast.setModiUser(getUserId());
+ locMast.setModiTime(new Date());
+ list.add(locMast);
+ }
+ }
+ }
+ locMastService.delete(new EntityWrapper<>());
+ locMastService.insertBatch(list);
+ return R.ok("鍒濆鍖栨垚鍔�");
+ }
}
--
Gitblit v1.9.1