From d559780d63e92b9cbbdf82b819cbc8bc9053da80 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 16 三月 2021 08:18:59 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/pda/stockIn.html |   85 +++++++++++++++++++++---------------------
 1 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/src/main/webapp/views/pda/stockIn.html b/src/main/webapp/views/pda/stockIn.html
index 1294a6b..e68c3fe 100644
--- a/src/main/webapp/views/pda/stockIn.html
+++ b/src/main/webapp/views/pda/stockIn.html
@@ -148,8 +148,12 @@
             success: function (res) {
                 if (res.code === 200) {
                     if (res.data.length > 0) {
+                        matData = res.data;
                         tableIns.reload({data: res.data});
                         $('#node').focus();
+                    } else {
+                        matData = [];
+                        tableIns.reload({data: res.data});
                     }
                 } else if (res.code === 403) {
                     top.location.href = baseUrl + "/pda";
@@ -162,6 +166,7 @@
 
     function findNode(el) {
         if (isEmpty(el.value)) {
+            $('#node-ok').hide();
             return;
         }
         $.ajax({
@@ -174,7 +179,7 @@
             success: function (res) {
                 if (res.code === 200) {
                     if (res.data != null) {
-                        $('#pakin').focus();
+                        // $('#pakin').focus();
                         $('#node-ok').show();
                     } else {
                         $('#node-ok').hide();
@@ -231,55 +236,51 @@
     // 閲嶇疆
     function reset() {
         $('#code').val("");
+        $('#node').val("");
         matData = [];
         tableIns.reload({data: matData});
         $('#node-ok').hide();
-        $('#putSiteSelect').val("");
         layui.form.render('select');
     }
 
-    // 鍏ュ簱
+    // 涓婃灦
     function pakIn() {
-        var barcode = $('#code').val();
-        if (isEmpty(barcode)) {
-            tips("鎵樼洏鏉＄爜涓虹┖", true);
-            return;
-        }
-        if (barcode.length !== 7) {
-            tips("鏉＄爜蹇呴』涓�7浣�", true);
-            return;
-        }
-        if (matData.length === 0) {
-            tips("璇锋彁鍙栫墿鏂�", true);
-            return;
-        }
-        // var site = $('input:radio[name="site"]:checked').next("span").html();
-        var site = $('#putSiteSelect').val();
-        if (null === site || undefined === site || site === "") {
-            tips("璇烽�夋嫨鍏ュ簱鍙�", true);
-            return;
-        }
-        $.ajax({
-            url: baseUrl+"/full/store/put/start",
-            headers: {'token': localStorage.getItem('token')},
-            data: JSON.stringify({
-                barcode: barcode,
-                devpNo: site,
-                list: matData
-            }),
-            contentType:'application/json;charset=UTF-8',
-            method: 'POST',
-            async: false,
-            success: function (res) {
-                if (res.code === 200) {
-                    reset();
-                    tips("鍏ュ簱鍚姩鎴愬姛")
-                } else if (res.code === 403) {
-                    top.location.href = baseUrl + "/pda";
-                } else {
-                    tips(res.msg, true)
-                }
+        layer.confirm('涓婃灦褰撳墠鎵樼洏锛�', {shadeClose: true}, function(){
+            var zpallet = $('#code').val();
+            if (isEmpty(zpallet)) {
+                tips("鎵樼洏鏉＄爜涓虹┖", true);
+                return;
             }
+            var node = $('#node').val();
+            if (isEmpty(node)) {
+                tips("璐т綅涓虹┖", true);
+                return;
+            }
+            if (matData.length === 0) {
+                tips("璇锋彁鍙栫墿鏂�", true);
+                return;
+            }
+            $.ajax({
+                url: baseUrl+"/work/stock/in",
+                headers: {'token': localStorage.getItem('token')},
+                data: JSON.stringify({
+                    nodeId: node,
+                    zpallet: zpallet
+                }),
+                contentType:'application/json;charset=UTF-8',
+                method: 'POST',
+                async: false,
+                success: function (res) {
+                    if (res.code === 200) {
+                        reset();
+                        tips("涓婃灦鎴愬姛")
+                    } else if (res.code === 403) {
+                        top.location.href = baseUrl + "/pda";
+                    } else {
+                        tips(res.msg, true)
+                    }
+                }
+            })
         })
     }
 

--
Gitblit v1.9.1