Merge branch 'Haozi'

app/Http/Controllers/HandInStorageController.php

@@ -195,6 +195,17 @@ class HandInStorageController extends Controller
         }
     }
 
+    public function getInventoryInfos(Request $request)
+    {
+        $this->gate("入库管理-手持入库-库存查询");
+        $param=$request->input('location');
+        /** @var HandInStorageService $handInStorageService  */
+        $handInStorageService=app('HandInStorageService');
+        $invs=$handInStorageService->getInventoryInfos($param);
+        if (count($invs)>0)$this->success($invs);
+        else $this->error('未查询到库存信息');
+    }
+
 
 
 

app/Services/HandInStorageService.php

@@ -3,6 +3,7 @@
 namespace App\Services;
 
 use App\CommodityBarcode;
+use App\OracleActTransactionLog;
 use App\OracleBasCode;
 use App\OracleBasCustomer;
 use App\OracleBasForwardingLoc;
@@ -384,9 +385,11 @@ sql;
             }
         }
 
-        if ($barCode)$sql.=" AND TSK_TASKLISTS.sku in (select SKU from BAS_SKU where ALTERNATE_SKU1='".$barCode."' union
-                                  select SKU from BAS_SKU where ALTERNATE_SKU2='".$barCode."' union
-                                  select SKU from BAS_SKU where ALTERNATE_SKU3='".$barCode."' )";
+        if ($barCode)$sql.=" AND TSK_TASKLISTS.sku in (
+                                    select SKU from BAS_SKU where ALTERNATE_SKU1='".$barCode."' union
+                                    select SKU from BAS_SKU where ALTERNATE_SKU2='".$barCode."' union
+                                    select SKU from BAS_SKU where ALTERNATE_SKU3='".$barCode."' union
+                                    select SKU from BAS_SKU where SKU='".$barCode."' )";
 
         $sql.=' group by TSK_TASKLISTS.CustomerID, TSK_TASKLISTS.DOCNO, TSK_TASKLISTS.Sku, TSK_TASKLISTS.PlanToLotNum,
                TSK_TASKLISTS.PlanToID, DOC_ASN_DETAILS.SKUDESCRC, TSK_TASKLISTS.DOCLINENO) t
