From a75b2d52ab0dcdb180705727dd2176bc5094d3a9 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期五, 12 三月 2021 09:26:24 +0800
Subject: [PATCH] 1.0.3 优化平仓管理，增加id主键传入，出库权限判断，增加出库和移除确认弹窗
---
src/main/java/com/zy/asrs/controller/LocNormalController.java | 49 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 38 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocNormalController.java b/src/main/java/com/zy/asrs/controller/LocNormalController.java
index 14353d6..d2db347 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;
@@ -101,7 +103,7 @@
public void updateLocNormal(LocNormal param) {
Long modiUser = getUserId();
Date modiTime = new Date();
- locNormalService.updateLocNormal(param.getMatnr(), param.getAnfme(), modiUser, modiTime);
+ locNormalService.updateLocNormal(param.getMatnr(), param.getAnfme(), modiUser, modiTime, param.getId());
}
@RequestMapping(value = "/locNormal/outLoc/auth")
@@ -109,7 +111,7 @@
public void outLocNormal(LocNormal param) {
Long modiUser = getUserId();
Date modiTime = new Date();
- locNormalService.outLocNormal(param.getMatnr(), modiUser, modiTime);
+ locNormalService.outLocNormal(param.getMatnr(), modiUser, modiTime, param.getId());
}
@RequestMapping(value = "/locNormal/removeLoc/auth")
@@ -117,7 +119,7 @@
public void removeLoc(LocNormal param) {
Long modiUser = getUserId();
Date modiTime = new Date();
- locNormalService.removeLocNormal(param.getMatnr(), modiUser, modiTime);
+ locNormalService.removeLocNormal(param.getMatnr(), modiUser, modiTime, param.getId());
}
/* 瀵煎叆 */
@@ -128,6 +130,21 @@
LocNormalExcelListener listener = new LocNormalExcelListener(getUserId());
EasyExcel.read(file.getInputStream(), LocNormalExcel.class, listener).sheet().doRead();
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鍏ュ簱 */
@@ -145,18 +162,28 @@
return R.ok();
}
- /* 骞充粨鍏ュ簱 */
- @RequestMapping(value = "/locNormal/in")
- @ManagerAuth(memo = "骞充粨鍏ュ簱")
+ /* pda鍑哄簱鏌ヨ */
+ @RequestMapping(value = "/locNormal/pda/out/query")
+ @ManagerAuth(memo = "pda鍑哄簱鏌ヨ")
@Transactional
- public R locNormalIn(@RequestBody LocNormalParam param) {
+ 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();
- for (Integer i = 0; i < param.getNormalList().size(); i++) {
- param.getNormalList().get(i).setAppeUser(userId);
- param.getNormalList().get(i).setAppeTime(timeNow);
+ List<LocNormal> list = param.getNormalList();
+ for (Integer i = 0; i < list.size(); i++) {
+ list.get(i).setModiUser(userId);
+ list.get(i).setModiTime(timeNow);
}
- locNormalService.locNormalIn(param.getNormalList());
+ locNormalService.pdaLocNormalOut(list);
return R.ok();
}
}
--
Gitblit v1.9.1