From bb19b7acbce6c6b1d1d273aa925eddc5f8073019 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 01 四月 2021 16:06:27 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/ioWorks/stockIn.js                         |   12 ++++++------
 src/main/webapp/views/ioWorks/stockIn.html                           |    4 ++--
 src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java |    3 +++
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
index ce20355..1beff42 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -56,6 +56,9 @@
     public R stockPakin(PakinParam param, Long userId) {
         Node node = nodeService.selectByUuid(param.getNodeId());
         if (node == null) {
+            node = nodeService.selectById(param.getNodeId());
+        }
+        if (node == null) {
             return R.error("璐т綅涓嶅瓨鍦�");
         }
         if (Cools.isEmpty(param.getMats())) {
diff --git a/src/main/webapp/static/js/ioWorks/stockIn.js b/src/main/webapp/static/js/ioWorks/stockIn.js
index fab1446..d5c7862 100644
--- a/src/main/webapp/static/js/ioWorks/stockIn.js
+++ b/src/main/webapp/static/js/ioWorks/stockIn.js
@@ -149,27 +149,27 @@
             success: function (layero, dIndex) {
                 // 琛ㄥ崟鎻愪氦浜嬩欢
                 form.on('submit(pakin)', function (data) {
-                    data.field.parentId = insXmSel.getValue('valueStr');
+                    data.field.nodeSel = insXmSel.getValue('valueStr');
+                    console.log(data.field)
                     var loadIndex = layer.load(2);
                     $.ajax({
                         url: baseUrl+"/work/stock/pakin",
                         headers: {'token': localStorage.getItem('token')},
                         data: JSON.stringify({
-                            devpNo: Number($('#putSiteSelect').val()),
-                            list: matCodeData
+                            nodeId: data.field.nodeSel,
+                            mats: matCodeData
                         }),
                         contentType:'application/json;charset=UTF-8',
                         method: 'POST',
-                        async: false,
                         success: function (res) {
                             layer.close(loadIndex);
                             if (res.code === 200){
-                                layer.msg("鍏ュ簱鍚姩鎴愬姛锛岀洰鏍囧簱浣嶏細" + res.data);
+                                layer.close(dIndex);
                                 matCodeData = [];
                                 tableIns.reload({data: matCodeData,done:function (res) { limit();}});
                             } else if (res.code === 403){
                                 top.location.href = baseUrl+"/";
-                            }else {
+                            } else {
                                 layer.msg(res.msg, {icon: 2});
                             }
                         }
diff --git a/src/main/webapp/views/ioWorks/stockIn.html b/src/main/webapp/views/ioWorks/stockIn.html
index fbe637a..867206c 100644
--- a/src/main/webapp/views/ioWorks/stockIn.html
+++ b/src/main/webapp/views/ioWorks/stockIn.html
@@ -129,13 +129,13 @@
 <script type="text/html" id="nodeSelect">
     <form id="detail" lay-filter="detail" class="layui-form">
         <div class="layui-form-item">
-            <label class="layui-form-label">璐т綅</label>
+            <label class="layui-form-label">涓婃灦璐т綅</label>
             <div class="layui-input-block">
                 <div id="nodeSel" class="ew-xmselect-tree"></div>
             </div>
         </div>
         <div class="layui-form-item text-right">
-            <button class="layui-btn" lay-filter="pakin" lay-submit="">鍏ュ簱</button>
+            <button class="layui-btn" lay-filter="pakin" lay-submit="">纭鍏ュ簱</button>
             <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
         </div>
     </form>

--
Gitblit v1.9.1