@@ -526,16 +529,12 @@ sql;
         return DB::connection("oracle")->transaction(function () use ($info, $invlotatt, $who, $time) {
             //flux 批次号
             $lotNum = $this->getOrCreateLotNum($info, $invlotatt, $who, $time);
-            if (!$lotNum) {
-                DB::connection("oracle")->rollBack();
-                return false;
-            }
+            if (!$lotNum) return false;
+
             //flux 创建入库事务
             $actTransactionLog = $this->setFluxActTransactionLog($info, $lotNum, $who, $time);
-            if (!$actTransactionLog) {
-                DB::connection("oracle")->rollBack();
-                return false;
-            }
+            if (count($actTransactionLog)==0) return false;
+
             //flux 创建上架任务
             $this->setFluxTskTaskListPA($info, $invlotatt, $actTransactionLog, $who, $time);
             //flux 完善库存余量
@@ -692,7 +691,13 @@ sql;
             if ($info['trackNumber']) $trackNumber = $info['trackNumber'];
             else $trackNumber = substr(md5($time), 0, 30);
             $asnHeader = OracleDOCASNHeader::query()->where('asnno', $info['asnno'])->first();
-            $asnDetail = OracleDOCASNDetail::query()->where('asnno', $info['asnno'])->where('sku', $info['sku'])->first();
+            $asnDetail = OracleDOCASNDetail::query()->where('asnno', $info['asnno'])
+                ->where('asnlineno',$info['asnlineno'])->where('sku', $info['sku'])->first();
+            //添加超收判断
+            $actTransactionLogQty=OracleActTransactionLog::query()->where('docno',$info['asnno'])
+                ->where('doclineno',$info['asnlineno'])->where('fmsku', $info['sku'])->count('fmqty');
+            if ((int)($info['amount']+$actTransactionLogQty)>(int)$asnDetail['expectedqty'])return [];
+
             $sql = <<<sql
 INSERT INTO ACT_TRANSACTION_LOG VALUES(?,'IN',?,?,?,?,'ASN',?,?,?,?,?,?,?,?,TO_DATE(?,'yyyy-mm-dd hh24:mi:ss'),?,
 TO_DATE(?,'yyyy-mm-dd hh24:mi:ss'),?,0,0,0,0,TO_DATE(?,'yyyy-mm-dd hh24:mi:ss'),?,?,null,null,null,?,?,?,?,?,?,?,?,
@@ -796,4 +801,43 @@ sql;
             ->where("name", "flux_ts_number")
             ->update(["value" => DB::raw("value+1")]);
     }
+
+    /**
+     * @param $param
+     * @return array
+     * 获取库存信息
+     */
+    public function getInventoryInfos($param): array
+    {
+        $sql = <<<sql
+select BAS_SKU.SKU,INV_LOT_LOC_ID.CUSTOMERID,BAS_SKU.ALTERNATE_SKU1,INV_LOT_LOC_ID.LOCATIONID,INV_LOT_ATT.LOTATT05,INV_LOT_ATT.LOTATT08,
+       INV_LOT_ATT.LOTATT01,INV_LOT_ATT.LOTATT02,INV_LOT_ATT.LOTATT03,INV_LOT_ATT.LOTATT04,
+       sum(INV_LOT_LOC_ID.QTY) AS QTY from INV_LOT_LOC_ID
+    left join BAS_SKU on INV_LOT_LOC_ID.CUSTOMERID=BAS_SKU.CUSTOMERID and INV_LOT_LOC_ID.SKU =BAS_SKU.SKU
+    left join INV_LOT_ATT on INV_LOT_ATT.LOTNUM=INV_LOT_LOC_ID.LOTNUM where
+sql;
+        if ($this->checkUserOwnerAuth($param)) { //输入条件为货主
+            $sql .= ' INV_LOT_LOC_ID.CUSTOMERID= ?';
+        } else if (preg_match('/^[A-Z]{1,3}[0-9]{2,3}[-][0-9]{2,3}[-][0-9]{2,3}$/', $param)) { //判断是否为库位
+            $sql .= ' INV_LOT_LOC_ID.LOCATIONID= ?';
+        } else {
+            $sql .= " BAS_SKU.SKU in (  select SKU from BAS_SKU where ALTERNATE_SKU1=? union
+                                        select SKU from BAS_SKU where ALTERNATE_SKU2=? union
+                                        select SKU from BAS_SKU where ALTERNATE_SKU3=? union
+                                        select SKU from BAS_SKU where SKU=? )";
+        }
+
+        $sql .= ' group by BAS_SKU.SKU,INV_LOT_LOC_ID.CUSTOMERID,BAS_SKU.ALTERNATE_SKU1,INV_LOT_LOC_ID.LOCATIONID,
+        INV_LOT_ATT.LOTATT05,INV_LOT_ATT.LOTATT08,INV_LOT_ATT.LOTATT01,INV_LOT_ATT.LOTATT02,INV_LOT_ATT.LOTATT03,INV_LOT_ATT.LOTATT04';
+        if ($this->checkUserOwnerAuth($param)){
+            $invLots = DB::connection("oracle")->select(DB::raw($sql), [strtoupper($param)
+            ]);
+        }else if(preg_match('/^[A-Z]{1,3}[0-9]{2,3}[-][0-9]{2,3}[-][0-9]{2,3}$/', $param)){
+            $invLots = DB::connection("oracle")->select(DB::raw($sql), [$param]);
+        }else{
+            $invLots = DB::connection("oracle")->select(DB::raw($sql), [$param,$param,$param,$param]);
+        }
+        if (!$invLots) return [];
+        else return $invLots;
+    }
 }

laravel-echo-server.json

