From 70930071a49190f414c8d8bc9c9e9795a4096739 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 23 三月 2026 16:08:27 +0800
Subject: [PATCH] Merge branch 'refs/heads/rcs_master' into jdxaj
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/LocController.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/LocController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/LocController.java
index cde1aa9..dd1496b 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/LocController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/LocController.java
@@ -203,9 +203,9 @@
Long userId = getLoginUserId();
for (Map<String, Object> row : rows) {
Zone zone = resolveZone(readCell(row, "zone"));
- Integer rowNo = parseInteger(row.get("row"), "row", true);
- Integer bayNo = parseInteger(row.get("bay"), "bay", true);
- Integer levNo = parseInteger(row.get("lev"), "lev", true);
+ Integer rowNo = parseInteger(row.get("row_no"), "row_no", true);
+ Integer bayNo = parseInteger(row.get("bay_no"), "bay_no", true);
+ Integer levNo = parseInteger(row.get("lev_no"), "lev_no", true);
String locNo = buildLocNo(zone, rowNo, bayNo, levNo);
if (locService.selectByLocNo(locNo) != null) {
continue;
@@ -221,9 +221,9 @@
loc.setZoneId(zone.getId());
loc.setUuid(locNo);
loc.setLocNo(locNo);
- loc.setRow(rowNo);
- loc.setBay(bayNo);
- loc.setLev(levNo);
+ loc.setRowNo(rowNo);
+ loc.setBayNo(bayNo);
+ loc.setLevNo(levNo);
loc.setLocSts(locStsId);
loc.setLocType(locTypeId);
@@ -330,17 +330,17 @@
return Cools.isEmpty(text) ? null : text;
}
- private String buildLocNo(Zone zone, Integer row, Integer bay, Integer lev) {
- if (zone == null || row == null || bay == null || lev == null) {
- throw new CoolException("zone/row/bay/lev cannot be null");
+ private String buildLocNo(Zone zone, Integer rowNo, Integer bayNo, Integer levNo) {
+ if (zone == null || rowNo == null || bayNo == null || levNo == null) {
+ throw new CoolException("zone/rowNo/bayNo/levNo cannot be null");
}
if (Cools.isEmpty(zone.getUuid())) {
throw new CoolException("zone uuid is empty");
}
return Utils.zeroFill(zone.getUuid(), 2)
- + String.format("%03d", row)
- + String.format("%03d", bay)
- + String.format("%02d", lev);
+ + String.format("%03d", rowNo)
+ + String.format("%03d", bayNo)
+ + String.format("%02d", levNo);
}
}
--
Gitblit v1.9.1