From 73de15331cb383949ae5adc230b208a04d987b37 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 26 十二月 2025 14:23:43 +0800
Subject: [PATCH] Merge branch 'devlop-phyz' of http://47.97.1.152:5880/r/wms-master into devlop-phyz
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java | 41 +++++++++++++++++++++++++++++------------
1 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
index 33d6939..da258bd 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
@@ -1,8 +1,6 @@
package com.vincent.rsf.server.manager.controller;
-import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
@@ -15,10 +13,11 @@
import com.vincent.rsf.server.manager.controller.params.LocMastInitParam;
import com.vincent.rsf.server.manager.controller.params.LocModifyParams;
import com.vincent.rsf.server.manager.entity.Loc;
+import com.vincent.rsf.server.manager.enums.CommonStatus;
+import com.vincent.rsf.server.manager.enums.LocStsType;
import com.vincent.rsf.server.manager.service.LocService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,7 +27,6 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
import java.util.*;
import java.util.stream.Collectors;
@@ -59,11 +57,22 @@
}
@PreAuthorize("hasAuthority('manager:loc:list')")
+ @ApiOperation(("鑾峰彇搴撲綅浣跨敤鐜�"))
+ @PostMapping("/loc/pie/list")
+ public R locPie() {
+ return R.ok().add(locService.getLocPies());
+ }
+
+ @PreAuthorize("hasAuthority('manager:loc:list')")
@PostMapping("/loc/areaNoUse/list")
public R areaNoUselist(@RequestBody Map<String, Object> map) {
String locCode = map.get("locCode").toString();
Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, locCode),false);
- List<Loc> list = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getAreaId, loc.getAreaId()));
+ List<Loc> list = locService.list(new LambdaQueryWrapper<Loc>()
+ .eq(Loc::getAreaId, loc.getAreaId())
+ .eq(!Objects.isNull(loc.getChannel()), Loc::getChannel,loc.getChannel())
+ .eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
+ );
List<String> list1 = list.stream().map(obj -> obj.getCode()).collect(Collectors.toList());
return R.ok(list1);
}
@@ -115,10 +124,17 @@
public R update(@RequestBody Loc loc) {
loc.setUpdateBy(getLoginUserId());
String join = StringUtils.join(loc.getTypeIds(), ",");
- loc.setType(join);
- if (Objects.isNull(loc.getTypeIds())) {
- throw new CoolException("搴撲綅绫诲瀷涓嶈兘涓虹┖锛侊紒");
+ if (!Objects.isNull(loc.getTypeIds())) {
+ loc.setType(join);
}
+ if (Objects.isNull(loc.getTypeIds()) && !Objects.isNull(loc.getType())) {
+ loc.setTypeIds(Arrays.asList(Long.valueOf(loc.getType())));
+ }
+
+ if (loc.getStatus().equals(CommonStatus.COMMONSTATUS_NO.val)) {
+ loc.setUseStatus(LocStsType.LOC_STS_TYPE_X.type);
+ }
+
if (!locService.updateById(loc)) {
return R.error("Update Fail");
}
@@ -160,7 +176,7 @@
if (Objects.isNull(map.get("ids"))) {
locs = locService.list();
} else {
- locs = locService.list(new LambdaQueryWrapper<Loc>().in(Loc::getId , map.get("ids")).eq(Loc::getStatus, 1));
+ locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getStatus, 1));
}
ExcelUtil.build(ExcelUtil.create(locs, Loc.class), response);
}
@@ -198,9 +214,6 @@
if (Objects.isNull(param.getTypeIds()) && param.getTypeIds().isEmpty()) {
return R.error("搴撲綅绫诲瀷涓嶈兘涓虹┖锛侊紒");
}
- if (Objects.isNull(param.getWarehouseId())) {
- return R.error("浠撳簱ID涓嶈兘涓虹┖锛侊紒");
- }
if (Objects.isNull(param.getAreaId())) {
return R.error("搴撳尯ID涓嶈兘涓虹┖锛侊紒");
}
@@ -222,6 +235,10 @@
if (Objects.isNull(param.getEndLev())) {
return R.error("缁堟灞備笉鑳戒负绌猴紒锛�");
}
+ if (Objects.isNull(param.getChannel())) {
+ return R.error("宸烽亾涓嶈兘涓虹┖锛侊紒");
+ }
+
return locService.initLocs(param, getLoginUserId());
}
--
Gitblit v1.9.1