@@ -3,20 +3,13 @@
 	"authEndpoint": "/broadcasting/auth",
 	"clients": [
 		{
-			"appId": "3ce79ec696215d04",
-			"key": "e68440520697de422639b451f760f208"
-		},
-		{
-			"appId": "wcs",
-			"key": "62c8838fa8546ad1f1784327a6d25df2"
+			"appId": "85568e6915a996da",
+			"key": "4339d8623127f8f4e8819901cbf62833"
 		}
 	],
 	"database": "redis",
 	"databaseConfig": {
-		"redis": {
-            "port": "6379",
-            "host": "127.0.0.1"
-        },
+		"redis": {},
 		"sqlite": {
 			"databasePath": "/database/laravel-echo-server.sqlite"
 		}
@@ -36,9 +29,9 @@
 		"redis": true
 	},
 	"apiOriginAllow": {
-        "allowCors" : true,
-        "allowOrigin" : "http://127.0.0.1",
-        "allowMethods" : "GET, POST",
-        "allowHeaders" : "Origin, Content-Type, X-Auth-Token, X-Requested-With, Accept, Authorization, X-CSRF-TOKEN, X-Socket-Id"
+		"allowCors": false,
+		"allowOrigin": "",
+		"allowMethods": "",
+		"allowHeaders": ""
 	}
-}
+}

resources/js/utilities/tempTip.js

@@ -138,6 +138,14 @@ const tempTip={
             this.show('网络异常：'+err);
         });
     },
+    showErrorAudio:function (){
+        let src='/sound/滴答电子.mp3';
+         let audio= new Audio(src);
+         setTimeout(function (){
+             audio.play();
+         })
+        window.navigator.vibrate(1000);
+    }
 };
 module.exports=tempTip;
 

resources/views/store/handInStorage/inventoryInfo.blade.php

