Merge branch 'Haozi'

# Conflicts:
#	app/Http/Controllers/TestController.php

app/Services/HandInStorageService.php

@@ -128,7 +128,7 @@ class HandInStorageService
 
             $skuInvs = [];    // 库位没有该商品
             foreach ($invs as $inv) {
-                if ($inv['customerid'] != $param['customerid'] || $inv['sku'] != $param['sku']) {  // 库位没有该商品
+                if ($inv['customerid'] != $param['customerid'] && $inv['sku'] != $param['sku']) {  // 库位没有该商品
                     $skuInvs[] = $inv;
                     continue;
                 }
@@ -141,7 +141,7 @@ class HandInStorageService
             $inv = OracleInvLotLocId::query()->where('locationid', $info['location'])->first();
             if (!$inv) return true; //当前库位无库存余量 可直接入库
 
-            if ($inv['customerid'] == $param['customerid'] || $inv['sku'] == $param['sku']) return true;
+            if ($inv['customerid'] == $param['customerid'] && $inv['sku'] == $param['sku']) return true;
             else return 4; //库位：产品不能混放
         }
         // 库位

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

@@ -316,21 +316,31 @@
                                 self.prop('checked', false);
                             });
                         },
+                        clearInfo(){
+                            this.info.name='';
+                            this.info.amount='';
+                            this.info.barCode='';
+                            this.info.location='';
+                            this.info.paTotal='';
+                        },
                         ensure() {
                             this.errors={};//初始errors状态
                             this.verifyInfoAndCheckData();
+                            tempTip.setDuration(1000);
+                            tempTip.waitingTip('提交中');
                             let url = '{{url('store/handInStorage/handFluxPa')}}';
                             if (JSON.stringify(this.errors)==='{}') window.axios.post(url,{info:this.info,checkData:this.checkData})
                                 .then(res=>{
                                     if (res.data.success){
                                         window.tempTip.setDuration(3000);
                                         window.tempTip.showSuccess(res.data.data);
-                                        this.info={};
+                                        // this.info={};
+                                        this.clearInfo();
                                         this.checkData=[];
                                         this.tasks=[];
                                         this.invLots=[];
                                         this.$forceUpdate()
-                                        document.getElementById("trackNumber").focus();
+                                        document.getElementById("trackNumber").select();
                                         return;
                                     }
                                     window.tempTip.setDuration(3000);

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

@@ -7,7 +7,7 @@
             <div class="card-header text-center bg-transparent" id="header_title">
                 <span class="font-weight-bold h3">收货</span>
             </div>
-            <div class="">
+            <div >
                 <div class="offset-1 mt-2">
                     <span class="font-weight-bold h5">ASN号:</span><br>
                     <p class="small font-weight-light">可输入条码,ASN号,货主编号(如:YOUWU)_搜索</p>
@@ -84,6 +84,7 @@
                 isAndroid:false,
                 asnno:'',
                 customerid:'',
+
             },
             mounted(){
                 if (navigator.userAgent.indexOf("Android")!==-1)this.isAndroid = true;
@@ -91,7 +92,7 @@
                 $("#container").removeClass("d-none");
                 this.height=window.screen.availHeight;
                 document.getElementById('cardTable').style.height=this.height*0.35+'px';
-                document.getElementById("asn").focus();
+                $('#asn').trigger("click").focus();
             },
             methods:{
                 //页面初始化
@@ -164,9 +165,6 @@
                         this.info.asntype=asn.asntype;
                     }
                 },
-                onfocus(){
-                    document.getElementById("asn").focus();
-                },
                 ensure(){
                     let error = {};
                     if (!this.info.asnno)error.asnno = ["ASN号必填"];
@@ -193,7 +191,6 @@
                 cancel(){
                     setTimeout(function () {
                         window.location.reload();
-                        this.onfocus();
                     },100);
                 },
             },

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

@@ -313,6 +313,8 @@
                     if (Number(this.info.receivedqty)===Number(this.info.expectedqty)){
                         window.tempTip.setDuration(2000); window.tempTip.show("收货已完成");
                     }
+                    tempTip.setDuration(1000);
+                    tempTip.waitingTip('提交中');
                     let url = '{{url('store/handInStorage/fluxHandIn')}}';
                     if (JSON.stringify(this.errors)==='{}') window.axios.post(url,{info:this.info})
                         .then(res=>{
@@ -327,6 +329,8 @@
                                 this.$forceUpdate();
                                 document.getElementById("sku").focus();
                                 document.getElementById("sku").select();
+                                if (this.asn_expectedqty==this.asn_receivedqty)
+                                    window.location.href="{{url('store/handInStorage/receive')}}";
                                 return;
                             }
                             window.tempTip.setDuration(3000);

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

@@ -9,7 +9,7 @@
     <title>入库首页</title>
     <link href="{{ mix('css/app.css') }}" rel="stylesheet">
 </head>
-<body class="h-100">
+<body class="">
 <div class="container-fluid h-100 text-center">
     <div class="container-fluid h-25">
         <a class="navbar-brand" href="{{ url('/control/panel/menu') }}" title="宝时 Warehouse Assistance System" style="vertical-align: text-bottom">
@@ -22,6 +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/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>