盘点，入库等BUG

app/Console/Commands/WASSyncWMSOrderInformation.php

@@ -47,24 +47,24 @@ class WASSyncWMSOrderInformation extends Command
 
     public function WasSyncWmsOrder(){
 
-        /** @var OrderTrackingService $orderTrackingService */
-        $orderTrackingService  = app('orderTrackingService');
-
-        $dataInterval = intval(data_get(config('sync'), 'order_tracking_import.interval')) * 60 + 5;
-
-        $startDate = Carbon::now()->subSeconds($dataInterval);
-
-        $syncStartDate = data_get(config('sync'), 'order_tracking_import.start_at');
-
-        if($syncStartDate ?? false){
-            $syncStartDate = Carbon::parse($syncStartDate);
-            if ($startDate->lt($syncStartDate)) {
-                $startDate = $syncStartDate;
-            }
-        }
-
-//        $startDate = Carbon::parse('2020-05-06 13:16:51')->toDateTimeString();
-        $orderTrackingService->根据设置从WMS同步追踪货主的订单($startDate);
+//        /** @var OrderTrackingService $orderTrackingService */
+//        $orderTrackingService  = app('orderTrackingService');
+//
+//        $dataInterval = intval(data_get(config('sync'), 'order_tracking_import.interval')) * 60 + 5;
+//
+//        $startDate = Carbon::now()->subSeconds($dataInterval);
+//
+//        $syncStartDate = data_get(config('sync'), 'order_tracking_import.start_at');
+//
+//        if($syncStartDate ?? false){
+//            $syncStartDate = Carbon::parse($syncStartDate);
+//            if ($startDate->lt($syncStartDate)) {
+//                $startDate = $syncStartDate;
+//            }
+//        }
+//
+////        $startDate = Carbon::parse('2020-05-06 13:16:51')->toDateTimeString();
+////        $orderTrackingService->根据设置从WMS同步追踪货主的订单($startDate);
 //        $orderTrackingService->trackingWmsOrder($startDate);
     }
 }

app/Http/Controllers/StoreCheckingReceiveController.php

