From cf73a80b2d981a22b1d22f209ecef0ad2e673a56 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 31 七月 2020 08:24:14 +0800
Subject: [PATCH] #当前本版十分完美、冻结
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 1904569..bfc5113 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -24,10 +24,34 @@
@Autowired
private LocDetlService locDetlService;
+ @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")
+ @ManagerAuth
+ public R stockOutList(@RequestParam(value = "locNos[]") List<String> locNos){
+ if (!locNos.isEmpty()) {
+ List<LocDetl> res = new ArrayList<>();
+ for (String locNo : new HashSet<>(locNos)) {
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo));
+ if (!locDetls.isEmpty()) {
+ res.addAll(locDetls);
+ }
+ }
+ return R.ok().add(res);
+ }
+ return R.parse(BaseRes.EMPTY);
}
@RequestMapping(value = "/stock/out/list/auth")
@@ -35,7 +59,16 @@
public R stockOutList(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam Map<String, Object> param){
- return R.ok(locDetlService.getStockOut(new Page<LocDetl>(curr, limit).setCondition(param)));
+ if (!Cools.isEmpty(param.get("modi_time"))){
+ String val = String.valueOf(param.get("modi_time"));
+ if (val.contains(RANGE_TIME_LINK)) {
+ String[] dates = val.split(RANGE_TIME_LINK);
+ param.put("startTime", DateUtils.convert(dates[0]));
+ param.put("endTime", DateUtils.convert(dates[1]));
+ param.remove("modi_time");
+ }
+ }
+ return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)));
}
@RequestMapping(value = "/locDetl/list/auth")
@@ -44,22 +77,29 @@
@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);
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));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
- if (entry.getKey().endsWith(">")) {
- wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
- } else if (entry.getKey().endsWith("<")) {
- wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- wrapper.eq(entry.getKey(), String.valueOf(entry.getValue()));
+ if (entry.getKey().equals("locNo")) {
+ wrapper.eq("loc_no", String.valueOf(entry.getValue()));
+ } else {
+ wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
+ }
}
}
}
--
Gitblit v1.9.1