From 9fc747c8fe1b492e0e82da57a60f4ac17ef196d8 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期一, 22 二月 2021 22:28:09 +0800
Subject: [PATCH] 1、上架归还单:先扫条码再扫货架,如果不匹配不允许提交。2、下架找货单:已下架的条码允许再次下架。

---
 WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html |   36 +++++++++++++++++++-----------------
 1 files changed, 19 insertions(+), 17 deletions(-)

diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
index d8c2c36..0d02288 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
@@ -86,7 +86,7 @@
                                 <div class="layui-form-item" style="padding:0px;margin:0px">
                                     <div class="layui-row">
                                         <div class="layui-col-xs3">
-                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">璋冨叆</label>
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨叆浠撳簱</label>
                                         </div>
                                         <div class="layui-col-xs6">
                                             <input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input">
@@ -100,7 +100,7 @@
                                 <div class="layui-form-item" style="padding:0px;margin:0px">
                                     <div class="layui-row">
                                         <div class="layui-col-xs3">
-                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撲綅</label>
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨叆浠撲綅</label>
                                         </div>
                                         <div class="layui-col-xs6">
                                             <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" autocomplete="off" class="layui-input">
@@ -111,10 +111,10 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                <div class="layui-form-item" style="padding:0px;margin:0px;display: none;">
                                     <div class="layui-row">
                                         <div class="layui-col-xs3">
-                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">璋冨嚭</label>
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨嚭浠撳簱</label>
                                         </div>
                                         <div class="layui-col-xs6">
                                             <input type="text" name="HSCWHNAME" id="HSCWHNAME" lay-verify="HSCWHNAME" autocomplete="off" class="layui-input">
@@ -125,10 +125,10 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                <div class="layui-form-item" style="padding:0px;margin:0px;display: none;">
                                     <div class="layui-row">
                                         <div class="layui-col-xs3">
-                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撲綅</label>
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨嚭浠撲綅</label>
                                         </div>
                                         <div class="layui-col-xs6">
                                             <input type="text" name="HOutStockPlaceName" id="HOutStockPlaceName" lay-verify="HOutStockPlaceName" autocomplete="off" class="layui-input">
@@ -622,7 +622,7 @@
             var sSourceType = '-1'
             if (AllowLoadData(sSubStr, 'Saver') != false)//闈炵┖楠岃瘉
             {
-                layer.load(3);
+                var index = layer.load(3);
                 $.ajax(
                 {
                     type: "POST",
@@ -642,10 +642,12 @@
                             }, function () { window.location.reload(); });//鏂板
                         }
                         else {
+                            layer.close(index);
                             layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         }
                     },
                     error: function (err) {
+                        layer.close(index);
                         layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     }
                 });
@@ -685,14 +687,14 @@
                 if (sQty != "") {
                     $('#HQty').val("");
                 }
-                //if ($("#HWHNAME").val() == '') {
-                //    layer.msg("璋冨叆浠撳簱娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                //    return false;
-                //}
-                if ($("#HWHID").val() == $("#HSCWHID").val() && $("#HStockPlaceID").val() == $("#HOutStockPlaceID").val()) {
-                    layer.msg("璋冨叆浠撳簱銆佷粨浣嶄笉鑳藉拰璋冨嚭浠撳簱銆佷粨浣嶉兘鐩稿悓!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                if ($("#HWHNAME").val() == '') {
+                    layer.msg("璋冨叆浠撳簱娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return false;
                 }
+                //if ($("#HWHID").val() == $("#HSCWHID").val() && $("#HStockPlaceID").val() == $("#HOutStockPlaceID").val()) {
+                //    layer.msg("璋冨叆浠撳簱銆佷粨浣嶄笉鑳藉拰璋冨嚭浠撳簱銆佷粨浣嶉兘鐩稿悓!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return false;
+                //}
                 //if ($("#HSCWHNAME").val() == '') {
                 //    layer.msg("璋冨嚭浠撳簱娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 //    return false;
@@ -993,10 +995,10 @@
             layer.msg("璋冨叆浠撳簱娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
             return false;
         }
-        if ($("#HWHID").val() == $("#HSCWHID").val() && $("#HStockPlaceID").val() == $("#HOutStockPlaceID").val()) {
-            layer.msg("璋冨叆浠撳簱銆佷粨浣嶄笉鑳藉拰璋冨嚭浠撳簱銆佷粨浣嶉兘鐩稿悓!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-            return false;
-        }
+        //if ($("#HWHID").val() == $("#HSCWHID").val() && $("#HStockPlaceID").val() == $("#HOutStockPlaceID").val()) {
+        //    layer.msg("璋冨叆浠撳簱銆佷粨浣嶄笉鑳藉拰璋冨嚭浠撳簱銆佷粨浣嶉兘鐩稿悓!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+        //    return false;
+        //}
         if ($("#HBillNo").val() == '') {
             layer.msg("閿欒鐨勫崟鎹彿!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
             return false;

--
Gitblit v1.9.1