From 5989655fcf8c34f9091b1d328f8950dad8267725 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期三, 22 五月 2024 14:11:32 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
index 7bb3f93..5d3bb49 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
@@ -51,8 +51,8 @@
wrapper.ge(LocDetl::getAppeTime, DateUtils.convert(range[0]));
wrapper.le(LocDetl::getAppeTime, DateUtils.convert(range[1]));
}
- if (!Cools.isEmpty(param.get("loc_no"))) {
- wrapper.eq(LocDetl::getLocNo, param.get("loc_no"));
+ if (!Cools.isEmpty(param.get("locNo"))) {
+ wrapper.eq(LocDetl::getLocNo, param.get("locNo"));
}
return R.ok(locDetlService.page(new Page<>(curr, limit), wrapper));
}
@@ -142,4 +142,22 @@
return R.ok(sum);
}
+ @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");
+ }
+ }
+ param.put("hostId", getHostId());
+ return R.ok(locDetlService.getStockOut(curr, limit, param));
+ }
+
}
--
Gitblit v1.9.1