From f6e0107233bd7fc000b77b3cc9164c5c00b16448 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期三, 10 三月 2021 11:19:56 +0800
Subject: [PATCH] 1.0.5 1.增加平仓入库功能 2.优化平仓管理出入库状态查询功能
---
src/main/java/com/zy/asrs/controller/LocNormalController.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocNormalController.java b/src/main/java/com/zy/asrs/controller/LocNormalController.java
index 275454e..14353d6 100644
--- a/src/main/java/com/zy/asrs/controller/LocNormalController.java
+++ b/src/main/java/com/zy/asrs/controller/LocNormalController.java
@@ -53,7 +53,9 @@
if (!Cools.isEmpty(orderByField)) {
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
}
- wrapper.eq("state", "1").or().eq("state", "2");
+ if (Cools.isEmpty(param.get("state"))) {
+ wrapper.eq("state", "1").or().eq("state", "2");
+ }
return R.ok(locNormalService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -142,4 +144,19 @@
locNormalService.pdaLocNormalIn(param.getNormalList());
return R.ok();
}
+
+ /* 骞充粨鍏ュ簱 */
+ @RequestMapping(value = "/locNormal/in")
+ @ManagerAuth(memo = "骞充粨鍏ュ簱")
+ @Transactional
+ public R locNormalIn(@RequestBody LocNormalParam param) {
+ Long userId = getUserId();
+ Date timeNow = new Date();
+ for (Integer i = 0; i < param.getNormalList().size(); i++) {
+ param.getNormalList().get(i).setAppeUser(userId);
+ param.getNormalList().get(i).setAppeTime(timeNow);
+ }
+ locNormalService.locNormalIn(param.getNormalList());
+ return R.ok();
+ }
}
--
Gitblit v1.9.1