From 71b572107eeab9608811992de3d74ec367f6b996 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 11 六月 2020 08:33:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/param/FullStoreParam.java | 56 ++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/controller/WorkController.java | 14 +++++--
src/main/webapp/static/js/pakStore/pakStore.js | 14 +++++-
3 files changed, 77 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/common/web/wms/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
similarity index 64%
rename from src/main/java/com/zy/common/web/wms/WorkController.java
rename to src/main/java/com/zy/asrs/controller/WorkController.java
index 02b8155..076037c 100644
--- a/src/main/java/com/zy/common/web/wms/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -1,9 +1,12 @@
-package com.zy.common.web.wms;
+package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSON;
import com.core.annotations.ManagerAuth;
import com.core.common.R;
+import com.zy.asrs.entity.param.FullStoreParam;
import com.zy.asrs.service.BasDevpService;
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.RestController;
@@ -23,9 +26,12 @@
return R.ok().add(basDevpService.getAvailableDevp());
}
- @RequestMapping("/put/site/start")
- @ManagerAuth(memo = "寮�濮嬪叆搴�")
- public R start() {
+ @RequestMapping("/full/store/start")
+ @ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱")
+ public R start(@RequestBody FullStoreParam fullStoreParam) {
+
+ System.out.println(JSON.toJSONString(fullStoreParam));
+
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java b/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
new file mode 100644
index 0000000..e7efe2e
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
@@ -0,0 +1,56 @@
+package com.zy.asrs.entity.param;
+
+import java.util.List;
+
+/**
+ * Created by vincent on 2020/6/11
+ */
+public class FullStoreParam {
+
+ // 绔欑偣缂栧彿
+ private String devpNo;
+
+ // 鐗╂枡鍒楄〃鏁版嵁
+ private List<MatCodeStore> list;
+
+ static class MatCodeStore {
+
+ // 鐗╂枡缂栧彿
+ private String matNo;
+
+ // 鐗╂枡鏁伴噺
+ private Integer count;
+
+ public String getMatNo() {
+ return matNo;
+ }
+
+ public void setMatNo(String matNo) {
+ this.matNo = matNo;
+ }
+
+ public Integer getCount() {
+ return count;
+ }
+
+ public void setCount(Integer count) {
+ this.count = count;
+ }
+ }
+
+ public String getDevpNo() {
+ return devpNo;
+ }
+
+ public void setDevpNo(String devpNo) {
+ this.devpNo = devpNo;
+ }
+
+ public List<MatCodeStore> getList() {
+ return list;
+ }
+
+ public void setList(List<MatCodeStore> list) {
+ this.list = list;
+ }
+}
diff --git a/src/main/webapp/static/js/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js
index 2cffe9f..a4cc266 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -56,6 +56,10 @@
}
// 鍒ゆ柇鐗╂枡鏁伴噺鏄惁瀛樺湪寮傚父
for (var i=0;i<matCodeData.length;i++){
+ if (isNaN(matCodeData[i].count)) {
+ layer.msg("璇疯緭鍏ユ暟瀛�");
+ return;
+ }
if (matCodeData[i].count === 0){
layer.msg("鏁伴噺涓嶈兘涓洪浂");
return;
@@ -108,12 +112,16 @@
}
}
- // 琛ㄥ崟
+ // 琛ㄥ崟 --- 鍚姩鍏ュ簱
form.on('submit(combDo)', function (data) {
$.ajax({
- url: baseUrl+"/put/site/start",
+ url: baseUrl+"/full/store/start",
headers: {'token': localStorage.getItem('token')},
- data: null,
+ data: JSON.stringify({
+ devpNo: $('#putSiteSelect').val(),
+ list: matCodeData
+ }),
+ contentType:'application/json;charset=UTF-8',
method: 'POST',
async: false,
success: function (res) {
--
Gitblit v1.9.1