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/LocDetlController.java | 48 ++++++------------------------------------------
1 files changed, 6 insertions(+), 42 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 8dc443a..f6a802f 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -13,9 +13,12 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.ManLocDetl;
import com.zy.asrs.entity.Mat;
+import com.zy.asrs.entity.StockStatisDTO;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.service.ManLocDetlService;
import com.zy.asrs.service.MatService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -57,27 +60,9 @@
if (!locNos.isEmpty()) {
List<LocDetl> res = new ArrayList<>();
for (String locNo : new HashSet<>(locNos)) {
- List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo));
- if (!locDetls.isEmpty()) {
- res.addAll(locDetls);
- }
- }
- return R.ok().add(res);
- }
- return R.parse(BaseRes.EMPTY);
- }
-
- @RequestMapping(value = "/locDetlOut/auth")
- @ManagerAuth
- public R stockOutListAll(@RequestParam(value = "locNos[]") List<String> locNos,@RequestParam(value = "matnrs[]",required = false) List<String> matnrs){
- if (!locNos.isEmpty()&&!matnrs.isEmpty()) {
- List<LocDetl> res = new ArrayList<>();
- for (String locNo : new HashSet<>(locNos)) {
- for (String matnr : new HashSet<>(matnrs)) {
- List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("matnr",matnr).eq("loc_no",locNo));
- if (!locDetls.isEmpty()) {
- res.addAll(locDetls);
- }
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo));
+ if (!locDetls.isEmpty()) {
+ res.addAll(locDetls);
}
}
return R.ok().add(res);
@@ -88,27 +73,6 @@
@RequestMapping(value = "/stock/out/list/auth")
@ManagerAuth
public R stockOutList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
- if (!Cools.isEmpty(param.get("modi_time"))){
- String val = String.valueOf(param.get("modi_time"));
- if (val.contains(RANGE_TIME_LINK)) {
- String[] dates = val.split(RANGE_TIME_LINK);
- param.put("startTime", DateUtils.convert(dates[0]));
- param.put("endTime", DateUtils.convert(dates[1]));
- param.remove("modi_time");
- }
- }
- Page<LocDetl> stockOut = locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class));
- if (stockOut.getRecords().size()==0){
- stockOut = locDetlService.getStockOut(toPage(1, limit, param, LocDetl.class));
- }
- return R.ok(stockOut);
- }
-
- @RequestMapping(value = "/clamp/out/list/auth")
- @ManagerAuth
- public R clampOutList(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam Map<String, Object> param){
if (!Cools.isEmpty(param.get("modi_time"))){
--
Gitblit v1.9.1