From f28b3a9131d2313a889f4a3156dcfabcefce7a84 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期六, 30 十二月 2023 13:41:07 +0800 Subject: [PATCH] Merge branch 'master' of http://47.97.1.152:5880/r/zy-asrs-master --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasDevpController.java | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasDevpController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasDevpController.java index 043e337..1c9f4d5 100644 --- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasDevpController.java +++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasDevpController.java @@ -7,6 +7,7 @@ import com.zy.asrs.common.wms.entity.BasDevp; import com.zy.asrs.common.wms.service.BasDevpService; import com.zy.asrs.framework.annotations.ManagerAuth; +import com.zy.asrs.framework.common.BaseRes; import com.zy.asrs.framework.common.Cools; import com.zy.asrs.framework.common.R; import com.zy.asrs.framework.domain.KeyValueVo; @@ -69,10 +70,14 @@ } @RequestMapping(value = "/basDevp/delete/auth") - @ManagerAuth - public R delete(@RequestParam(value="ids[]") Long[] ids){ - for (Long id : ids){ - basDevpService.removeById(id); + @ManagerAuth(memo = "绔欑偣鍒犻櫎") + public R delete(@RequestParam String param){ + List<BasDevp> list = JSONArray.parseArray(param, BasDevp.class); + if (Cools.isEmpty(list)){ + return R.error(); + } + for (BasDevp entity : list){ + basDevpService.remove(new LambdaQueryWrapper<>(entity).eq(BasDevp::getHostId, getHostId())); } return R.ok(); } @@ -107,4 +112,14 @@ return R.ok().add(vos); } + @RequestMapping(value = "/basDevp/check/column/auth") + @ManagerAuth + public R query(@RequestBody JSONObject param) { + LambdaQueryWrapper<BasDevp> wrapper = new LambdaQueryWrapper<BasDevp>().eq(BasDevp::getDevNo, param.get("val")); + if (null != basDevpService.getOne(wrapper)){ + return R.parse(BaseRes.REPEAT).add(getComment(BasDevp.class, String.valueOf(param.get("key")))); + } + return R.ok(); + } + } -- Gitblit v1.9.1