Merge branch 'master' into djp

test

4 天以前 e9c1fb1cae94c52d2a634f6e21a3a87354b52716

 Pda/View/HouseDataSetting/stockQuery.html

@@ -111,6 +111,15 @@
                           autocomplete="off" class="layui-input">
                     </div>
                  </div>
                  <!-- 箱码 -->
                  <div id="" class="layui-form-item layout-input" style="margin-top: 5px;">
                     <label class="layui-form-label">箱码</label>
                     <div class="layui-input-block">
                        <input id="BoxNo" type="text" lay-verify="stock" placeholder="箱码"
                           autocomplete="off" class="layui-input">
                     </div>
                  </div>
                  <!--  -->
                  <div id="" class="layui-form-item layout-input" style="margin-top: 5px;">
                     <label class="layui-form-label">物料编码</label>
                     <div class="layui-input-block">
@@ -236,13 +245,14 @@
            function clear(){
               $("#LocatNo").val('');
               $("#PalletNo").val('');
               $("#BoxNo").val('');
               $("#SkuNo").val("");
               $("#SkuName").val("");
               $("#Standard").val(""); 
            }
            
            $("#btnQuery").click(function(){
               if($('#LocatNo').val() == '' && $('#PalletNo').val() == '' && $('#SkuName').val() == ''){
               if($('#LocatNo').val() == '' && $('#PalletNo').val() == '' && $('#BoxNo').val() == '' && $('#SkuName').val() == ''){
                  // layer.msg("请输入查询条件", {
                  //    icon: 2,
                  //    time: 2000 //2秒关闭（如果不配置，默认是3秒）
@@ -252,6 +262,7 @@
               var param = {
                  LocatNo: $('#LocatNo').val(),
                  PalletNo: $('#PalletNo').val(),
                  BoxNo:$('#BoxNo').val(),
               };
               sendData(IP + "/PdaCr/GetStockQueryList", param, 'get', function(res) {
                  console.log("库存查询：",res)
@@ -259,6 +270,7 @@
                     clear();
                     $("#LocatNo").val(res.data[0].LocatNo);
                     $("#PalletNo").val(res.data[0].PalletNo);
                     $("#BoxNo").val(res.data[0].BoxNo);
                     $("#SkuNo").val(res.data[0].SkuNo);
                     $("#SkuName").val(res.data[0].SkuName);
                     $("#Standard").val(res.data[0].Standard);