From 5cffd2d4226daaf981f0a341f9cd327e924f6619 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 13 六月 2020 16:59:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/WorkService.java | 5 ++
src/main/webapp/static/js/pakStore/emptyOut.js | 2
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 5 ++
src/main/webapp/static/js/pakStore/emptyIn.js | 24 +++++++++++
src/main/webapp/views/pakStore/emptyIn.html | 24 +++++++-----
src/main/java/com/zy/asrs/controller/WorkController.java | 14 +++++-
6 files changed, 59 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index a060e06..c687eb7 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -10,6 +10,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
/**
@@ -44,14 +45,21 @@
@RequestMapping("/full/store/put/start")
@ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱")
- public R start(@RequestBody FullStoreParam fullStoreParam) {
+ public R fullStorePutStart(@RequestBody FullStoreParam fullStoreParam) {
workService.startupFullStore(fullStoreParam,getUserId());
return R.ok("鍏ュ簱鎴愬姛");
}
+ @RequestMapping("/empty/plate/in/start")
+ @ManagerAuth(memo = "绌烘澘鍏ュ簱")
+ public R emptyPlateInStart(@RequestParam Integer sourceStaNo) {
+ workService.emptyPlateIn(sourceStaNo, getUserId());
+ return R.ok("鍏ュ簱鎴愬姛");
+ }
+
@RequestMapping("/empty/plate/out/start")
- @ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱")
- public R start(EmptyPlateOutParam param) {
+ @ManagerAuth(memo = "绌烘澘鍑哄簱")
+ public R emptyPlateOutStart(EmptyPlateOutParam param) {
workService.emptyPlateOut(param, getUserId());
return R.ok("鍑哄簱鎴愬姛");
}
diff --git a/src/main/java/com/zy/asrs/service/WorkService.java b/src/main/java/com/zy/asrs/service/WorkService.java
index 26efdd6..8472b50 100644
--- a/src/main/java/com/zy/asrs/service/WorkService.java
+++ b/src/main/java/com/zy/asrs/service/WorkService.java
@@ -11,6 +11,11 @@
void startupFullStore(FullStoreParam param, Long userId);
/**
+ * 瀛旀澘鍏ュ簱
+ */
+ void emptyPlateIn(Integer sourceStaNo, Long userId);
+
+ /**
* 绌烘澘鍑哄簱
*/
void emptyPlateOut(EmptyPlateOutParam param, 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 5b9f196..a61cd65 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -105,6 +105,11 @@
}
@Override
+ public void emptyPlateIn(Integer sourceStaNo, Long userId) {
+
+ }
+
+ @Override
@Transactional
public void emptyPlateOut(EmptyPlateOutParam param, Long userId) {
if (Cools.isEmpty(param.getOutSite())) {
diff --git a/src/main/webapp/static/js/pakStore/emptyIn.js b/src/main/webapp/static/js/pakStore/emptyIn.js
index 305f2a3..2c9f1b3 100644
--- a/src/main/webapp/static/js/pakStore/emptyIn.js
+++ b/src/main/webapp/static/js/pakStore/emptyIn.js
@@ -14,7 +14,7 @@
url: baseUrl+"/available/empty/put/site",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
- asymc: false,
+ async: false,
success: function (res) {
if (res.code === 200){
var tpl = $("#putSiteSelectTemplate").html();
@@ -31,6 +31,28 @@
})
}
+ // 绌烘澘鍏ュ簱
+ form.on('submit(inbound)', function (data) {
+ var inSite = $('#inSiteSelect').val();
+ $.ajax({
+ url: baseUrl+"/empty/plate/in/start",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ data: {sourceStaNo: inSite},
+ async: false,
+ success: function (res) {
+ if (res.code === 200){
+ layer.msg(res.msg);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ });
+
+
})
diff --git a/src/main/webapp/static/js/pakStore/emptyOut.js b/src/main/webapp/static/js/pakStore/emptyOut.js
index 6e11bd3..23eef5d 100644
--- a/src/main/webapp/static/js/pakStore/emptyOut.js
+++ b/src/main/webapp/static/js/pakStore/emptyOut.js
@@ -12,7 +12,7 @@
url: baseUrl+"/available/empty/take/site",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
- asymc: false,
+ async: false,
success: function (res) {
if (res.code === 200){
var tpl = $("#takeSiteSelectTemplate").html();
diff --git a/src/main/webapp/views/pakStore/emptyIn.html b/src/main/webapp/views/pakStore/emptyIn.html
index bd82cff..e29f6cb 100644
--- a/src/main/webapp/views/pakStore/emptyIn.html
+++ b/src/main/webapp/views/pakStore/emptyIn.html
@@ -22,7 +22,13 @@
}
.function-area {
- padding: 20px 50px;
+ padding: 50px 80px;
+ }
+ .layui-form-label {
+ width: 120px;
+ }
+ .function-area .layui-form {
+ width: 300px;
}
</style>
</head>
@@ -30,23 +36,21 @@
<!-- 鍔熻兘鍖� -->
<div class="function-area">
- <div class="layui-form">
- <div class="layui-form-item">
- <label class="layui-form-label" style="padding: 9px 0">绌烘澘鍏ュ簱鍙ｏ細</label>
- <div class="layui-input-block" style="margin-left: 90px;">
+ <div class="layui-form layui-form-pane">
+ <div class="layui-form-item" style="margin-bottom: 30px">
+ <label class="layui-form-label" style="">绌烘澘鍏ュ簱鍙�</label>
+ <div class="layui-input-block">
<select id="inSiteSelect" lay-verify="required" lay-search="">
<option value="">璇烽�夋嫨绔欑偣</option>
</select>
</div>
</div>
-
- <div style="text-align: center; margin-top: 20px">
- <button class="layui-btn layui-btn-radius layui-btn-normal" id="btn-inbound" lay-submit lay-filter="inbound">鍏ュ簱鍚姩</button>
+ <hr style="margin-top: 10px">
+ <div style="text-align: left; margin-top: 30px">
+ <button class="layui-btn layui-btn-lg layui-btn-radius layui-btn-normal" id="btn-inbound" lay-submit lay-filter="inbound">鍏ュ簱鍚姩</button>
</div>
</div>
</div>
-
-
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
--
Gitblit v1.9.1