From 18d20a86ec45394e545a53b4479801401123fc22 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 22 十二月 2022 16:27:41 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

---
 WebTM/views/领料发货/收料入库/Kf_ReciveBill_Fast.html |   61 ++++++++++++++++--------------
 1 files changed, 33 insertions(+), 28 deletions(-)

diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast.html"
index ada87b8..47c4176 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast.html"
@@ -195,32 +195,37 @@
                     return;
                 }
                 var index = layer.load();
-                $.ajax({
-                    url: GetWEBURL() + "/POStockInBillList/Get_ReciveBillByBarcode",
-                    type: "GET",
-                    data: { "HBarCode": HBarCode, "HInterID": HInterID },
-                    success: function (result) {
-                        if (result.code == "1") {
-                            var sSubStr = table.cache['mainTable'];
-                            for (var i = 0; i < sSubStr.length; i++) {
-                                if (sSubStr[i].HSourceEntryID == result.data[0]["HSourceEntryID"]) {
-                                    sSubStr[i].HSQty += parseInt(result.data[0]["HQty"]);
-                                    table.render(option);
-                                    break;
-                                }
-                            }
-                            layer.close(index);
-                        }
-                        else {
-                            layer.close(index);
-                            layer.msg(result.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: "娓╅Θ鎻愮ず" });
-                    }
-                });
+                var sSubStr = table.cache['mainTable'];
+                if (sSubStr[i].HMaterID == HBarCode.split("#")[0]) {
+                    sSubStr[i].HSQty += parseInt(HBarCode.split("#")[1]);
+                    table.render(option);
+                    break;
+                }
+                layer.close(index);
+                //$.ajax({
+                //    url: GetWEBURL() + "/POStockInBillList/Get_ReciveBillByBarcode",
+                //    type: "GET",
+                //    data: { "HBarCode": HBarCode, "HInterID": HInterID },
+                //    success: function (result) {
+                //        if (result.code == "1") {
+                //            var sSubStr = table.cache['mainTable'];
+                //            if (sSubStr[i].HMaterID == HBarCode.split("#")[0]) {
+                //                sSubStr[i].HSQty += parseInt(HBarCode.split("#")[1]);
+                //                table.render(option);
+                //                break;
+                //            }
+                //            layer.close(index);
+                //        }
+                //        else {
+                //            layer.close(index);
+                //            layer.msg(result.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: "娓╅Θ鎻愮ず" });
+                //    }
+                //});
                 $('#HBarCode').val("");
                 $("#HBarCode").focus();
             }
@@ -278,8 +283,8 @@
                     , { field: 'HModel', title: '瑙勬牸鍨嬪彿' }
                     , { field: 'HInterID', title: '涓诲唴鐮�', sort: true, width: 200 }
                     , { field: 'HEntryID', title: '瀛愬唴鐮�', sort: true, width: 200 }
-                    , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', sort: true, width: 200 }
-                    , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', sort: true, width: 200 }
+                    //, { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', sort: true, width: 200 }
+                    //, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', sort: true, width: 200 }
                 ];
                 option = {
                     id: 'mainTable'

--
Gitblit v1.9.1