Merge branch 'djp'

test

7 小时以前 ae03ec7001b6ba415fa5ccac7c6ff06c81578eb1

 Pda/View/HouseDataSetting/stockQuery.html

@@ -119,8 +119,7 @@
                           autocomplete="off" class="layui-input">
                     </div>
                  </div>
                  <!--  -->
                  <div id="" class="layui-form-item layout-input" style="margin-top: 5px;">
                  <!-- <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="SkuNo" type="text" lay-verify="stock"
@@ -140,7 +139,7 @@
                        <input id="Standard" type="text" lay-verify="stock"  
                           autocomplete="off" class="layui-input" style="border: 0px;" disabled>
                     </div>
                  </div>
                  </div> -->
                  <div id="" class="" style="width: 100%;height: 36px;margin-top: 15px;">
                     <button id="btnQuery" class="btn-ok"  type="button">查询</button>
                  </div>
@@ -172,6 +171,8 @@
               <!-- <p class="box-list-title">已绑定箱子列表</p> -->
               <table id="tableBoxList" class="tbl-box-list"  border="1px"    >
                  <tr>
                     <th >物料名称</th>
                     <th >物料编码</th>
                     <th >物品批次</th>
                     <th >库存<br>数量</th>
                     <th >锁定<br>数量</th>
@@ -179,7 +180,9 @@
                  </tr>
                  <tr id="boxCell" style="display: none;">
                     
                     <td name="LotNo">物料批次</td>
                     <td name="SkuName" style="word-wrap: break-word; max-width: 64px;">物料名称</td>
                     <td name="SkuNo" style="word-wrap: break-word; max-width: 48px;">物料编码</td>
                     <td name="LotNo" style="word-wrap: break-word; max-width: 48px;">物料批次</td>
                     <td name="Qty">剩余数量</td>
                     <td name="LockQty">锁定数量</td>
                     <td name="FrozenQty">冻结数量</td> 
@@ -245,10 +248,10 @@
            function clear(){
               $("#LocatNo").val('');
               $("#PalletNo").val('');
               $("#BoxNo").val('');
               $("#SkuNo").val("");
               $("#SkuName").val("");
               $("#Standard").val(""); 
               //$("#BoxNo").val('');
               //$("#SkuNo").val("");
               //$("#SkuName").val("");
               //$("#Standard").val(""); 
            }
            
            $("#btnQuery").click(function(){
@@ -270,10 +273,10 @@
                     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); 
                     //$("#BoxNo").val(res.data[0].BoxNo);
                     // $("#SkuNo").val(res.data[0].SkuNo);
                     // $("#SkuName").val(res.data[0].SkuName);
                     // $("#Standard").val(res.data[0].Standard); 
                     tableData = deepCopy(res.data)
                     refreshTable()
                  } else { //不成功
@@ -318,6 +321,8 @@
                     idx++;
                     tr.attr('index', idx)
                     
                     tr.find("td[name='SkuName']").html(list[i].SkuName);
                     tr.find("td[name='SkuNo']").html(list[i].SkuNo);
                     tr.find("td[name='LotNo']").html(list[i].LotNo);
                     tr.find("td[name='Qty']").html(list[i].Qty);
                     tr.find("td[name='LockQty']").html(list[i].LockQty);