Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

wtt

6 天以前 2ed130171719a0848e8356d28055eb1bdf649d01

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -13,7 +13,7 @@
    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器
    /*var WEBURL = "http://localhost:8082/LuBaoAPI/";*/  //余思杰本地配置
    //var WEBURL = "http://localhost:81/API/";            // é™ˆé•å“²æœ¬åœ°é…ç½®*/
    // var WEBURL = "http://localhost:8082/LuBaoAPI/";  //李林俊本地配置
     var WEBURL = "http://localhost:8082/LuBaoAPI/";  //李林俊本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";  //奥邦
    //var WEBURL = "http://10.1.4.155/API/";            //江丰客户NEW

 WebTM/views/Baseset/»ù´¡×ÊÁÏ/saomazutuo_xiaowei.html

@@ -476,6 +476,7 @@
                        return;
                    }
                    hform.HMaterID = materialInfo.HMaterID;
                    hform.HMaterNumber = materialInfo.HMaterNumber;
                    hform.HMaterName = materialInfo.HMaterName;
                    hform.HMaterModel = materialInfo.HMaterModel;
                    $.ajax({
@@ -498,7 +499,7 @@
                                listData.push({
                                    æ¡ç ç¼–号: sBarCode,
                                    æ•°é‡: 1,
                                    ç‰©æ–™ä»£ç : hform.HMaterID,
                                    ç‰©æ–™ä»£ç : hform.HMaterNumber,
                                    ç‰©æ–™åç§°: hform.HMaterName,
                                    æ¡ç ä¸ªæ•°: 1,
                                    HInterID: hform.HInterID
@@ -537,6 +538,7 @@
                            if (res.count == 1) {
                                resolve({
                                    HMaterID: data[0].HMaterID,
                                    HMaterNumber: data[0].HMaterNumber,
                                    HMaterName: data[0].HMaterName,
                                    HMaterModel: data[0].HMaterModel
                                });