料箱占用

app/Http/Controllers/StorageController.php

@@ -138,7 +138,18 @@ sql;
             $data .= '“'.$item->station->code.'”,';
         }
         if ($occupy->count()>0){
-            $data .= "存在任务待处理,无法调取";
+            $data .= "存在任务待处理,无法调取  ";
+            $boxes = array_values($boxes);
+        }
+        $tasks = StationTaskMaterialBox::query()->with("station:id,code")
+            ->whereIn("station_id",Station::query()->select("id")->whereIn("code",$boxes))
+            ->whereNotIn("status",["完成","取消"])->get();
+        foreach ($tasks as $task){
+            unset($boxes[array_search($task->station->code,$boxes)]);
+            $data .= '“'.$task->station->code.'”,';
+        };
+        if ($tasks->count()>0){
+            $data .= "任务排队中,无法调取";
             $boxes = array_values($boxes);
         }
         //重新调取料箱

app/Http/Controllers/TestController.php

@@ -149,34 +149,19 @@ class TestController extends Controller
     }
     public function test()
     {
-        $a = 1;
-        $b = 1;
-        dd(!!$a|!!$b);
+        DB::connection("mysql_haiRobotics")->table("ks_bin")->where("ks_bin_code","IDE0000563")->update([
+            "ks_bin_space_code" => null,"ks_bin_space_id"=>null,"orig_ks_bin_space_code"=>null,"orig_ks_bin_space_id"=>null,
+            "status"=>4,
+        ]);
     }
     public function orderCreateBill()
     {
+
         $order = Order::query()->find(\request("id"));
         $ser = new OrderService();
         $ser->createInstantBill($order);
         dd("order create bill success");
     }
-    function mp(){
-        $stationTaskCommodities=StationTaskCommodity::query()->where('id',19942)->get();
-        StationTaskCommodity::query()
-            ->whereIn('id',data_get($stationTaskCommodities,'*.id')??[])
-            ->update(['status'=>'完成']);
-        $stationTaskMaterialBoxes=StationTaskMaterialBox::query()
-            ->whereIn('id', data_get($stationTaskCommodities, '*.station_task_material_box_id') ?? [])
-            ->get('material_box_id');
-        $storages= \App\Storage::query()->whereIn('commodity_id',data_get($stationTaskCommodities,'*.commodity_id')??[])
-            ->whereIn('material_box_id',data_get($stationTaskMaterialBoxes,'*.material_box_id')??[])
-            ->get();
-        foreach($storages as $storage){
-            $amountReducing=$stationTaskCommodities->where('material_box_id',$storage['material_box_id'])->first()['amount']??0;
-            $storage['amount']-=$amountReducing;
-            $storage->update();
-        }
-    }
 
     public function supplementMarchOwnerReport()
     {

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

@@ -147,9 +147,12 @@
                     window.tempTip.setDuration(3000);
                     if (JSON.stringify(this.selectedBox)==='{}'){window.tempTip.show("未选中格口");return;}
                     window.tempTip.confirm("确定选中格口已无料箱存在？",()=>{
+                        window.tempTip.setDuration(99999);
+                        window.tempTip.waitingTip("调取料箱中，请稍等");
                         let boxes = [];
                         for (let key in this.selectedBox)if (this.selectedBox[key]) boxes.push(key);
                         window.tempTip.postBasicRequest("{{url('store/inStorage/resetCacheShelf')}}",{boxes:boxes},res=>{
+                            window.tempTip.cancelWaitingTip();
                             for (let i=0;i<res.boxes.length;i++){
                                 this.$set(this.shelfOccupy,res.boxes[i],true);
                                 this.$set(this.selectedBox,res.boxes[i],true);