From 67826a2c51bbc013db409dd1a5e29dd4ba52fd72 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 20 一月 2026 09:27:47 +0800
Subject: [PATCH] 初始化
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 76 +++++++++++++++++++++++++++++++++++--
1 files changed, 71 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 ada5b7d..ae04df8 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -23,6 +23,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import javax.validation.constraints.Size;
import java.util.*;
@RestController
@@ -176,7 +177,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 +185,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,9 +217,68 @@
}
}
}
-// 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("鍒濆鍖栨垚鍔�");
}
+
+ @RequestMapping(value = "/locMast/list/auth/lev")
+ @ManagerAuth
+ public R listLev(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+ excludeTrash(param);
+ EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
+ convertLev(param, wrapper);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private <T> void convertLev(Map<String, Object> map, EntityWrapper<T> wrapper){
+ String sizeValue = null;
+
+ // 绗竴姝ワ細鍏堝鐞唖ize鍙傛暟
+ if (map.containsKey("size")) {
+ sizeValue = String.valueOf(map.get("size"));
+ map.remove("size"); // 浠巑ap涓Щ闄わ紝閬垮厤鍚庨潰閲嶅澶勭悊
+
+ if (sizeValue.equals("2000*1500*170")){
+ wrapper.in("lev1", Arrays.asList(4, 5)).andNew().eq("crn_no", 1);
+ }else if (sizeValue.equals("1500*1500*170")){
+ wrapper.in("lev1", Arrays.asList(1, 2, 3)).andNew().eq("crn_no", 1);
+ }else if (sizeValue.equals("2600*1500*160")){
+ wrapper.in("lev1", Arrays.asList(1, 2)).andNew().eq("crn_no", 2);
+ }else if (sizeValue.equals("1300*1500*160")){
+ wrapper.in("lev1", Arrays.asList(3, 4, 5, 6)).andNew().eq("crn_no", 2);
+ }
+ }
+
+ // 绗簩姝ワ細澶勭悊鍏朵粬鍙傛暟
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ String key = entry.getKey();
+ String val = String.valueOf(entry.getValue());
+
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(key, DateUtils.convert(dates[0]));
+ wrapper.le(key, DateUtils.convert(dates[1]));
+ } else if (key.equals("loc_no")){
+ wrapper.like(key, val);
+ } else {
+ wrapper.eq(key, val);
+ }
+ }
+
+ // 绗笁姝ワ細濡傛灉娌℃湁size鍙傛暟锛屽垯娣诲姞榛樿鏉′欢
+ if (sizeValue == null) {
+ wrapper.eq("loc_sts", "D");
+ } else {
+ // 濡傛灉鏈塻ize鍙傛暟锛屾坊鍔爈oc_sts != 'Y'鐨勬潯浠�
+ wrapper.and().ne("loc_sts", "Y");
+ }
+ }
}
--
Gitblit v1.9.1