Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS

test

9 小时以前 98e221d6dc26183efab868ee5f11a65d5791304e

 HTML/views/StatisticalReport/InventoryStatistics.html

@@ -149,6 +149,22 @@
                        placeholder="结束时间">
                  </div>
               </div> -->
               <div class="layui-inline">
                  <label class="layui-form-label" style="width: 60px;">所属仓库</label>
                  <div class="layui-input-inline">
                     <select name="WareHouseNo" id="WareHouseNo" lay-filter="getWareHouseNo" lay-search>
                        <option value=""></option>
                     </select>
                  </div>
               </div>
               <div class="layui-inline">
                  <label class="layui-form-label" style="width: 60px;">所属区域</label>
                  <div class="layui-input-inline">
                     <select name="AreaNo" id="AreaNo" lay-filter="getAreaNo" lay-search>
                        <option value=""></option>
                     </select>
                  </div>
               </div>
               <div class="layui-inline sousuo">
                  <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
                     lay-filter="LAY-app-contlist-search">
@@ -306,7 +322,7 @@
         var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//将表头数据进行url编码
         //#endregion
         //获取总量信息
         function refreshTable(SelectType, SkuNo, SkuName, OwnerNo, OwnerName, LotNo, Status, InspectStatus) {
         function refreshTable(SelectType, SkuNo, SkuName, OwnerNo, OwnerName, LotNo, Status, InspectStatus, WareHouseNo, AreaNo) {
            //#region 自定义表头
            var colsJson
            var param1 = {
@@ -347,6 +363,8 @@
                  LotNo: LotNo, //批次号
                  Status: Status, //库存状态 = $("#Status").val();
                  InspectStatus: InspectStatus, //质检状态 = $("#InspectStatus").val();
                  WareHouseNo:WareHouseNo, //所属仓库
                  AreaNo:AreaNo//所属区域
               };
               sendData(IP + "/Statistical/GetInventoryList", param, 'get', function (res) {
                  console.log(res)
@@ -381,7 +399,9 @@
            var OwnerName = $("#OwnerName").val();
            var Status = $("#Status").val();
            var InspectStatus = $("#InspectStatus").val();
            refreshTable(SelectType, SkuNo, SkuName, OwnerNo, OwnerName, LotNo, Status, InspectStatus);
            var WareHouseNo = $("#WareHouseNo").val();
            var AreaNo = $("#AreaNo").val();
            refreshTable(SelectType, SkuNo, SkuName, OwnerNo, OwnerName, LotNo, Status, InspectStatus, WareHouseNo, AreaNo);

         });

@@ -414,6 +434,51 @@


         });
         //获取仓库下拉框信息
         sendData(IP + "/Sys/GetWarehouseDic", {}, 'get', function (res) {
            if (res.code == 0) { //成功
               for (var i = 0; i < res.data.length; i++) {
                  $("#WareHouseNo").append('<option value =' + res.data[i].WareHouseNo + '>' + res.data[i].WareHouseNo + '-' +
                     res.data[i].WareHouseName + '</option>');
               }
               form.render('select');
            } else { //不成功
               layer.msg(res.msg, {
                  icon: 2,
                  time: 2000 //2秒关闭（如果不配置，默认是3秒）
               }, function () { });
            }
         });

         getAR("");
         form.on('select(getWareHouseNo)', function (data) {
            console.log(data);
            getAR(data.value);
         });
         function getAR(val) {
            //获取 区域下拉框
            sendData(IP + "/Sys/GetStorageAreaByHouseNo?wareHouseNo=" + val, {}, 'get', function (res) {
               $("#AreaNo").empty();
               $("#AreaNo").append('<option value =""></option>');
               if (res.code == 0) { //成功 
                  for (var i = 0; i < res.data.length; i++) {
                     $("#AreaNo").append('<option value =' + res.data[i].AreaNo + '>' + res.data[i].AreaNo + '-' +
                        res.data[i].AreaName + '</option>');
                  }
                  form.render('select');
               } else { //不成功
                  layer.msg('获取区域信息失败', {
                     icon: 2,
                     time: 2000 //2秒关闭（如果不配置，默认是3秒）
                  }, function () {
                     //回调
                     form.render('select');
                  });
               }
            });

         };

         //#region 自定义表头
         //自定义表头         
         active = {