开单任务明细添加状态 关闭老版app权限

app/Http/Controllers/HandInStorageController.php

@@ -152,7 +152,7 @@ class HandInStorageController extends Controller
     {
         $owners=Owner::query()
             ->select('code')
-            ->where('warehouse_id',3)//3 代表九干仓仓库id
+            ->whereIn('warehouse_id',[2,3])//3 代表九干仓仓库id  2代表泗砖仓id
             ->whereNull('deleted_at')
             ->get();
         foreach ($owners as $owner){
@@ -217,8 +217,8 @@ class HandInStorageController extends Controller
         $checkData=$request->input('checkData')[0];
 
         //九干仓禁止使用当前app上架
-//        $res=$this->screenWarehouseAndContrast($checkData['customerid']);
-//        if ($res)$this->error('禁止使用当前app上架,请换用新版app上架!');
+        $res=$this->screenWarehouseAndContrast($checkData['customerid']);
+        if ($res)$this->error('禁止使用当前app上架,请换用新版app上架!');
 
         /** @var HandInStorageService $handInStorageService  */
         $handInStorageService=app('HandInStorageService');

database/migrations/2021_12_22_163154_create_receiving_task_items_table.php

@@ -17,6 +17,7 @@ class CreateReceivingTaskItemsTable extends Migration
             $table->id();
             $table->integer('receiving_task_id')->index()->comment('收货任务');
             $table->String('asn_no')->comment('asn单号');
+            $table->enum('status',['创建','进行中','完成','超时完成'])->comment('状态');
             $table->timestamps();
         });
     }