From 2b613ec7306bf62b6bebde76fe6b4cccc4fc64ff Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 13 六月 2020 15:02:12 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/pakStore/emptyOut.js | 34 +++++++++++++++-
src/main/java/com/zy/asrs/controller/WorkController.java | 12 +++++
src/main/java/com/zy/asrs/entity/param/EmptyPlateOutParam.java | 31 +++++++++++++++
3 files changed, 73 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 51c7407..f0dc9a3 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -1,7 +1,9 @@
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.EmptyPlateOutParam;
import com.zy.asrs.entity.param.FullStoreParam;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WorkService;
@@ -35,11 +37,19 @@
return R.ok().add(basDevpService.getAvailableOutSite());
}
- @RequestMapping("/full/store/start")
+ @RequestMapping("/full/store/put/start")
@ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱")
public R start(@RequestBody FullStoreParam fullStoreParam) {
workService.startupFullStore(fullStoreParam,getUserId());
return R.ok();
}
+
+ @RequestMapping("/empty/plate/out/start")
+ @ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱")
+ public R start(EmptyPlateOutParam param) {
+ System.out.println(JSON.toJSONString(param));
+ return R.ok();
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/entity/param/EmptyPlateOutParam.java b/src/main/java/com/zy/asrs/entity/param/EmptyPlateOutParam.java
new file mode 100644
index 0000000..17ca693
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/EmptyPlateOutParam.java
@@ -0,0 +1,31 @@
+package com.zy.asrs.entity.param;
+
+import java.util.List;
+
+/**
+ * Created by vincent on 2020/6/13
+ */
+public class EmptyPlateOutParam {
+
+ // 鍑虹珯鍙�
+ private Integer outSite;
+
+ // 搴撲綅鍙烽泦鍚�
+ private List<String> locNos;
+
+ public Integer getOutSite() {
+ return outSite;
+ }
+
+ public void setOutSite(Integer outSite) {
+ this.outSite = outSite;
+ }
+
+ public List<String> getLocNos() {
+ return locNos;
+ }
+
+ public void setLocNos(List<String> locNos) {
+ this.locNos = locNos;
+ }
+}
diff --git a/src/main/webapp/static/js/pakStore/emptyOut.js b/src/main/webapp/static/js/pakStore/emptyOut.js
index fb1d52f..2f026ce 100644
--- a/src/main/webapp/static/js/pakStore/emptyOut.js
+++ b/src/main/webapp/static/js/pakStore/emptyOut.js
@@ -48,7 +48,7 @@
,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
,{field: 'row1', align: 'center',title: '鎺�'}
,{field: 'bay1', align: 'center',title: '鍒�'}
- ,{field: 'lev1', align: 'center',title: '灞�', sort:true}
+ ,{field: 'lev1', align: 'center',title: '灞�'}
,{field: 'fullPlt', align: 'center',title: '婊℃澘', templet:function(row){
var html = "<input value='fullPlt' type='checkbox' disabled=鈥榙isabled鈥� lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
if(row.fullPlt === 'Y'){html += " checked ";}
@@ -57,7 +57,6 @@
},width:80}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',event: 'modiUser'}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
-
]],
request: {
pageName: 'curr',
@@ -94,13 +93,42 @@
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
table.on('toolbar(locMast)', function (obj) {
- var checkStatus = table.checkStatus(obj.config.id);
+ var data = table.checkStatus(obj.config.id).data;
switch (obj.event) {
case 'outbound':
var staNo = $("#staNoSelect").val();
if (staNo === ""){
layer.msg("璇烽�夋嫨鍑哄簱鍙�");
}
+ var locNos = [];
+ data.forEach(function(elem) {
+ locNos.push(elem.locNo);
+ });
+ if (data.length === 0){
+ layer.msg('璇疯嚦灏戦�変腑涓�琛屾暟鎹�');
+ } else {
+ $.ajax({
+ url: baseUrl+"/empty/plate/out/start",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ outSite: staNo,
+ locNos: locNos
+ },
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ if (res.code === 200){
+ tableReload(); // 閲嶈浇琛ㄦ牸
+ getOutBound(); // 閲嶈浇鍑哄簱鍙�
+ layer.msg(res.msg);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ });
+ }
break;
}
});
--
Gitblit v1.9.1