From 904a7c349b4d6dbdcbd2a95d0a66582ee43e81fa Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 07 七月 2022 15:44:21 +0800
Subject: [PATCH] 所有扫码模决单据内码获取方式用最新的

---
 WebTM/views/验收入库/委外入库/Kf_EntrustInBill_Fast.html |  228 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 115 insertions(+), 113 deletions(-)

diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
index 6cfe4dd..89c38f4 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
@@ -268,6 +268,7 @@
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
     <script>
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -383,7 +384,7 @@
                 $("#HInterID").val("");
                 $("#HBillNo").val("");
                 $.ajax({
-                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    url: GetWEBURL() + "/Web/GetMAXNumPDA",
                     type: "GET",
                     data: { "HBillType": '1210' },
                     success: function (d) {
@@ -566,8 +567,9 @@
             //鍏抽棴鎸夐挳
             form.on('submit(Cancel)', function () {
                 Flag = false;
-                parent.location.href = "../../../views/index.html"
-                //window.close();//鍏抽棴褰撳墠椤�
+                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    window.close();
+                });
             })
 
             //鎻愪氦鎸夐挳
@@ -741,113 +743,7 @@
                     });
                 }
             });
-            function GetHWHValue(obj)  //杩斿洖璋冨叆浠撳簱
-            {
-                $("#HWHNAME").val(obj[0].HName);
-                //sessionStorage["HWHID"] = obj[0].HItemID;
-                $("#HWHID").val(obj[0].HItemID);
-            }
-            function GetHSpValue(obj) {  //杩斿洖璋冨叆浠撲綅
-                $("#HStockPlaceName").val(obj[0].HName);
-                $("#HStockPlaceID").val(obj[0].HItemID);
-            }
-            function GetHSupValue(obj) {  //杩斿洖渚涘簲鍟�
-                $("#HSupName").val(obj[0].HName);
-                $("#HSupID").val(obj[0].HItemID);
-            }
-            function GetHKeeperValue(obj) {  //杩斿洖淇濈
-                $("#HKeeper").val(obj[0].HName);
-                $("#HKeeperID").val(obj[0].HItemID);
-            }
-            function GetHSecManagerValue(obj) {  //杩斿洖楠屾敹
-                $("#HSecManager").val(obj[0].HName);
-                $("#HSecManagerID").val(obj[0].HItemID);
-            }
-            function GetHDeptNameValue(obj) {   //杩斿洖閮ㄩ棬
-                $("#HDeptName").val(obj[0].HName);
-                $("#HDeptID").val(obj[0].HItemID);
-            }
-            //function Get_CheckWhAndSP(sInterID, sHBillType, sBarCode, sHWHID, sHSPID) {   //杩斿洖閮ㄩ棬
-            //    $.ajax({
-            //        url: "http://61.130.49.162:9090/WMSAPI///Kf_EntrustInBill/Get_CheckWhAndSP_Josn",
-            //        type: "GET",
-            //        data: { "sHInterID": sInterID, "sHBillType": sHBillType, "sBarCode": sBarCode, "sHWHID": sHWHID, "sHSPID": sHSPID },
-            //        success: function (result) {
-            //            if(result.count==1)
-            //            {
-            //               // layer.msg(result.Message, { icon: 1 });
-            //                return true;
-            //            }
-            //            else
-            //            {
-            //                layer.msg(result.Message, { icon: 5 });
-            //                return false;
-            //            }
-            //        }
-            //    })
-            //}
-            function AllowLoadData(sSubStr, bnt) {  //闈炵┖楠岃瘉
-                //if ($("#HSourceBillNo").val() == '') {
-                //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
-                //    return false;
-                //}
-                //if ($("#HDeptName").val() == '') {
-                //    layer.msg("閮ㄩ棬娌℃湁閫夋嫨!", { icon: 5 });
-                //    return false;
-                //}
-                //if ($("#HSecManager").val() == '') {
-                //    layer.msg("楠屾敹浜烘病鏈夐�夋嫨!", { icon: 5 });
-                //    return false;
-                //}
-                //if ($("#HKeeper").val() == '') {
-                //    layer.msg("淇濈浜烘病鏈夐�夋嫨!", { icon: 5 });
-                //    return false;
-                //}
-                //if ($("#HSupName").val() == '') {
-                //    layer.msg("渚涘簲鍟嗘病鏈夐�夋嫨!", { icon: 5 });
-                //    return false;
-                //}
-                //if ($("#HWHNAME").val() == '') {
-                //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
-                //    return false;
-                //}
-                if ($("#HBillNo").val() == '') {
-                    layer.msg("閿欒鐨勫崟鎹彿!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return false;
-                }
-                if ($("#HInterID").val() == '') {
-                    layer.msg("閿欒鐨勫唴鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return false;
-                }
-                if (typeof (sSubStr) == "undefined") {
-                    layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return false;
-                }
-                if (bnt == 'Saver') {
-                    if (!typeof (sSubStr) == "undefined") {
-                        for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
-                            if (parseFloat(sSubStr[i].HQtyMust) > 0) {
-                                if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust)) {
-                                    layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                                    return false;
-                                }
-                            }
-                        }
-                        for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
-                            if (parseFloat(sSubStr[i].HQty) > 0) {
-                                s = 1;
-                            }
-                        }
-                        if (s == 0) {
-                            layer.msg("濮斿鍏ュ簱璁板綍鏈壂鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            return false;
-                        }
-                    }
-                }
-                else {
-                    return true;
-                }
-            }
+
             //鎵潯鐮�
             function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
                 var sSubStr = table.cache['wl-table'];
