From 957dbef4a9ad04765d7ff7dca601bda6a29d444e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 16 六月 2020 17:16:21 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/param/StockOutParam.java |   33 ++++++++++++++--
 src/main/java/com/zy/asrs/controller/WorkController.java  |    2 
 src/main/webapp/static/js/pakStore/stockOut.js            |   30 ++++++++-------
 3 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 8d1520a..5be77be 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -58,7 +58,7 @@
 
     @RequestMapping("/plate/out/start")
     @ManagerAuth(memo = "鍏ㄦ澘鍑哄簱")
-    public R fullStoreTakeStart(StockOutParam param) {
+    public R fullStoreTakeStart(@RequestBody StockOutParam param) {
         workService.startupFullTakeStore(param, getUserId());
         return R.ok("鍑哄簱鍚姩鎴愬姛");
     }
diff --git a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
index c2e4d09..cee665a 100644
--- a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
@@ -11,7 +11,7 @@
     private Integer outSite;
 
     // 鐗╂枡缂栧彿闆嗗悎
-    private List<String> matNos;
+    private List<LocDetl> locDetls;
 
     public Integer getOutSite() {
         return outSite;
@@ -21,11 +21,34 @@
         this.outSite = outSite;
     }
 
-    public List<String> getMatNos() {
-        return matNos;
+    public List<LocDetl> getLocDetls() {
+        return locDetls;
     }
 
-    public void setMatNos(List<String> matNos) {
-        this.matNos = matNos;
+    public void setLocDetls(List<LocDetl> locDetls) {
+        this.locDetls = locDetls;
+    }
+
+    public static class LocDetl {
+
+        private String locNo;
+
+        private String matnr;
+
+        public String getLocNo() {
+            return locNo;
+        }
+
+        public void setLocNo(String locNo) {
+            this.locNo = locNo;
+        }
+
+        public String getMatnr() {
+            return matnr;
+        }
+
+        public void setMatnr(String matnr) {
+            this.matnr = matnr;
+        }
     }
 }
diff --git a/src/main/webapp/static/js/pakStore/stockOut.js b/src/main/webapp/static/js/pakStore/stockOut.js
index 4ef1e9b..787beec 100644
--- a/src/main/webapp/static/js/pakStore/stockOut.js
+++ b/src/main/webapp/static/js/pakStore/stockOut.js
@@ -16,7 +16,7 @@
         cellMinWidth: 50,
         cols: [[
             {type: 'checkbox'}
-            ,{field: 'anfme', align: 'center',title: '鏁伴噺锛堣閫夋嫨锛�', edit:'text', width: 120,  style:'color: blue;font-weight: bold'}
+            ,{field: 'anfme', align: 'center',title: '鏁伴噺锛堝彲璋冩暣锛�', edit:'text', width: 130,  style:'color: blue;font-weight: bold'}
             ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
             ,{field: 'matnr', align: 'center',title: '鐗╂枡'}
             ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�', width:80}
@@ -50,25 +50,27 @@
         var data = table.checkStatus(obj.config.id).data;
         switch (obj.event) {
             case 'outbound':
-                var staNo = $("#staNoSelect").val();
-                if (staNo === "" || staNo === null){
-                    layer.msg("璇烽�夋嫨鍑哄簱鍙�");
-                    return;
-                }
-                var locNos = [];
-                data.forEach(function(elem) {
-                    locNos.push(elem.locNo);
-                });
                 if (data.length === 0){
                     layer.msg('璇疯嚦灏戦�変腑涓�琛屾暟鎹�');
                 } else {
+                    var staNo = $("#staNoSelect").val();
+                    if (staNo === "" || staNo === null){
+                        layer.msg("璇烽�夋嫨鍑哄簱鍙�");
+                        return;
+                    }
+                    var locDetls = [];
+                    data.forEach(function(elem) {
+                        locDetls.push({locNo: elem.locNo, matnr: elem.matnr});
+                    });
+                    let param = {
+                        outSite: staNo,
+                        locDetls: locDetls
+                    }
                     $.ajax({
                         url: baseUrl+"/plate/out/start",
                         headers: {'token': localStorage.getItem('token')},
-                        data: {
-                            outSite: staNo,
-                            locNos: locNos
-                        },
+                        data: JSON.stringify(param),
+                        contentType:'application/json;charset=UTF-8',
                         method: 'POST',
                         traditional:true,
                         success: function (res) {

--
Gitblit v1.9.1