From 0ab29c6d89777a832e21c5d2934e3e3e1544c6d8 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期日, 19 十月 2025 08:51:46 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 9763ded..59bf434 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -176,7 +176,7 @@
@ManagerAuth(memo = "鍒濆鍖栧簱浣�")
// @Transactional
public R init(LocMastInitParam param) {
- List<LocMast> list = new ArrayList<>();
+ List<LocMast> list = new ArrayList<>();
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++) {
@@ -184,10 +184,16 @@
String locNo = String.format("%02d", r) + String.format("%03d", b) + String.format("%02d", l);
// 鑾峰彇鍫嗗灈鏈哄彿
int crnNo = 0;
- Shelves shelves = new Shelves(param.getEndRow() - param.getStartRow() + 1, param.getCrnAmount());
+ Shelves shelves = new Shelves(param.getEndRow() - param.getStartRow() + 1, param.getCrnAmount(),param.getStartRow());
for (List<Integer> node : shelves.nodes){
+
if (node.contains(r)) {
- crnNo = shelves.nodes.indexOf(node) + 1;
+ if (!Cools.isEmpty(param.getStaCrn()) && param.getStaCrn() > 0){
+ crnNo = shelves.nodes.indexOf(node) + param.getStaCrn();
+ }else {
+ crnNo = shelves.nodes.indexOf(node) + 1;
+ }
+
break;
}
}
@@ -210,8 +216,9 @@
}
}
}
- locMastService.delete(new EntityWrapper<>());
- locDetlService.delete(new EntityWrapper<>());
+ if (!Cools.isEmpty(param.getEnable()) && param.getEnable() == 1){
+ locMastService.delete(new EntityWrapper<>());
+ }
locMastService.insertBatch(list);
return R.ok("鍒濆鍖栨垚鍔�");
}
--
Gitblit v1.9.1