From 8bc35cc4f75cfb435577e34763002f69def6a1a2 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期六, 07 二月 2026 16:53:18 +0800
Subject: [PATCH] 调试
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index ae04df8..a6d80f3 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -24,7 +24,9 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.Size;
+import java.math.BigDecimal;
import java.util.*;
+import java.util.stream.Collectors;
@RestController
public class LocMastController extends BaseController {
@@ -117,6 +119,7 @@
locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
}
}
+ locMast.setBarcode("");
locMast.setModiUser(getUserId());
locMast.setModiTime(new Date());
locMastService.updateById(locMast);
@@ -238,6 +241,40 @@
return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper));
}
+ @RequestMapping(value = "/locMast/list/auth/lev/clamp")
+ @ManagerAuth
+ public R listLevClamp(@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));}
+ Page<LocMast> pageResult = locMastService.selectPage(new Page<>(curr, limit), wrapper);
+ if (pageResult != null && pageResult.getRecords() != null && !pageResult.getRecords().isEmpty()) {
+ // 鑾峰彇鎵�鏈塴oc_no
+ List<String> locNos = pageResult.getRecords().stream()
+ .map(LocMast::getLocNo) // 鍋囪鏈塯etLocNo鏂规硶
+ .filter(Objects::nonNull)
+ .distinct()
+ .collect(Collectors.toList());
+ if (!Cools.isEmpty(locNos)) {
+ Map<String, Double> anfmeMap = locDetlService.getAnfmeByLocNos(locNos);
+ // 鏇存柊sc_weight瀛楁
+ for (LocMast locMast : pageResult.getRecords()) {
+ if (locMast.getLocNo() != null && anfmeMap.containsKey(locMast.getLocNo())) {
+ locMast.setScWeight(anfmeMap.get(locMast.getLocNo())); // 鍋囪鏈塻etScWeight鏂规硶
+ } else {
+ locMast.setScWeight(0.0); // 濡傛灉娌℃湁瀵瑰簲鏁版嵁锛岃涓�0鎴杗ull
+ }
+ }
+ }
+ }
+ return R.ok(pageResult);
+ }
+
private <T> void convertLev(Map<String, Object> map, EntityWrapper<T> wrapper){
String sizeValue = null;
@@ -275,7 +312,7 @@
// 绗笁姝ワ細濡傛灉娌℃湁size鍙傛暟锛屽垯娣诲姞榛樿鏉′欢
if (sizeValue == null) {
- wrapper.eq("loc_sts", "D");
+ wrapper.eq("loc_sts", map.get("loc_sts"));
} else {
// 濡傛灉鏈塻ize鍙傛暟锛屾坊鍔爈oc_sts != 'Y'鐨勬潯浠�
wrapper.and().ne("loc_sts", "Y");
--
Gitblit v1.9.1