From 37286cd9b177e9a1b8f28bfbc054c8cfedec6a5e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 26 八月 2021 08:50:57 +0800
Subject: [PATCH] Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xgmasrs
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 12 +++++++-----
1 files changed, 7 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 bfc5113..fa4279c 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -38,7 +38,7 @@
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()) {
@@ -118,7 +118,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());
@@ -155,13 +155,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);
@@ -177,4 +177,6 @@
return R.ok();
}
+
+
}
--
Gitblit v1.9.1