From 3bcfebe3912bdaf8abf2d29b6913b771bad3804c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 20 十月 2025 08:44:46 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index b664a1f..4ec9931 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -152,13 +152,13 @@
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 (!Cools.isEmpty(param.get("appe_time"))){
+ String val = String.valueOf(param.get("appe_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");
+ param.remove("appe_time");
}
}
Page<LocDetl> stockOut = locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class));
@@ -379,9 +379,13 @@
@RequestParam Map<String, Object> param) {
Page<LocDetl> stockStatis = locDetlService.getStockStatis(toPage(curr, limit, param, LocDetl.class));
for (LocDetl locDetl : stockStatis.getRecords()) {
+ Double weight = locDetl.getWeight();
+ String standby1 = locDetl.getStandby1();
Mat mat = matService.selectByMatnr(locDetl.getMatnr());
if (mat != null) {
locDetl.sync(mat);
+ locDetl.setStandby1(standby1);
+ locDetl.setWeight(weight);
}
}
return R.ok().add(stockStatis);
@@ -420,4 +424,14 @@
return R.ok(sum);
}
+ /**
+ * 鑾峰彇搴撳瓨鎬绘暟
+ * @return
+ */
+ @RequestMapping("/locDetl/count2")
+ public R getAllCount2(){
+ Integer sum = locDetlService.sum2();
+ return R.ok(sum);
+ }
+
}
--
Gitblit v1.9.1