From f465076b186e7b815b596d12a7dfa219c68e1c85 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期三, 08 七月 2020 13:47:03 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/LocMastController.java | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java index fd8bade..8b17005 100644 --- a/src/main/java/com/zy/asrs/controller/LocMastController.java +++ b/src/main/java/com/zy/asrs/controller/LocMastController.java @@ -10,6 +10,7 @@ import com.core.common.Cools; 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.entity.param.LocMastInitParam; import com.zy.asrs.service.LocDetlService; @@ -38,6 +39,12 @@ return R.ok().add(Parameter.get().getLocMastInitPwd().equals(pwd)); } + @PostMapping(value = "/group/empty/stock") + @ManagerAuth(memo = "鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅") + public R getGroupEmptyStock(@RequestParam(required = false) String sourceLocNo) { + return R.ok().add(locMastService.queryGroupEmptyStock(sourceLocNo)); + } + @RequestMapping(value = "/locMast/{id}/auth") @ManagerAuth public R get(@PathVariable("id") String id) { @@ -58,14 +65,15 @@ return R.ok(locMastService.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.like(entry.getKey(), String.valueOf(entry.getValue())); + wrapper.like(entry.getKey(), val); } } } @@ -87,6 +95,13 @@ if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){ return R.error(); } + LocMast oldLocMast = locMastService.selectById(locMast.getLocNo()); + // 鏈夌墿鏂欐椂淇敼涓虹┖搴撲綅鎴栬�呯┖鏉垮簱浣嶏紝鍒欏垹闄ゅ簱瀛樻槑缁� + if (oldLocMast.getLocType().equals("R") || oldLocMast.getLocType().equals("F")) { + if (locMast.getLocType().equals("O") || locMast.getLocType().equals("D")) { + locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo())); + } + } locMast.setModiUser(getUserId()); locMast.setModiTime(new Date()); locMastService.updateById(locMast); -- Gitblit v1.9.1