From 51d976a105e61297e1ae6ec16457292fadecd418 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 15 六月 2020 13:19:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/WorkService.java | 6 ++++--
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 6 ++++--
src/main/webapp/static/js/pakStore/emptyIn.js | 2 +-
src/main/java/com/zy/asrs/controller/WorkController.java | 6 ++----
src/main/webapp/static/js/pakStore/pakStore.js | 2 +-
5 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 2557170..51fb1b3 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -46,15 +46,13 @@
@RequestMapping("/full/store/put/start")
@ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱")
public R fullStorePutStart(@RequestBody FullStoreParam fullStoreParam) {
- workService.startupFullPutStore(fullStoreParam,getUserId());
- return R.ok("鍏ュ簱鎴愬姛");
+ return R.ok("鍏ュ簱鎴愬姛").add(workService.startupFullPutStore(fullStoreParam,getUserId()));
}
@RequestMapping("/empty/plate/in/start")
@ManagerAuth(memo = "绌烘澘鍏ュ簱")
public R emptyPlateInStart(@RequestParam Integer sourceStaNo) {
- workService.emptyPlateIn(sourceStaNo, getUserId());
- return R.ok("鍏ュ簱鎴愬姛");
+ return R.ok("鍏ュ簱鎴愬姛").add(workService.emptyPlateIn(sourceStaNo, getUserId()));
}
@RequestMapping("/empty/plate/out/start")
diff --git a/src/main/java/com/zy/asrs/service/WorkService.java b/src/main/java/com/zy/asrs/service/WorkService.java
index b3e8852..be73411 100644
--- a/src/main/java/com/zy/asrs/service/WorkService.java
+++ b/src/main/java/com/zy/asrs/service/WorkService.java
@@ -7,13 +7,15 @@
/**
* 鍏ㄦ澘鍏ュ簱
+ * @return 搴撲綅鍙�
*/
- void startupFullPutStore(FullStoreParam param, Long userId);
+ String startupFullPutStore(FullStoreParam param, Long userId);
/**
* 瀛旀澘鍏ュ簱
+ * @return 搴撲綅鍙�
*/
- void emptyPlateIn(Integer sourceStaNo, Long userId);
+ String emptyPlateIn(Integer sourceStaNo, Long userId);
/**
* 绌烘澘鍑哄簱
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 1c478ef..ba25b86 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -40,7 +40,7 @@
@Override
@Transactional
- public void startupFullPutStore(FullStoreParam param, Long userId) {
+ public String startupFullPutStore(FullStoreParam param, Long userId) {
// 鍙傛暟闈炵┖鍒ゆ柇
if (Cools.isEmpty(param.getDevpNo(), param.getList())) {
throw new CoolException(BaseRes.PARAM);
@@ -102,10 +102,11 @@
} else {
throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
}
+ return dto.getLocNo();
}
@Override
- public void emptyPlateIn(Integer devpNo, Long userId) {
+ public String emptyPlateIn(Integer devpNo, Long userId) {
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo);
// 鐢熸垚宸ヤ綔鍙�
@@ -157,6 +158,7 @@
} else {
throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
}
+ return dto.getLocNo();
}
@Override
diff --git a/src/main/webapp/static/js/pakStore/emptyIn.js b/src/main/webapp/static/js/pakStore/emptyIn.js
index 2c9f1b3..9863f18 100644
--- a/src/main/webapp/static/js/pakStore/emptyIn.js
+++ b/src/main/webapp/static/js/pakStore/emptyIn.js
@@ -42,7 +42,7 @@
async: false,
success: function (res) {
if (res.code === 200){
- layer.msg(res.msg);
+ layer.msg("鍏ュ簱鍚姩鎴愬姛锛岀洰鏍囧簱浣嶏細" + res.data);
} else if (res.code === 403){
top.location.href = baseUrl+"/";
}else {
diff --git a/src/main/webapp/static/js/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js
index 584dbf7..4f7129a 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -152,7 +152,7 @@
success: function (res) {
if (res.code === 200){
layer.closeAll();
- layer.msg(res.msg);
+ layer.msg("鍏ュ簱鍚姩鎴愬姛锛岀洰鏍囧簱浣嶏細" + res.data);
matCodeData = [];
tableIns.reload({data: matCodeData,done:function (res) { limit();}});
} else if (res.code === 403){
--
Gitblit v1.9.1