From 404b933adebf3e43722a018e560c8ad2c4774e2d Mon Sep 17 00:00:00 2001
From: admin <841110950@qq.com>
Date: 星期二, 31 八月 2021 14:50:31 +0800
Subject: [PATCH] 1.0.6
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 48 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index b4eef0a..da624a0 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -11,7 +11,9 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.LocMast;
import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.service.LocMastService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -24,13 +26,24 @@
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private LocMastService locMastService;
+
+ @RequestMapping(value = "/locDetl/update")
+ public R update1() {
+ if (!locDetlService.updateLocNo("0402805", "0402804")) {
+ return R.error();
+ }
+ return R.ok();
+ }
+
@RequestMapping(value = "/locDetl/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
return R.ok(locDetlService.selectById(String.valueOf(id)));
}
- @RequestMapping(value = "/locDetl/auth")
+ @GetMapping(value = "/locDetl/auth")
@ManagerAuth
public R stockOutList(@RequestParam(value = "locNos[]") List<String> locNos){
if (!locNos.isEmpty()) {
@@ -96,6 +109,34 @@
}
}
+
+ @RequestMapping(value = "/locDetl/list/sts")
+ @ManagerAuth
+ public R stsList(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
+ @RequestParam Map<String, Object> param){
+ excludeTrash(param);
+ String value= null;
+ for (String s : param.keySet()) {
+ value= (String) param.get(s);
+ }
+ LocMast loc_no = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", value));
+ if (loc_no.getLocSts().equals("O")||loc_no.getLocSts().equals("F")){
+ EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
+ convert(param, wrapper);
+ allLike(LocDetl.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(locDetlService.selectPage(new Page<>(curr, limit), wrapper));
+ }else {
+ return R.error("璇ュ簱浣嶅綋鍓嶇姸鎬佷笉鑳借皟鏁�");
+ }
+ }
+
+
+
@RequestMapping(value = "/locDetl/add/auth")
@ManagerAuth(memo = "搴撲綅鏄庣粏娣诲姞")
public R add(LocDetl locDetl) {
@@ -110,7 +151,7 @@
@RequestMapping(value = "/locDetl/update/auth")
@ManagerAuth(memo = "搴撲綅鏄庣粏淇敼")
public R update(LocDetl locDetl){
- if (Cools.isEmpty(locDetl) || null==locDetl.getMatnr()){
+ if (Cools.isEmpty(locDetl) || null==locDetl.getMatNo()){
return R.error();
}
locDetl.setModiUser(getUserId());
@@ -147,13 +188,13 @@
@ManagerAuth
public R query(String condition) {
EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
- wrapper.like("matnr", condition);
+ wrapper.like("mat_no", condition);
Page<LocDetl> page = locDetlService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (LocDetl locDetl : page.getRecords()){
Map<String, Object> map = new HashMap<>();
- map.put("id", locDetl.getMatnr());
- map.put("value", locDetl.getMatnr());
+ map.put("id", locDetl.getMatNo());
+ map.put("value", locDetl.getMatNo());
result.add(map);
}
return R.ok(result);
@@ -169,4 +210,6 @@
return R.ok();
}
+
+
}
--
Gitblit v1.9.1