From 97c704f20da653f60d0a2d777fd0e237862e4b9b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 10 六月 2020 17:02:30 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/wms/WorkController.java | 8 +++++++-
src/main/webapp/static/js/pakStore/pakStore.js | 37 +++++++++++++++++++++++++++++++------
src/main/webapp/views/pakStore/matQuery.html | 3 +++
3 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/common/web/wms/WorkController.java b/src/main/java/com/zy/common/web/wms/WorkController.java
index 6ca5a24..02b8155 100644
--- a/src/main/java/com/zy/common/web/wms/WorkController.java
+++ b/src/main/java/com/zy/common/web/wms/WorkController.java
@@ -17,10 +17,16 @@
@Autowired
private BasDevpService basDevpService;
- @RequestMapping("available/put/site")
+ @RequestMapping("/available/put/site")
@ManagerAuth(memo = "鑾峰彇鏈夋晥鐨勫叆搴撶珯鐐�")
public R availablePutSite(){
return R.ok().add(basDevpService.getAvailableDevp());
}
+ @RequestMapping("/put/site/start")
+ @ManagerAuth(memo = "寮�濮嬪叆搴�")
+ public R start() {
+ return R.ok();
+ }
+
}
diff --git a/src/main/webapp/static/js/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js
index 401c404..7c8ec30 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -49,9 +49,17 @@
var data = checkStatus.data;
switch(obj.event) {
case 'comb':
+ // 鍒ゆ柇鏄惁瀛樺湪鐗╂枡
if (matCodeData.length === 0) {
layer.msg("璇峰厛娣诲姞鐗╂枡");
return;
+ }
+ // 鍒ゆ柇鐗╂枡鏁伴噺鏄惁瀛樺湪寮傚父
+ for (var i=0;i<matCodeData.length;i++){
+ if (matCodeData[i].count === 0){
+ layer.msg("鏁伴噺涓嶈兘涓洪浂");
+ return;
+ }
}
layer.open({
type: 1,
@@ -99,6 +107,29 @@
}
}
}
+
+ // 琛ㄥ崟
+ form.on('submit(combDo)', function (data) {
+ $.ajax({
+ url: baseUrl+"/put/site/start",
+ headers: {'token': localStorage.getItem('token')},
+ data: null,
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200){
+ layer.closeAll();
+ layer.msg(res.msg);
+ matCodeData = [];
+ tableIns.reload({data: matCodeData,done:function (res) {}});
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ });
});
// 鎻愬彇鐗╂枡
@@ -116,9 +147,3 @@
}
});
}
-
-// 鍚姩鍏ュ簱
-function putMat() {
-
-
-}
\ No newline at end of file
diff --git a/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html
index de737e1..d60e7ff 100644
--- a/src/main/webapp/views/pakStore/matQuery.html
+++ b/src/main/webapp/views/pakStore/matQuery.html
@@ -114,6 +114,9 @@
var data = checkStatus.data;
switch(obj.event) {
case 'confirm':
+ for (var i=0;i<data.length;i++){
+ data[i]["count"] = parent.initCountVal;
+ }
parent.matCodeData.push.apply(parent.matCodeData, data);
parent.tableIns.reload({data: parent.matCodeData});
parent.layer.close(parent.matCodeLayerIdx);
--
Gitblit v1.9.1