@@ -18,7 +18,7 @@ use Maatwebsite\Excel\Facades\Excel;
 class StoreCheckingReceiveController extends Controller
 {
     public function mission(Request $request){
-        if(!Gate::allows('入库管理-盘收一体-盘收-查看')){ return redirect(url('/'));  }
+        if(!Gate::allows('入库管理-盘收一体-盘收-查看')){ return view('store/index');  }
         /** @var StoreCheckingReceiveService $service */
         $service = app('storeCheckingReceiveService');
 

resources/js/utilities/tempTip.js

@@ -67,13 +67,15 @@ const tempTip={
         tipper.remove();
         bg.remove();
     },
-    confirm:function(text,yesFunc,noFunc){
+    confirm:function(text,yesFunc,noFunc,yesText,noText){
+        if(typeof(yesText)==='undefined')yesText='确定';
+        if(typeof(noText)==='undefined')noText='取消';
         let bg=$("<div style='opacity:0.4;position:fixed;top:0;width:100%;height:100%;z-index:"+this.index+";background-color:#000;'></div>" );
         let tiper=$("<div class='row' style='color:#000;opacity:0.9;position:fixed;top:40%;transform:translateY(-50%);width:100%;z-index:"+(this.index+1)+"'>" +
             "<div class='col-8 offset-2'><div class='card'><div class='card-body'><div class='card-title h4'>" +
             text +
-            "</div><div class='card-text'><button class='btn btn-dark btn-lg ok'>确定</button>" +
-            "<button class='btn btn-success btn-lg cancel ml-4'>取消</button></div>" +
+            "</div><div class='card-text'><button class='btn btn-dark btn-lg ok'>"+yesText+"</button>" +
+            "<button class='btn btn-success btn-lg cancel ml-4'>"+noText+"</button></div>" +
             "</div></div></div></div>");
         let $ok = tiper.find('.ok');
         let $cancel = tiper.find('.cancel');

resources/views/inventory/stockInventory/inventoryMission.blade.php

@@ -104,20 +104,20 @@
                                name="count" class="form-control input" value="@if(old('count')){{old('count')}}@endif"  autocomplete="off">
                     </span>
 
-                <span v-if="inventory.status=='复盘中'" class="form-group ml-4">
-            <label for="count" class="text-secondary">上一次盘点数:</label>
-            <span v-if="!指定盘点记录列.re_checked_amount">
-                <span  class="font-weight-bold" >@{{ 指定盘点记录列.verified_amount }}</span>
-            </span>
-            <span v-if="指定盘点记录列.re_checked_amount">
-                <span class="font-weight-bold">@{{ 指定盘点记录列.re_checked_amount }}</span>
-            </span>
-        </span>
+{{--                <span v-if="inventory.status=='复盘中'" class="form-group ml-4">--}}
+{{--            <label for="count" class="text-secondary">上一次盘点数:</label>--}}
+{{--            <span v-if="!指定盘点记录列.re_checked_amount">--}}
+{{--                <span  class="font-weight-bold" >@{{ 指定盘点记录列.verified_amount }}</span>--}}
+{{--            </span>--}}
+{{--            <span v-if="指定盘点记录列.re_checked_amount">--}}
+{{--                <span class="font-weight-bold">@{{ 指定盘点记录列.re_checked_amount }}</span>--}}
+{{--            </span>--}}
+{{--        </span>--}}
 
-                <span v-if="inventory.status=='复盘中'" class="form-group ml-4">
-            <label for="count" class="text-secondary">盘点差异数:</label>
-            <span v-if="指定盘点记录列.difference_amount" class="font-weight-bold">@{{ 指定盘点记录列.difference_amount }}</span>
-        </span>
+{{--                <span v-if="inventory.status=='复盘中'" class="form-group ml-4">--}}
+{{--            <label for="count" class="text-secondary">盘点差异数:</label>--}}
+{{--            <span v-if="指定盘点记录列.difference_amount" class="font-weight-bold">@{{ 指定盘点记录列.difference_amount }}</span>--}}
+{{--        </span>--}}
             </div>
             <!--相同库位和条码 pc端-->
             <div class="row d-none d-xl-block" v-if="指定盘点记录列.length>=1">
@@ -834,15 +834,19 @@
                     库位=库位.trim();
                     let _this=this;
                     if(!库位)return false;
-                    if(!条码)return false;
-                    if (!_this.库位索引_记录[库位]||(!_this.条码索引_记录[条码]&&(await _this.is条码存在于WMS(条码)))) return;
-                    if(_this.库位索引_记录[条码]){
-                        let inventoryMission=_this.条码索引_记录[条码];
-                        if (inventoryMission.location===库位){
-                            if(!_this.指定盘点记录列.includes(inventoryMission)){
-                                _this.指定盘点记录列.push(inventoryMission);
+                    if(!条码)return false;;
+                    if (!_this.库位索引_记录[库位]
+                        ||(!_this.条码索引_记录[条码]
+                            &&!(await _this.is条码存在于WMS(条码)))
+                    ) return;
+                    if(Array.isArray(_this.条码索引_记录[条码])){
+                        _this.条码索引_记录[条码].forEach(function(inventoryMission){
+                            if (inventoryMission.location===库位){
+                                if(!_this.指定盘点记录列.includes(inventoryMission)){
+                                    _this.指定盘点记录列.push(inventoryMission);
+                                }
                             }
-                        }
+                        });
                     }
                 },
                 放置焦点光标至正确位置:_.throttle(function(){
@@ -899,16 +903,14 @@
                     条码 = 条码.trim();
                     let _this = this;
                     if (!条码) return false;
-                    if (!_this.条码索引_记录[条码]) return false;
-                    return !!_this.条码索引_记录[条码].id;
+                    return !!_this.条码索引_记录[条码];
 
                 },
                 is库位存在于当前记录(库位) {
                     库位 = 库位.trim();
                     let _this = this;
                     if (!库位) return false;
-                    if (!_this.库位索引_记录[库位]) return false;
-                    return !!_this.库位索引_记录[库位].id;
+                    return !!_this.库位索引_记录[库位];
 
                 },
                 提交新增并盘点:async function(){
@@ -1248,9 +1250,11 @@
                                 inventoryAccountMission.valid_at = '';
                                 _this.inventoryMissions.push(inventoryAccountMission);
                                 inventoryAccountMission.commodity_barcodes.forEach(function(barcode){
-                                    _this.条码索引_记录[barcode.code]=inventoryAccountMission;
+                                    if(!Array.isArray(_this.条码索引_记录[barcode.code])) _this.条码索引_记录[barcode.code]=[];
+                                    _this.条码索引_记录[barcode.code].push(inventoryAccountMission);
                                 });
-                                _this.库位索引_记录[location]=inventoryAccountMission;
+                                if(!Array.isArray(_this.库位索引_记录[location])) _this.库位索引_记录[location]=[];
+                                _this.库位索引_记录[location].push(inventoryAccountMission);
                                 _this.重排序并标记全列表类型(_this.inventoryMissions);
                                 _this.清空inputs();
                                 tempTip.setDuration(3000);
@@ -1350,9 +1354,9 @@
                         },
                         function () {
                             _this.清空inputs();
-                            tempTip.setDuration(3000);
+                            tempTip.setDuration(1500);
                             tempTip.showSuccess('盘点成功！');
-                        })
+                        },'是','否')
                 },
                 清空inputs(){
                     $locationInput.val('');

resources/views/layouts/app.blade.php

@@ -32,7 +32,7 @@
 <!-- Scripts -->
 @yield('script')
 {{-- 必须在app.js前边--}}
-<script src="{{ asset('js/app200922.js') }}"></script>
+<script src="{{ asset('js/app200924.js') }}"></script>
 <script>
     let isActive=function (name,atSlashLevel) {
         let uriWithNoParam=location.href.split('?')[0];

resources/views/store/index.blade.php

@@ -0,0 +1,8 @@
+@extends('layouts.app')
+@section('title')入库管理@endsection
+
+@section('content')
+    <span id="nav2">
+        @component('store.menu')@endcomponent
+    </span>
+@endsection

webpack.mix.js

@@ -11,7 +11,7 @@ const mix = require('laravel-mix');
  |
  */
 
-mix.js('resources/js/app.js', 'public/js/app200922.js')
+mix.js('resources/js/app.js', 'public/js/app200924.js')
     .sass('resources/sass/app.scss', 'public/css/app200923.css');
 mix.copy('resources/sass/fonts/','public/fonts');
 mix.copy('resources/icon','public/icon');