From f21530d33ca23aeeba2ef073ac6b64422e4e26ca Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期四, 30 四月 2026 12:17:55 +0800
Subject: [PATCH] 库位编号规则和和CTU保持一致
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java
index 55201bd..e49435a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java
@@ -25,7 +25,9 @@
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
@Service("locService")
@@ -145,8 +147,8 @@
for (int b = param.getStartBay(); b <= param.getEndBay(); b++) {
for (int l = param.getStartLev(); l <= param.getEndLev(); l++) {
// 鑾峰彇搴撲綅鍙�
- String locNo = locStar + String.format("%d", r) + String.format("-%d", b) + String.format("-%d", l);
-// String locNo = Utils.zeroFill("A1", 2) + String.format("%03d", r) + String.format("%03d", b) + String.format("%02d", l);
+// String locNo = locStar + String.format("%d", r) + String.format("-%d", b) + String.format("-%d", l);
+ String locNo = Utils.zeroFill("A1", 2) + String.format("%03d", r) + String.format("%03d", b) + String.format("%02d", l);
Loc loc = new Loc();
loc.setCode(locNo)
.setUseStatus("O")
@@ -256,6 +258,11 @@
*/
@Override
public IPage<LocStockDto> getLocDetls(Page<Object> page) {
- return this.baseMapper.getLocDetls(page);
+ return getLocDetls(page, null);
+ }
+
+ @Override
+ public IPage<LocStockDto> getLocDetls(Page<Object> page, Map<String, Object> conds) {
+ return this.baseMapper.getLocDetls(page, conds == null ? Collections.emptyMap() : conds);
}
}
--
Gitblit v1.9.1