From af73582c1bd3c20e2e805d4df56c111073d3fd6f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 25 三月 2021 13:02:35 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/pda/stockCheck.html |   37 +++++++++++++++++--------------------
 1 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/src/main/webapp/views/pda/stockCheck.html b/src/main/webapp/views/pda/stockCheck.html
index 89c77a8..8107089 100644
--- a/src/main/webapp/views/pda/stockCheck.html
+++ b/src/main/webapp/views/pda/stockCheck.html
@@ -72,7 +72,7 @@
 <footer>
     <div class="layui-btn-container">
         <button type="button" id="reset-btn" class="layui-btn layui-btn-primary" onclick="reset()">閲嶇疆</button>
-        <button type="button" id="comb-btn" class="layui-btn layui-btn-normal " onclick="comb()" style="margin-left: 20px">缁勬墭</button>
+        <button type="button" id="comb-btn" class="layui-btn layui-btn-normal " onclick="check()" style="margin-left: 20px">纭</button>
         <span id="tips"></span>
     </div>
 </footer>
@@ -292,30 +292,27 @@
         tableIns.reload({data: locDetlData});
     }
 
-    // 缁勬墭
-    function comb() {
-        var barcode = $('#code').val();
-        if (isEmpty(barcode)) {
-            tips("鎵樼洏鏉$爜涓虹┖", true);
-            // document.getElementById("code").focus();
+    // 纭
+    function check() {
+        var locNo = $('#locNo').val();
+        if (isEmpty(locNo)) {
+            tips("璐т綅涓嶈兘涓虹┖", true);
             return;
         }
-        if (barcode.length !== 7) {
-            tips("鏉$爜蹇呴』涓�7浣�", true);
-            return;
+        if (locDetlData.length > 0) {
+            for (var i = 0; i<locDetlData.length; i++) {
+                if (locDetlData[i].count === null || locDetlData[i].count === 0) {
+                    tips(locDetlData[i].matnr + "鍟嗗搧鏁伴噺閿欒", true);
+                    return;
+                }
+            }
         }
-        if (locDetlData.length === 0) {
-            tips("璇锋彁鍙栫墿鏂�", true);
-            return;
-        }
-        var billNo = $('#billNo').val();
         $.ajax({
-            url: baseUrl+"/mobile/comb/auth",
+            url: baseUrl+"/work/stock/check",
             headers: {'token': localStorage.getItem('token')},
             data: JSON.stringify({
-                barcode: barcode,
-                combMats: locDetlData,
-                billNo: billNo
+                locNo: locNo,
+                dtos: locDetlData
             }),
             contentType:'application/json;charset=UTF-8',
             method: 'POST',
@@ -323,7 +320,7 @@
             success: function (res) {
                 if (res.code === 200) {
                     reset();
-                    tips("缁勬墭鎴愬姛")
+                    tips("鐩樼偣鎴愬姛")
                 } else if (res.code === 403) {
                     top.location.href = baseUrl + "/pda";
                 } else {

--
Gitblit v1.9.1