@@ -0,0 +1,151 @@
+@extends('layouts.app')
+@section('title')手持入库-库存查询@endsection
+
+@section('content')
+    <div class="d-none" id="container">
+        <div class="card offset-md-3 col-md-6">
+            <div class="card-header text-center bg-transparent" id="header_title">
+                <span class="font-weight-bold h3">库存查询</span>
+            </div>
+            <div >
+                <div class="offset-1 mt-2">
+                    <span class="font-weight-bold h5">库位/货主/条码:</span><br>
+                    <p class="small font-weight-light">可输入商品条码,库位,货主编号(如:YOUWU)_查询</p>
+                    <div class="form-group row mt-2">
+                        <label for="location"></label>
+                        <input type="text" class="form-control col-8" id="location" autocomplete="off"
+                               :class="errors.location ? 'is-invalid' : ''" v-model="info.location">
+                        <span class="ml-2">
+                             <button type="button" id="select" class="btn btn-info font-weight-bold" @click="getInventoryInfos()">查询</button>
+                        </span>
+                        <span class="invalid-feedback" role="alert" v-if="errors.location">
+                            <strong>@{{ errors.location[0] }}</strong>
+                        </span>
+                    </div>
+                </div>
+                <div style="overflow: auto;overflow-x: hidden" id="cardTable">
+                    <table class="table-sm table-striped table-bordered table-hover mb-3" style="background: rgb(255, 255, 255);" v-if="invs.length>0">
+                    <tr v-for="(invLot,i) in invs" @click="selectTrOne(i)" :class="selectTr===i+1?'focusing' : ''">
+                        <td style="filter:grayscale(30%);">
+                            <div>
+                                <div style="transform:scale(1)" class="pl-0">
+                                        <span v-if="invLot.customerid">
+                                            <span class="text-black">货主:</span>
+                                            <span class="text-black font-weight-bold">@{{ invLot.customerid }}</span>
+                                        </span>
+                                    <span v-if="invLot.sku">
+                                            <span class="text-black">SKU:</span>
+                                            <span class="text-black font-weight-bold">@{{ invLot.sku }}</span>
+                                    </span>
+                                    <span v-if="invLot.alternate_sku1">
+                                            <span class="text-black">条码:</span>
+                                            <span class="text-danger">@{{ invLot.alternate_sku1 }}</span></span>
+                                    <span v-if="invLot.locationid">
+                                            <span>库位:</span>
+                                            <span class="font-weight-bold">@{{ invLot.locationid }} </span>
+                                        </span>
+                                    <span v-if="invLot.qty">
+                                            <span class="text-lowercase">数量:</span>
+                                            <span class="text-lowercase font-weight-bold">@{{ invLot.qty }} </span><span>&nbsp;&nbsp;</span>
+                                        </span>
+                                    <span v-if="invLot.lotatt01">
+                                            <span class="text-black">生产日期:</span><span class="text-black font-weight-bold">@{{ invLot.lotatt01 }}</span>
+                                            <span>&nbsp;&nbsp;</span>
+                                        </span>
+                                    <span v-if="invLot.lotatt02">
+                                            <span class="text-black">失效日期:</span><span class="text-black font-weight-bold">@{{ invLot.lotatt02 }}</span>
+                                            <span>&nbsp;&nbsp;</span>
+                                        </span>
+                                    <span v-if="invLot.lotatt03">
+                                            <span class="text-black">入库日期:</span><span class="text-black font-weight-bold">@{{ invLot.lotatt03 }}</span>
+                                            <span>&nbsp;&nbsp;</span>
+                                        </span>
+                                    <span v-if="invLot.lotatt04">
+                                            <span class="text-black">批号:</span><span class="text-black font-weight-bold">@{{ invLot.lotatt04 }}</span>
+                                            <span>&nbsp;&nbsp;</span>
+                                        </span>
+                                    <span v-if="invLot.lotatt05">
+                                            <span class="text-black">属性仓:</span><span class="text-black font-weight-bold">@{{ invLot.lotatt05 }}</span>
+                                            <span>&nbsp;&nbsp;</span>
+                                        </span>
+                                    <span v-if="invLot.lotatt08">
+                                            <span class="text-black">质量状态:</span><span class="text-black font-weight-bold">@{{ invLot.lotatt08 }}</span>
+                                            <span>&nbsp;&nbsp;</span>
+                                        </span>
+                                </div>
+                            </div>
+                        </td>
+                    </tr>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+@stop
+
+@section('lastScript')
+    <script type="text/javascript">
+        new Vue({
+            el:"#container",
+            data:{
+                height:0,//屏幕高度
+                info:{},
+                errors:{},
+                invs:[],
+                selectTr:'',
+                isAndroid:false,
+            },
+            mounted(){
+                if (navigator.userAgent.indexOf("Android")!==-1)this.isAndroid = true;
+                this.pageInit();
+                $("#container").removeClass("d-none");
+                this.height=window.screen.availHeight;
+                document.getElementById('cardTable').style.height=this.height*0.50+'px';
+                $('#location').trigger("click").focus();
+            },
+            methods:{
+                //页面初始化
+                pageInit(){
+                    if (!this.isAndroid)return;
+                    let element = document.getElementById("navbarSupportedContent").parentElement;
+                    element.className = "row";
+                    element.children[0].className += " col-5";
+                    element.innerHTML = element.children[0].outerHTML;
+                    let e1 = document.getElementById("menu");
+                    let e2 = document.getElementById("demand-div");
+                    if (e1)e1.remove();
+                    if (e2)e2.remove();
+                    document.getElementById('app').firstElementChild.style.display = 'none';
+                },
+                selectTrOne(i){
+                    if (this.selectTr===i+1){
+                        this.selectTr=0
+                    }else {
+                        this.selectTr=i+1;
+                    }
+                },
+                getInventoryInfos(){
+                    let error = {};
+                    if (!this.info.location)error.location = ["库位/货主/条码必填"];
+                    if (JSON.stringify(error)!=='{}'){this.errors = error;return;}
+                    let url = '{{url('store/handInStorage/getInventoryInfos')}}';
+                    window.axios.post(url,{location:this.info.location})
+                        .then(res=>{
+                            if (res.data.success){
+                                this.invs=res.data.data;
+                                this.$forceUpdate()
+                                return;
+                            }
+                            window.tempTip.setDuration(2000);
+                            window.tempTip.show(res.data.data);
+                            window.tempTip.showErrorAudio();
+                        }).catch(err=>{
+                        window.tempTip.setDuration(2000);
+                        window.tempTip.show("网络错误："+err);
+                        window.tempTip.showErrorAudio();
+                    })
+                },
+            },
+        });
+    </script>
+@stop

resources/views/store/handInStorage/putaway.blade.php

@@ -85,59 +85,61 @@
                     </table>
                 </div>
 
