Merge branch 'zzd' of ssh://was.baoshi56.com:10022/var/git/bswas

 Conflicts:

	app/Http/Controllers/TestController.php

app/Console/Commands/CheckCacheRackStorage.php

@@ -6,7 +6,7 @@ use App\Station;
 use App\StationTask;
 use App\StationTaskMaterialBox;
 use Illuminate\Console\Command;
-use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Support\Collection;
 
 class CheckCacheRackStorage extends Command
 {
@@ -54,7 +54,7 @@ class CheckCacheRackStorage extends Command
                 'station_id' => $station->id,
             ]);
             $collection = new Collection();
-            $collection->append(StationTaskMaterialBox::query()->create([
+            $collection->add(StationTaskMaterialBox::query()->create([
                 'station_id' => $station->id,
                 'material_box_id'=>$box->id,
                 'status'=>"待处理",

app/Http/Controllers/TestController.php

@@ -51,6 +51,12 @@ use App\Services\CacheService;
 use App\Services\CommodityService;
 use App\Services\common\BatchUpdateService;
 use App\Services\common\DataHandlerService;
+use App\Services\common\QueryService;
+use App\Services\DeliveryAppointmentService;
+use App\Services\DocWaveHeaderService;
+use App\Services\FeatureService;
+use App\Services\InventoryCompareService;
+use App\Services\LogisticService;
 use App\Services\LogisticZopService;
 use App\Services\LogService;
 use App\Services\OracleDOCOrderHeaderService;
@@ -74,9 +80,30 @@ use App\UserDetail;
 use App\UserDutyCheck;
 use App\ValueStore;
 use Carbon\Carbon;
+use Carbon\CarbonPeriod;
+use ChangeColumnOrderIdToOrderIssues;
+use Doctrine\DBAL\Exception\DatabaseObjectExistsException;
+use Doctrine\DBAL\Query\QueryBuilder;
+use GuzzleHttp\Client;
+use Illuminate\Database\Connection;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\QueryException;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Redis;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
+use Maatwebsite\Excel\Facades\Excel;
+use Mockery\Mock;
+use Oursdreams\Export\Export;
+use Overtrue\LaravelPinyin\Facades\Pinyin;
+use PhpMyAdmin\Server\Status\Data;
+use Ramsey\Collection\Collection;
 use Zttp\Zttp;
 
 class TestController extends Controller
@@ -110,9 +137,32 @@ class TestController extends Controller
         }
         dd("OK");
     }
-    public function testCacheShelf()
+    public function test1()
     {
-        
+        $boxes = MaterialBox::query()->select('id',"code")->where("id",">",0)->where("code","like","IDE%")
+            ->where("status",4)->limit(10)->orderBy("id")
+            ->whereNotIn("id",StationTaskMaterialBox::query()->select("material_box_id")
+                ->where("status","!=","已完成")->groupBy("material_box_id"))
+            ->sql();
+        dd($boxes);
+        foreach ($stations as $station){
+            dump($station);
+            /*$box = app("MaterialBoxService")->getAnEmptyBox();
+            if (!$box)continue;
+            $task = StationTask::query()->create([
+                'status' => "待处理",
+                'station_id' => $station->id,
+            ]);
+            $collection = new \Illuminate\Database\Eloquent\Collection();
+            $collection->append(StationTaskMaterialBox::query()->create([
+                'station_id' => $station->id,
+                'material_box_id'=>$box->id,
+                'status'=>"待处理",
+                'type' => '取',
+                'station_task_id' => $task->id,
+            ]));
+            app("ForeignHaiRoboticsService")->fetchGroup($station->code,$collection,'','立架出至缓存架');*/
+        }
     }
     public function test()
     {

app/MaterialBox.php

@@ -43,4 +43,9 @@ class MaterialBox extends Model
         if(!$value)return 0;
         $this->attributes['status']=self::$enums['status'][$value];
     }
+
+    public function stationTaskMaterialBoxes()
+    {   //料箱任务
+        return $this->hasMany(StationTaskMaterialBox::class,"material_box_id","id");
+    }
 }

app/Services/MaterialBoxService.php

@@ -6,6 +6,7 @@ namespace App\Services;
 
 use App\MaterialBox;
 use App\Station;
+use App\StationTaskMaterialBox;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Cache;
@@ -29,7 +30,10 @@ class MaterialBoxService
         $id = 0;
         while (true){
             $boxes = MaterialBox::query()->select('id',"code")->where("id",">",$id)->where("code","like","IDE%")
-                ->where("status",4)->limit(10)->orderBy("id")->get();
+                ->where("status",4)->limit(10)->orderBy("id")
+                ->whereNotIn("id",StationTaskMaterialBox::query()->select("material_box_id")
+                    ->where("status","!=","已完成")->groupBy("material_box_id"))
+                ->get();
             if ($boxes->count()==0)break;
             $ides = [];
             $str = "(";