From a6750821eef3ce19069e5130df59ffe0ef3318ab Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 15 一月 2026 07:53:26 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 723e3f6..b72e411 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -46,6 +46,8 @@
private WrkMastLogService wrkMastLogService;
@Resource
private WrkDetlLogService wrkDetlLogService;
+ @Autowired
+ private BasAreasService basAreasService;
@RequestMapping(value = "/locMast/init/pwd")
public R locMastInitPwd(@RequestParam(required = false) String pwd) {
@@ -76,6 +78,8 @@
@RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
+ wrapper.eq("frozen", 0)
+ .eq("deleted", 0);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)) {
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
@@ -282,6 +286,15 @@
if (Cools.isEmpty(basWhsType)) {
return R.error("搴撳瀷涓嶅瓨鍦紒锛侊紒");
}
+
+ if (Objects.isNull(param.getAreaId())) {
+ throw new CoolException("搴撳尯ID涓嶈兘涓虹┖锛侊紒锛�");
+ }
+ BasAreas basAreas = basAreasService.selectById(param.getAreaId());
+ if (Cools.isEmpty(basAreas)) {
+ return R.error("搴撳尯涓嶅瓨鍦紒锛侊紒");
+ }
+
for (int r = param.getStartRow(); r <= param.getEndRow(); r++) {
for (int b = param.getStartBay(); b <= param.getEndBay(); b++) {
for (int l = param.getStartLev(); l <= param.getEndLev(); l++) {
@@ -320,6 +333,8 @@
locMast.setAppeUser(getUserId());
locMast.setAppeTime(now);
locMast.setModiUser(getUserId());
+ locMast.setAreaId(basAreas.getId());
+ locMast.setAreaName(basAreas.getName());
locMast.setModiTime(now);
locMast.setWhsType(basWhsType.getId());
list.add(locMast);
--
Gitblit v1.9.1