-                <div style="overflow: auto;overflow-x: hidden" class="bg-secondary" v-if="invLots.length>0">
-                    <span class="font-weight-bold ml-1 text-white">库存余量</span>
-                    <table class="table-sm table-striped table-bordered table-hover mb-3"
-                           style="background: rgb(255, 255, 255);">
-                        <tr v-for="(invLot,i) in invLots">
-                            <td style="filter:grayscale(30%);">
-                                <div>
-                                    <div style="transform:scale(1)" class="pl-0">
+                    <div style="overflow: auto;overflow-x: hidden" class="bg-secondary" v-if="invLots.length>0">
+                        <span class="font-weight-bold ml-1 text-white">库存余量</span>
+                        <table class="table-sm table-striped table-bordered table-hover mb-3"
+                               style="background: rgb(255, 255, 255);">
+                            <tr v-for="(invLot,i) in invLots" @click="selectTrOne(i,invLot.locationid)" :class="selectTr===i+1?'focusing' : ''">
+                                <td style="filter:grayscale(30%);">
+                                    <div>
+                                        <div style="transform:scale(1)" class="pl-0">
                                         <span v-if="invLot.customerid">
                                             <span class="text-black">货主:</span>
                                             <span class="text-black font-weight-bold">@{{ invLot.customerid }}</span>
                                         </span>
-                                        <span v-if="invLot.alternate_sku1">
+                                            <span v-if="invLot.alternate_sku1">
                                             <span class="text-black">条码:</span>
                                             <span class="text-danger">@{{ invLot.alternate_sku1 }}</span></span>
-                                        <span v-if="invLot.locationid">
+                                            <span v-if="invLot.locationid">
                                             <span>库位:</span>
                                             <span class="font-weight-bold">@{{ invLot.locationid }} </span>
                                         </span>
-                                        <span v-if="invLot.qty">
+                                            <span v-if="invLot.qty">
                                             <span class="text-lowercase">数量:</span>
                                             <span class="text-lowercase font-weight-bold">@{{ invLot.qty }} </span><span>&nbsp;&nbsp;</span>
                                         </span>
-                                        <span v-if="invLot.lotatt01">
+                                            <span v-if="invLot.lotatt01">
                                             <span class="text-black">生产日期:</span><span class="text-black font-weight-bold">@{{ invLot.lotatt01 }}</span>
                                             <span>&nbsp;&nbsp;</span>
                                         </span>
-                                        <span v-if="invLot.lotatt02">
+                                            <span v-if="invLot.lotatt02">
                                             <span class="text-black">失效日期:</span><span class="text-black font-weight-bold">@{{ invLot.lotatt02 }}</span>
                                             <span>&nbsp;&nbsp;</span>
                                         </span>
-                                        <span v-if="invLot.lotatt03">
+                                            <span v-if="invLot.lotatt03">
                                             <span class="text-black">入库日期:</span><span class="text-black font-weight-bold">@{{ invLot.lotatt03 }}</span>
                                             <span>&nbsp;&nbsp;</span>
                                         </span>
-                                        <span v-if="invLot.lotatt04">
+                                            <span v-if="invLot.lotatt04">
                                             <span class="text-black">批号:</span><span class="text-black font-weight-bold">@{{ invLot.lotatt04 }}</span>
                                             <span>&nbsp;&nbsp;</span>
                                         </span>
-                                        <span v-if="invLot.lotatt05">
+                                            <span v-if="invLot.lotatt05">
                                             <span class="text-black">属性仓:</span><span class="text-black font-weight-bold">@{{ invLot.lotatt05 }}</span>
                                             <span>&nbsp;&nbsp;</span>
                                         </span>
-                                        <span v-if="invLot.lotatt08">
+                                            <span v-if="invLot.lotatt08">
                                             <span class="text-black">质量状态:</span><span class="text-black font-weight-bold">@{{ invLot.lotatt08 }}</span>
                                             <span>&nbsp;&nbsp;</span>
                                         </span>
+                                        </div>
                                     </div>
-                                </div>
-                            </td>
-                        </tr>
-                    </table>
-                </div>
+                                </td>
+                            </tr>
+                        </table>
+                    </div>
+                    <span v-if="mes" class="text-danger font-weight-bold" >@{{ mes }}</span>
+
 
                 <div class="card-footer bg-transparent">
                     <button type="button" id="confirm" class="btn btn-md btn-success font-weight-bold float-right"
@@ -167,6 +169,7 @@
                         element: [
                             "trackNumber","barCode", "amount", "location",
                         ],
+                        mes:'',
                     },
                     mounted() {
                         if (navigator.userAgent.indexOf("Android") !== -1) this.isAndroid = true;
@@ -195,6 +198,14 @@
                           this.checkData=[];
                           this.$forceUpdate();
                         },
