From 2191824072549f0da35d73686a075e59b0196321 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 25 九月 2024 15:02:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wms-dev' into wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocTypeController.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocTypeController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocTypeController.java
index 2a608fd..8b15b9f 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocTypeController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocTypeController.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
+import com.zy.asrs.framework.exception.CoolException;
+import com.zy.asrs.wms.asrs.entity.enums.LocTypeHeightType;
import com.zy.asrs.wms.common.annotation.OperationLog;
import com.zy.asrs.wms.common.domain.BaseParam;
import com.zy.asrs.wms.common.domain.KeyValVo;
@@ -108,6 +110,32 @@
}
@PreAuthorize("hasAuthority('asrs:locType:list')")
+ @PostMapping("/locType/height/query")
+ public R heightQuery(@RequestParam(required = false) String condition) {
+ LocType parent = locTypeService.getOne(new LambdaQueryWrapper<LocType>().eq(LocType::getFlag, "locTypeHeight"));
+ if (parent == null) {
+ throw new CoolException("鐖剁骇绫诲瀷寮傚父");
+ }
+
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<LocType> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(LocType::getParentId, parent.getId());
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(LocType::getName, condition);
+ }
+ List<LocType> list = locTypeService.list(wrapper);
+ for (LocType locType : list) {
+ LocTypeHeightType locTypeHeightType = LocTypeHeightType.get(locType.getFlag());
+ if (locTypeHeightType == null) {
+ throw new CoolException("搴撲綅楂樺害绫诲瀷寮傚父");
+ }
+ KeyValVo keyValVo = new KeyValVo(locTypeHeightType.id, locTypeHeightType.desc);
+ vos.add(keyValVo);
+ }
+ return R.ok().add(vos);
+ }
+
+ @PreAuthorize("hasAuthority('asrs:locType:list')")
@PostMapping("/locType/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
ExcelUtil.build(ExcelUtil.create(locTypeService.list(), LocType.class), response);
--
Gitblit v1.9.1