增加迦南发布网址,夏宝到货确认扫码模块恢复被屏蔽的扫描物料条码代码
4个文件已修改
85 ■■■■ 已修改文件
WebTM/App_Data/MssqlReportData.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill_JiaNan.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/收料入库/Kf_ReciveBill_Fast_XiaBao.html 77 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/App_Data/MssqlReportData.cs
@@ -33,6 +33,7 @@
    //public const string SqlConnStr = "Data Source=192.168.2.10;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//九菱电机
    //public const string SqlConnStr = "Data Source=192.168.1.8;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//添康科技
    //public const string SqlConnStr = "Data Source=192.168.6.5;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//舜成
    //public const string SqlConnStr = "Data Source=172.16.1.89;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//迦南
    //public string sServer;
    //public string sDataBase;
WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,9 +3,9 @@
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地*/
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    //var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    //var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    //var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
@@ -33,6 +33,7 @@
    /*var WEBURL = "http://121.36.199.126:8181/API/";    //三升*/
    //var WEBURL = "http://36.134.2.30:200/WEBS-API/";  //金帅
    //var WEBURL = "http://localhost:81/API";
    //var WEBURL = "http://172.16.1.85/API/";           //迦南
    return WEBURL
}
WebTM/views/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Gy_BarCodeBill_JiaNan.html
@@ -567,7 +567,7 @@
                    var HEndQty_Sure = $("#HEndQty_Sure").val();
                    if (HEndQty != HEndQty_Sure) {
                        layer.msg("尾包数量与尾巴确认不一致!!", { icon: 5, btn: [get_MessageError('[0000-2-008]确认', sessionStorage["HTranSlate"])], time: 2000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]温馨提示", sessionStorage["HTranSlate"]) });
                        layer.msg("尾包数量与尾包确认不一致!!", { icon: 5, btn: [get_MessageError('[0000-2-008]确认', sessionStorage["HTranSlate"])], time: 2000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]温馨提示", sessionStorage["HTranSlate"]) });
                        return Result = false;
                    }
                }
WebTM/views/ÁìÁÏ·¢»õ/ÊÕÁÏÈë¿â/Kf_ReciveBill_Fast_XiaBao.html
@@ -192,46 +192,43 @@
            });
            //扫描条形码方法
            function GetMeesageByBarCode() {
                layer.msg("无需扫描物料条码!")
                //var HBarCode = $('#HBarCode').val();
                //if (!HBarCode) {
                //    layer.msg("条形码不能为空!")
                //    return;
                //}
                //var HInterID = $('#HInterID').val();
                //if (!HInterID) {
                //    layer.msg("请先输入收料通知单单据号!")
                //    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].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: "温馨提示" });
                //    }
                //});
                var HBarCode = $('#HBarCode').val();
                if (!HBarCode) {
                    layer.msg("条形码不能为空!")
                    return;
                }
                var HInterID = $('#HInterID').val();
                if (!HInterID) {
                    layer.msg("请先输入收料通知单单据号!")
                    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].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();
            }