@@ -1067,10 +963,116 @@
                     }
                 });
             }
-            //浠ヤ笂涓簂ayui妯″潡
+
         });
-
-
+        //浠ヤ笂涓簂ayui妯″潡
+        function GetHWHValue(obj)  //杩斿洖璋冨叆浠撳簱
+        {
+            $("#HWHNAME").val(obj[0].HName);
+            //sessionStorage["HWHID"] = obj[0].HItemID;
+            $("#HWHID").val(obj[0].HItemID);
+        }
+        function GetHSpValue(obj) {  //杩斿洖璋冨叆浠撲綅
+            $("#HStockPlaceName").val(obj[0].HName);
+            $("#HStockPlaceID").val(obj[0].HItemID);
+        }
+        function GetHSupValue(obj) {  //杩斿洖渚涘簲鍟�
+            $("#HSupName").val(obj[0].HName);
+            $("#HSupID").val(obj[0].HItemID);
+        }
+        function GetHKeeperValue(obj) {  //杩斿洖淇濈
+            $("#HKeeper").val(obj[0].HName);
+            $("#HKeeperID").val(obj[0].HItemID);
+        }
+        function GetHSecManagerValue(obj) {  //杩斿洖楠屾敹
+            $("#HSecManager").val(obj[0].HName);
+            $("#HSecManagerID").val(obj[0].HItemID);
+        }
+        function GetHDeptNameValue(obj) {   //杩斿洖閮ㄩ棬
+            $("#HDeptName").val(obj[0].HName);
+            $("#HDeptID").val(obj[0].HItemID);
+        }
+        //function Get_CheckWhAndSP(sInterID, sHBillType, sBarCode, sHWHID, sHSPID) {   //杩斿洖閮ㄩ棬
+        //    $.ajax({
+        //        url: "http://61.130.49.162:9090/WMSAPI///Kf_EntrustInBill/Get_CheckWhAndSP_Josn",
+        //        type: "GET",
+        //        data: { "sHInterID": sInterID, "sHBillType": sHBillType, "sBarCode": sBarCode, "sHWHID": sHWHID, "sHSPID": sHSPID },
+        //        success: function (result) {
+        //            if(result.count==1)
+        //            {
+        //               // layer.msg(result.Message, { icon: 1 });
+        //                return true;
+        //            }
+        //            else
+        //            {
+        //                layer.msg(result.Message, { icon: 5 });
+        //                return false;
+        //            }
+        //        }
+        //    })
+        //}
+        function AllowLoadData(sSubStr, bnt) {  //闈炵┖楠岃瘉
+            //if ($("#HSourceBillNo").val() == '') {
+            //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
+            //    return false;
+            //}
+            //if ($("#HDeptName").val() == '') {
+            //    layer.msg("閮ㄩ棬娌℃湁閫夋嫨!", { icon: 5 });
+            //    return false;
+            //}
+            //if ($("#HSecManager").val() == '') {
+            //    layer.msg("楠屾敹浜烘病鏈夐�夋嫨!", { icon: 5 });
+            //    return false;
+            //}
+            //if ($("#HKeeper").val() == '') {
+            //    layer.msg("淇濈浜烘病鏈夐�夋嫨!", { icon: 5 });
+            //    return false;
+            //}
+            //if ($("#HSupName").val() == '') {
+            //    layer.msg("渚涘簲鍟嗘病鏈夐�夋嫨!", { icon: 5 });
+            //    return false;
+            //}
+            //if ($("#HWHNAME").val() == '') {
+            //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
+            //    return false;
+            //}
+            if ($("#HBillNo").val() == '') {
+                layer.msg("閿欒鐨勫崟鎹彿!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if ($("#HInterID").val() == '') {
+                layer.msg("閿欒鐨勫唴鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if (typeof (sSubStr) == "undefined") {
+                layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if (bnt == 'Saver') {
+                if (!typeof (sSubStr) == "undefined") {
+                    for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
+                        if (parseFloat(sSubStr[i].HQtyMust) > 0) {
+                            if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust)) {
+                                layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                return false;
+                            }
+                        }
+                    }
+                    for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
+                        if (parseFloat(sSubStr[i].HQty) > 0) {
+                            s = 1;
+                        }
+                    }
+                    if (s == 0) {
+                        layer.msg("濮斿鍏ュ簱璁板綍鏈壂鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return false;
+                    }
+                }
+            }
+            else {
+                return true;
+            }
+        }
     </script>
 
 </body>

--
Gitblit v1.9.1