From f2beaeeb5a1811dbc38b386d7a5b5d0f9c8c6f7c Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期五, 12 三月 2021 08:42:25 +0800
Subject: [PATCH] 1.0.3 pda新增平仓出库功能
---
src/main/java/com/zy/asrs/controller/LocNormalController.java | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 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..64d82cc 100644
--- a/src/main/java/com/zy/asrs/controller/LocNormalController.java
+++ b/src/main/java/com/zy/asrs/controller/LocNormalController.java
@@ -10,6 +10,7 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.sun.org.apache.bcel.internal.generic.NEW;
import com.zy.asrs.entity.LocNormal;
import com.zy.asrs.entity.param.LocNormalParam;
import com.zy.asrs.service.LocNormalService;
@@ -27,6 +28,7 @@
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -53,7 +55,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));
}
@@ -128,6 +132,21 @@
return R.ok("鎴愬姛瀵煎叆" + listener.getTotal() + "鏉＄墿鏂欎俊鎭�");
}
+ /* 骞充粨鍏ュ簱 */
+ @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();
+ }
+
/* pda鍏ュ簱 */
@RequestMapping(value = "/locNormal/pda/in")
@ManagerAuth(memo = "骞充粨绠＄悊pda鍏ュ簱")
@@ -142,4 +161,29 @@
locNormalService.pdaLocNormalIn(param.getNormalList());
return R.ok();
}
+
+ /* pda鍑哄簱鏌ヨ */
+ @RequestMapping(value = "/locNormal/pda/out/query")
+ @ManagerAuth(memo = "pda鍑哄簱鏌ヨ")
+ @Transactional
+ public R locNormalPdaOutQuery(String matnr, String warehouse) {
+ List<LocNormal> list = new ArrayList<>();
+ list = locNormalService.pdaLocNormalQuery(matnr, warehouse);
+ return R.ok(list);
+ }
+
+ @RequestMapping(value = "/locNormal/pda/out")
+ @ManagerAuth(memo = "pda鍑哄簱")
+ @Transactional
+ public R locNormalPdaOut(@RequestBody LocNormalParam param) {
+ Long userId = getUserId();
+ Date timeNow = new Date();
+ List<LocNormal> list = param.getNormalList();
+ for (Integer i = 0; i < list.size(); i++) {
+ list.get(i).setModiUser(userId);
+ list.get(i).setModiTime(timeNow);
+ }
+ locNormalService.pdaLocNormalOut(list);
+ return R.ok();
+ }
}
--
Gitblit v1.9.1