From d7d00984c029fcc9e340244d2fa974a6d8b3b9e0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 23 三月 2021 15:14:19 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/pda/stockIn.html                        |   19 +++++++++++++++++++
 src/main/java/zy/cloud/wms/common/service/erp/ErpService.java |    4 +++-
 2 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/src/main/java/zy/cloud/wms/common/service/erp/ErpService.java b/src/main/java/zy/cloud/wms/common/service/erp/ErpService.java
index e432541..18c5c8a 100644
--- a/src/main/java/zy/cloud/wms/common/service/erp/ErpService.java
+++ b/src/main/java/zy/cloud/wms/common/service/erp/ErpService.java
@@ -47,14 +47,16 @@
                 detl.setUserCode(comb.getMatnr());
                 detl.setQty(comb.getAnfme());
                 detl.setPrice(0.0D);
+                detail.add(detl);
             }
-
+            System.out.println(JSON.toJSONString(uploadBill));
             String response = new HttpHandler.Builder()
                     .setUri(ErpScheduler.URI)
                     .setPath(ErpScheduler.UPLOAD_BILL)
                     .setJson(JSON.toJSONString(uploadBill))
                     .build()
                     .doPost();
+
             if (!Cools.isEmpty(response)) {
                 log.warn(response);
                 Result result = JSON.parseObject(response, Result.class);
diff --git a/src/main/webapp/views/pda/stockIn.html b/src/main/webapp/views/pda/stockIn.html
index b747d88..868b191 100644
--- a/src/main/webapp/views/pda/stockIn.html
+++ b/src/main/webapp/views/pda/stockIn.html
@@ -263,6 +263,20 @@
 
 
     function confirm() {
+        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;
+        }
         layer.open({
             type: 1,
             title: '鍗曟嵁绫诲瀷',
@@ -291,6 +305,7 @@
             tips("璇锋彁鍙栫墿鏂�", true);
             return;
         }
+        layer.closeAll();
         $.ajax({
             url: baseUrl+"/work/stock/in",
             headers: {'token': localStorage.getItem('token')},
@@ -315,6 +330,10 @@
         })
     }
 
+    function doPost() {
+
+    }
+
     /**
      * 鎻愮ず淇℃伅
      * @param msg 鎻愮ず鍐呭

--
Gitblit v1.9.1