+                        selectTrOne(i,location){
+                            if (this.selectTr===i+1){
+                                this.selectTr=0
+                            }else {
+                                this.selectTr=i+1;
+                                this.info.location=location;
+                            }
+                        },
                         checked(e, task, element = undefined) {
                             if (!element)element = e.target;
                             let _this = this;
@@ -214,6 +225,7 @@
                                             $('#'+element.id).prop('checked', false);
                                             window.tempTip.setDuration(3000);
                                             window.tempTip.show('货主,批次不同,不可同时上架');
+                                            window.tempTip.showErrorAudio();
                                         }
                                     });
                                 }
@@ -258,10 +270,12 @@
                                     this.tasks=[];
                                     window.tempTip.setDuration(3000);
                                     window.tempTip.show(res.data.data);
+                                    window.tempTip.showErrorAudio();
                                 }).catch(err => {
                                 this.tasks=[];
                                 window.tempTip.setDuration(3000);
                                 window.tempTip.show("网络错误：" + err);
+                                window.tempTip.showErrorAudio();
                             })
                         },
                         getTsk() {
@@ -280,6 +294,7 @@
                                     if (res.data.success) {
                                         this.tasks = res.data.data;
                                         this.invLots = res.data.inv;
+                                        if (this.invLots.length==0)this.mes='库内暂无该商品库存信息,请自行选定上架库位';
                                         this.$forceUpdate();
                                         setTimeout(function () {
                                             document.getElementById("task_0").checked=true;
@@ -290,9 +305,10 @@
                                                 if (i==0)return;
                                                 if (task.customerid == _this.tasks[0].customerid
                                                     && task.plantolotnum == _this.tasks[0].plantolotnum
-                                                    && task.sku == _this.tasks[0].sku)
+                                                    && task.sku == _this.tasks[0].sku){
                                                     document.getElementById("task_"+i).checked=true;
                                                     _this.checked(1,_this.tasks[i],element);
+                                                }
                                             })
                                             // document.getElementById('cardTable').remove();
                                             document.getElementById('cardTable').style.height=null;
@@ -302,10 +318,12 @@
                                     this.tasks=[];
                                     window.tempTip.setDuration(3000);
                                     window.tempTip.show(res.data.data);
+                                    window.tempTip.showErrorAudio();
                                 }).catch(err => {
                                 this.tasks=[];
                                 window.tempTip.setDuration(3000);
                                 window.tempTip.show("网络错误：" + err);
+                                window.tempTip.showErrorAudio();
                             })
                         },
                         clearChecked(){
@@ -345,9 +363,11 @@
                                     }
                                     window.tempTip.setDuration(3000);
                                     window.tempTip.show(res.data.data);
+                                    window.tempTip.showErrorAudio();
                                 }).catch(err=>{
                                 window.tempTip.setDuration(3000);
                                 window.tempTip.show("网络错误："+err);
+                                window.tempTip.showErrorAudio();
                             })
 
                         },

resources/views/store/handInStorage/receive.blade.php

@@ -142,9 +142,11 @@
                             }
                             window.tempTip.setDuration(2000);
                             window.tempTip.show(res.data.data);
+                            window.tempTip.showErrorAudio();
                         }).catch(err=>{
                         window.tempTip.setDuration(2000);
                         window.tempTip.show("网络错误："+err);
+                        window.tempTip.showErrorAudio();
                     })
                 },
                 closeDetail(asn){
@@ -182,10 +184,12 @@
                             }else {
                                 window.tempTip.setDuration(2000);
                                 window.tempTip.show(res.data.data);
+                                window.tempTip.showErrorAudio();
                             }
                         }).catch(err=>{
                         window.tempTip.setDuration(2000);
                         window.tempTip.show("网络错误："+err);
+                        window.tempTip.showErrorAudio();
                     })
                 },
                 cancel(){

resources/views/store/handInStorage/receiveDetailPage.blade.php

@@ -211,9 +211,11 @@
                             this.clearInfo();
                             window.tempTip.setDuration(2000);
                             window.tempTip.show(res.data.data);
+                            window.tempTip.showErrorAudio();
                         }).catch(err=>{
                         window.tempTip.setDuration(2000);
                         window.tempTip.show("网络错误："+err);
+                        window.tempTip.showErrorAudio();
                     })
                 },
                 checked(asnDetail){
@@ -231,9 +233,11 @@
                             }
                             window.tempTip.setDuration(2000);
                             window.tempTip.show(res.data.data);
