Merge branch 'wxw'

Administrator

2024-02-22 d34d36d5c0478d1e5f56b92fc5b38fc5ca379e5c

 HTML/views/StatisticalReport/InventoryStatistics.html

@@ -51,6 +51,20 @@
                  </div>
               </div>
               <div class="layui-inline mingxi">
                  <label class="layui-form-label" style="width: 60px;">货主编码</label>
                  <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                     <input type="text" id="OwnerNo" name="OwnerNo" placeholder="货主编码" autocomplete="off"
                        class="layui-input">
                  </div>
               </div>
               <div class="layui-inline mingxi">
                  <label class="layui-form-label" style="width: 60px;">货主名称</label>
                  <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                     <input type="text" id="OwnerName" name="OwnerName" placeholder="货主名称" autocomplete="off"
                        class="layui-input">
                  </div>
               </div>
               <div class="layui-inline mingxi">
                  <label class="layui-form-label" style="width: 60px;">批次号</label>
                  <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                     <input type="text" id="LotNo" name="LotNo" placeholder="批次号" autocomplete="off"
@@ -71,6 +85,7 @@
                        class="layui-input">
                  </div>
               </div>
					
               <div class="layui-inline ">
                  <label class="layui-form-label" style="width: 60px;">库存状态</label>
                  <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
@@ -338,6 +353,10 @@
                  {field: 'SkuNo',title: '物料编码',align: 'center',totalRowText: "合计:", "disabled": true}, 
                  {field: 'SkuName',title: '物料名称',align: 'center', "disabled": true}, 
                  {field: 'Standard',title: '物料规格',align: 'center', "disabled": true}, 
                  {field: 'LotNo',title: '批次号',align: 'center', "disabled": true},
                  {field: 'LotText',title: '批次描述',align: 'center'},
                  {field: 'OwnerNo',title: '货主编码',align: 'center'},
                  {field: 'OwnerName',title: '货主名称',align: 'center'}, 
                  {field: 'Qty',title: '库存数量',align: 'center',totalRow: true}, 
                  {field: 'LockQty',title: '锁定数量',align: 'center',totalRow: true}, 
                  {field: 'FrozenQty',title: '冻结数量',align: 'center',totalRow: true}
@@ -378,7 +397,7 @@
                  cols:colsJson
               };

               sendData(IP + "/Statistical/GetInventoryList?SkuNo=" + $("#SkuNo").val() + "&&SkuName=" + $("#SkuName").val(), {}, 'get', function (res) {
               sendData(IP + "/Statistical/GetInventoryList?SkuNo=" + $("#SkuNo").val() + "&&SkuName=" + $("#SkuName").val() + "&&OwnerNo=" + $("#OwnerNo").val()+ "&&OwnerName=" + $("#OwnerName").val(), {}, 'get', function (res) {
                  console.log(res)
                  if (res.code == 0) { //成功
                     var list = res.data;
@@ -502,6 +521,8 @@
                  {field: 'SkuName',title: '物料名称',align: 'center'}, 
                  {field: 'Standard',title: '物料规格',width: 130,align: 'center'}, 
                  {field: 'LotNo',title: '批次号',align: 'center'}, 
                  {field: 'OwnerNo',title: '货主编码',align: 'center'},
                  {field: 'OwnerName',title: '货主名称',align: 'center'}, 
                  {field: 'Qty',title: '库存数量',width: 110,align: 'center'}, 
                  {field: 'LockQty',title: '锁定数量',width: 110,align: 'center'},
                  {field: 'Status',templet: '#buttonTpl',title: '库存状态',width: 90,align: 'center'}, 
@@ -510,7 +531,7 @@
               ]];
         var DetailColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//将表头数据进行url编码
         //#endregion
         function refreshTable2(sku) {
         function refreshTable2(sku,lotNo) {
            //#region 自定义表头
            var colsJson2
            var param1={
@@ -542,7 +563,7 @@
                  cols:colsJson2
               };
               
               sendData(IP + "/Statistical/GetInventoryList1?SkuNo=" + sku + "&&SkuName=" + $("#SkuName").val() + "&&LotNo=" + $("#LotNo").val() + "&&LocatNo=" + $("#LocatNo").val() + "&&PalletNo=" + $("#PalletNo").val() + "&&Status=" + $("#Status").val() + "&&InspectStatus=" + $("#InspectStatus").val(), {}, 'get', function (res) {
               sendData(IP + "/Statistical/GetInventoryList1?SkuNo=" + sku + "&&SkuName=" + $("#SkuName").val() + "&&LotNo=" + lotNo + "&&LocatNo=" + $("#LocatNo").val() + "&&PalletNo=" + $("#PalletNo").val() + "&&Status=" + $("#Status").val() + "&&InspectStatus=" + $("#InspectStatus").val()+ "&&OwnerNo=" + $("#OwnerNo").val()+ "&&OwnerName=" + $("#OwnerName").val(), {}, 'get', function (res) {
                  if (res.code == 0) //成功
                  {
                     var list = res.data;
@@ -572,6 +593,7 @@

         //接受全局变量
         let quanSkuNo = '';
         let quanLotNo='';
         //监听搜索
         form.on('submit(LAY-app-contlist-search)', function (data) {
            var SkuNo = $("#SkuNo").val();
@@ -579,6 +601,8 @@
            var LotNo = $("#LotNo").val();
            var LocatNo = $("#LocatNo").val();
            var PalletNo = $("#PalletNo").val();
            var OwnerNo = $("#OwnerNo").val();
            var OwnerName = $("#OwnerName").val();
            var Status = $("#Status").val();
            var InspectStatus = $("#InspectStatus").val();
            if (yemianid == 0) {
@@ -586,8 +610,9 @@
               refreshTable(SkuNo, SkuName);
            } else if (yemianid == 1) {
               quanSkuNo = '';
               quanLotNo='';
               console.log("明细");
               refreshTable2(SkuNo);
               refreshTable2(SkuNo,LotNo);
            }

         });
@@ -599,7 +624,8 @@
            $('.layui-tab-content .layui-tab-item').eq(1).attr('class', 'layui-tab-item layui-show')
            console.log(obj);
            quanSkuNo = obj.data.SkuNo;
            refreshTable2(obj.data.SkuNo);
            quanLotNo=obj.data.lotNo;
            refreshTable2(obj.data.SkuNo,obj.data.LotNo);
            yemianid = 1;
         });

@@ -612,7 +638,7 @@
               refreshTable(SkuNo, SkuName);
            } else if (yemianid == 1) {
               console.log("明细");
               refreshTable2(quanSkuNo);
               refreshTable2(quanSkuNo,quanLotNo);
            }
         });