From 43a8037b60150b65651c03fd654621d37075d051 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 16 四月 2025 18:00:26 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 insertions(+), 7 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 b99f16b..d5022a8 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
@@ -2,6 +2,7 @@
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;
@@ -43,7 +44,11 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Loc, BaseParam> pageParam = new PageParam<>(baseParam, Loc.class);
- return R.ok().add(locService.page(pageParam, pageParam.buildWrapper(true)));
+ List<String> list = new ArrayList<>();
+ list.add("row");
+ list.add("col");
+ list.add("lev");
+ return R.ok().add(locService.page(pageParam, pageParam.buildWrapper(true,list)));
}
@PreAuthorize("hasAuthority('manager:loc:list')")
@@ -98,14 +103,14 @@
@Transactional(rollbackFor = Exception.class)
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 (!locService.updateById(loc)) {
return R.error("Update Fail");
}
-
if (!locService.updateLoc(loc)) {
throw new CoolException("搴撲綅绫诲瀷鍏宠仈鍏崇郴淇敼澶辫触!@锛�");
}
@@ -166,6 +171,8 @@
if (Objects.isNull(locs)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
+ locs.setCreateBy(getLoginUserId());
+ locs.setUpdateBy(getLoginUserId());
return locService.batchBindLocs(locs);
}
@@ -175,12 +182,36 @@
@PostMapping("/loc/init")
public R initLocInfo(@Valid @RequestBody LocMastInitParam param) {
if (Objects.isNull(param)) {
- throw new CoolException("鍒濆鍖栦俊鎭笉鑳戒负绌猴紒锛�");
+ return R.error("鍒濆鍖栦俊鎭笉鑳戒负绌猴紒锛�");
+ }
+ 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())) {
- throw new CoolException("搴撳尯ID涓嶈兘涓虹┖锛侊紒");
+ return R.error("搴撳尯ID涓嶈兘涓虹┖锛侊紒");
}
- return locService.initLocs(param);
+ if (Objects.isNull(param.getStartRow())) {
+ return R.error("璧峰鎺掍笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(param.getEndRow())) {
+ return R.error("缁堟鎺掍笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(param.getStartBay())) {
+ return R.error("璧峰鍒椾笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(param.getEndBay())) {
+ return R.error("缁堟鍒椾笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(param.getStartLev())) {
+ return R.error("璧峰灞備笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(param.getEndLev())) {
+ return R.error("缁堟灞備笉鑳戒负绌猴紒锛�");
+ }
+ return locService.initLocs(param, getLoginUserId());
}
}
--
Gitblit v1.9.1