+                            window.tempTip.showErrorAudio();
                         }).catch(err=>{
                         window.tempTip.setDuration(2000);
                         window.tempTip.show("网络错误："+err);
+                        window.tempTip.showErrorAudio();
                     })
                 },
                 clearInfo(){
@@ -296,10 +300,12 @@
                                 window.tempTip.setDuration(3000);
                                 window.tempTip.show(res.data.data);
                                 this.isInit=true;
+                                window.tempTip.showErrorAudio();
                             }
                         }).catch(err=>{
                         window.tempTip.setDuration(3000);
                         window.tempTip.show("网络错误："+err);
+                        window.tempTip.showErrorAudio();
                     })
                 },
                 ensure(){
@@ -335,9 +341,11 @@
                             }
                             window.tempTip.setDuration(3000);
                             window.tempTip.show(res.data.data);
+                            window.tempTip.showErrorAudio();
                         }).catch(err=>{
                         window.tempTip.setDuration(2000);
                         window.tempTip.show("网络错误："+err);
+                        window.tempTip.showErrorAudio();
                     })
                 },
                 cancel(){

resources/views/store/inStorage/androidIndex.blade.php

@@ -22,7 +22,7 @@
 <!--                <a href="{{url('store/inStorage/cacheRackStorage')}}"><button class="btn btn-info w-75 text-white" style="height: 60px"><h4>整箱入库</h4></button></a>-->
                 @can("入库管理-手持入库-收货")<a href="{{url('store/handInStorage/receive')}}"><button class="btn btn-info w-75 h-25 text-white" style="height: 60px"><h4>收货</h4></button></a>@endcan
                 @can("入库管理-手持入库-上架")<a href="{{url('store/handInStorage/putaway')}}"><button class="btn btn-info w-75 h-25 mt-3 text-white" style="height: 60px"><h4>上架</h4></button></a>@endcan
-{{--                @can("入库管理-手持入库-库存查询")<a href="{{url('store/handInStorage/inventoryInfo')}}"><button class="btn btn-info w-75 h-25 mt-3 text-white" style="height: 60px"><h4>库存查询</h4></button></a>@endcan--}}
+                @can("入库管理-手持入库-库存查询")<a href="{{url('store/handInStorage/inventoryInfo')}}"><button class="btn btn-info w-75 h-25 mt-3 text-white" style="height: 60px"><h4>库存查询</h4></button></a>@endcan
                 @can("入库管理-入库-半箱补货入库")<a href="{{url('store/inStorage/halfChestStorage')}}"><button class="btn btn-info w-75 h-25 mt-3 text-white" style="height: 60px"><h4>半箱入库</h4></button></a>
                 <a href="{{url('store/inStorage/boxBindShelf')}}"><button class="btn btn-info w-75 h-25 mt-3 text-white" style="height: 60px"><h4>新箱上架</h4></button></a>
                 <a href="{{url('store/inStorage/boxBindModel')}}"><button class="btn btn-info w-75 h-25 mt-3 text-white" style="height: 60px"><h4>料箱型号</h4></button></a>

routes/web.php

@@ -509,8 +509,10 @@ Route::group(['prefix'=>'package'],function(){
         Route::group(['prefix'=>'handInStorage'],function() {
             Route::get('receive',function (){return view('store.handInStorage.receive');});//收货页面
             Route::get('putaway',function (){return view('store.handInStorage.putaway');});//上架页面
+            Route::get('inventoryInfo',function (){return view('store.handInStorage.inventoryInfo');});//库存查询页面
             Route::get('android.index',function (){return view('store.handInStorage.androidIndex');});
             Route::post('selectAsn','HandInStorageController@selectAsn');
+            Route::post('getInventoryInfos','HandInStorageController@getInventoryInfos');
             Route::post('checkAsnOperation','HandInStorageController@checkAsnOperation');
             Route::post('selectAsnDetails','HandInStorageController@selectAsnDetails');
             Route::post('getBasSkuWithLot','HandInStorageController@getBasSkuWithLot');