Merge branch 'yyk'

yuyou_x

2024-03-23 5b529126898f79c90062020389b56702a92bd490

Merge branch 'yyk'

 HTML/js/public.js

@@ -1,10 +1,11 @@
//var IP = "http://47.104.149.73:1991";//接口IP
// var IP = "http://172.16.71.101:8082/";//接口IP
//var IP = "http://localhost:13243/api";
var IP = "http://localhost:50515/api";
// var IP = "http://localhost:50515/api";
// var IP = "http://localhost:44318/api";
//var IP = "http://192.168.1.6:8017";
//var IP = "http://192.168.1.226:8086";  
var IP = "http://192.168.62.200:8888/api";  

var pageCnt = 15;
var pageLimits = [10, 15, 20, 30, 50, 70, 100];

 HTML/views/WareHouseSetting/FlatLibraryLegend.html

@@ -139,7 +139,7 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">排</label>
                                    <label class="layui-form-label">楼层</label>
                                    <div class="layui-input-inline">
                                        <select name="Row" id="Row" lay-filter="SelectRow">
                                            <option value="1" selected>一楼</option>
@@ -179,12 +179,12 @@
                                </div>

                                <!-- //定时自刷新库位图例 -->
                                <!-- <div class="layui-inline" style="float: right;">
                                <div class="layui-inline" style="float: right;">
                                    <label class="layui-form-label" style="margin-top: 10px;">自动刷新</label>
                                    <div class="layui-input-inline" style="width: auto;">
                                        <input type="checkbox" checked="" id="autoRefresh" lay-skin="switch" lay-filter="switchTest" lay-text="开|关">
                                    </div>                                    
                                </div> -->
                                </div>
                                
                            </div>
                        </div>
@@ -372,11 +372,10 @@


            //获取数据渲染库位图
            function GetSlotVm(houseNo, row,depth) {				
            function GetSlotVm(houseNo, row) {				
                var param = {
                    WareHouseNo: houseNo,
                    Row: row,
                    Depth: depth
                    Row: row
                }
                sendData(IP + "/Sys/GetFlatLibraryLegend", param, 'get', function (res) {
                    console.log(res)
@@ -1058,9 +1057,9 @@
            //定时器
            setInterval(function(){
                if(autoRefresh){
                    GetSlotVm($("#WareHouseNo").val(), $("#RoadwayNo").val(), $("#Row").val(), $("#Depth").val());	
                    GetSlotVm($("#WareHouseNo").val(), $("#Row").val());	
                    //var currentDate = new Date();
                    //console.log('自动刷新了，'+currentDate)				
                    // console.log('自动刷新了，'+currentDate)				
                }
            },10000)//10秒自动刷新一次
            // #endregion

 Pda/View/AsnSetting/lingXiangEnter.html

@@ -51,7 +51,7 @@
                <table border="" cellspacing="" cellpadding="">
                    <tr>
                        <td class="img-back"><a href="../index.html"><img src="/assets/back.jpg" ></a></td>
                        <td class="title-text" lang>拼托入库</td>
                        <td class="title-text" lang>零箱入库</td>
                        <td class="title-menu-icon"><img id="menuImg" src="/assets/menu.jpg" ></td>
                    </tr>
                </table>

 Pda/js/public.js

@@ -5,6 +5,7 @@
 //var IP = "http://192.168.1.2:8017/";
// var IP = "http://192.168.10.112/WmsService/";
// var IP = "http://192.168.1.226:8086";
// var IP = "http://192.168.62.200:8888/api";  
jQuery.support.cors = true;
function sendData(url, data, type, callbackFun) {
    // callbackFun("{}");

 Wms/Wms/appsettings.json

@@ -10,8 +10,8 @@
  "AppSettings": {
    //"ConnectionString": "Server=47.95.120.93;Database=WMS_JC09;User ID=sa;password=boxline!@#; Integrated Security=True;",
    //"ConnectionString": "Server=47.95.120.53;Database=WMS_JC09;User ID=sa;Password=boxline!@#;Integrated Security=False;",
    "ConnectionString": "Server=192.168.62.106;Database=WMS_JC24;User ID=sa;Password=sql2019;Integrated Security=False;",
    //"ConnectionString": "Server=192.168.62.200;Database=WMS_JC24;User ID=sa;Password=sql2019;Integrated Security=False;"
    //"ConnectionString": "Server=192.168.62.106;Database=WMS_JC24;User ID=sa;Password=sql2019;Integrated Security=False;",
    "ConnectionString": "Server=192.168.62.200;Database=WMS_JC24;User ID=sa;Password=sql2019;Integrated Security=False;"
    //"ConnectionString": "Server=.;Database=WMS_JC09;User ID=sa;Password=sql2019;Integrated Security=False;"
    //"ConnectionString": "Data Source=DESKTOP-0EJDG95\\MSSQLSERVER1;Initial Catalog=WMS_V01;Integrated Security=True;"
  },