修改海柔表结构 接口结构

app/Console/Commands/SyncBatchTask.php

@@ -138,6 +138,8 @@ class SyncBatchTask extends Command
                 }
             }
         }
+        app('BatchService')->assignMissions($batches);
+
 
         ValueStore::query()->where("name","wave_last_sync_date")->update(["value"=>Carbon::now()->subSeconds(1)->toDateTimeString()]);
     }

app/Http/Controllers/StationMissionBatchController.php → app/Http/Controllers/StationTaskBatchController.php

@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers;
 
-use App\StationMissionBatch;
+use App\StationTaskBatch;
 use Illuminate\Http\Request;
 
-class StationMissionBatchController extends Controller
+class StationTaskBatchController extends Controller
 {
     /**
      * Display a listing of the resource.
@@ -41,10 +41,10 @@ class StationMissionBatchController extends Controller
     /**
      * Display the specified resource.
      *
-     * @param  \App\StationMissionBatch  $stationMissionBatch
+     * @param  \App\StationTaskBatch  $stationMissionBatch
      * @return \Illuminate\Http\Response
      */
-    public function show(StationMissionBatch $stationMissionBatch)
+    public function show(StationTaskBatch $stationMissionBatch)
     {
         //
     }
@@ -52,10 +52,10 @@ class StationMissionBatchController extends Controller
     /**
      * Show the form for editing the specified resource.
      *
-     * @param  \App\StationMissionBatch  $stationMissionBatch
+     * @param  \App\StationTaskBatch  $stationMissionBatch
      * @return \Illuminate\Http\Response
      */
-    public function edit(StationMissionBatch $stationMissionBatch)
+    public function edit(StationTaskBatch $stationMissionBatch)
     {
         //
     }
@@ -64,10 +64,10 @@ class StationMissionBatchController extends Controller
      * Update the specified resource in storage.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @param  \App\StationMissionBatch  $stationMissionBatch
+     * @param  \App\StationTaskBatch  $stationMissionBatch
      * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, StationMissionBatch $stationMissionBatch)
+    public function update(Request $request, StationTaskBatch $stationMissionBatch)
     {
         //
     }
@@ -75,10 +75,10 @@ class StationMissionBatchController extends Controller
     /**
      * Remove the specified resource from storage.
      *
-     * @param  \App\StationMissionBatch  $stationMissionBatch
+     * @param  \App\StationTaskBatch  $stationMissionBatch
      * @return \Illuminate\Http\Response
      */
-    public function destroy(StationMissionBatch $stationMissionBatch)
+    public function destroy(StationTaskBatch $stationMissionBatch)
     {
         //
     }

app/Http/Controllers/StationMissionBatchTypeController.php → app/Http/Controllers/StationTaskBatchTypeController.php

@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers;
 
-use App\StationMissionBatchType;
+use App\StationTaskBatchType;
 use Illuminate\Http\Request;
 
-class StationMissionBatchTypeController extends Controller
+class StationTaskBatchTypeController extends Controller
 {
     /**
      * Display a listing of the resource.
@@ -41,10 +41,10 @@ class StationMissionBatchTypeController extends Controller
     /**
      * Display the specified resource.
      *
-     * @param  \App\StationMissionBatchType  $stationMissionBatchType
+     * @param  \App\StationTaskBatchType  $stationMissionBatchType
      * @return \Illuminate\Http\Response
      */
-    public function show(StationMissionBatchType $stationMissionBatchType)
+    public function show(StationTaskBatchType $stationMissionBatchType)
     {
         //
     }
@@ -52,10 +52,10 @@ class StationMissionBatchTypeController extends Controller
     /**
      * Show the form for editing the specified resource.
      *
-     * @param  \App\StationMissionBatchType  $stationMissionBatchType
+     * @param  \App\StationTaskBatchType  $stationMissionBatchType
      * @return \Illuminate\Http\Response
      */
-    public function edit(StationMissionBatchType $stationMissionBatchType)
+    public function edit(StationTaskBatchType $stationMissionBatchType)
     {
         //
     }
@@ -64,10 +64,10 @@ class StationMissionBatchTypeController extends Controller
      * Update the specified resource in storage.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @param  \App\StationMissionBatchType  $stationMissionBatchType
+     * @param  \App\StationTaskBatchType  $stationMissionBatchType
      * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, StationMissionBatchType $stationMissionBatchType)
+    public function update(Request $request, StationTaskBatchType $stationMissionBatchType)
     {
         //
     }
@@ -75,10 +75,10 @@ class StationMissionBatchTypeController extends Controller
     /**
      * Remove the specified resource from storage.
      *
-     * @param  \App\StationMissionBatchType  $stationMissionBatchType
+     * @param  \App\StationTaskBatchType  $stationMissionBatchType
      * @return \Illuminate\Http\Response
      */
-    public function destroy(StationMissionBatchType $stationMissionBatchType)
+    public function destroy(StationTaskBatchType $stationMissionBatchType)
     {
         //
     }

app/Http/Controllers/StationMissionCommodityController.php → app/Http/Controllers/StationTaskCommodityController.php

@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers;
 
-use App\StationMissionCommodity;
+use App\StationTaskCommodity;
 use Illuminate\Http\Request;
 
-class StationMissionCommodityController extends Controller
+class StationTaskCommodityController extends Controller
 {
     /**
      * Display a listing of the resource.
@@ -41,10 +41,10 @@ class StationMissionCommodityController extends Controller
     /**
      * Display the specified resource.
      *
-     * @param  \App\StationMissionCommodity  $stationMissionCommodity
+     * @param  \App\StationTaskCommodity  $stationMissionCommodity
      * @return \Illuminate\Http\Response
      */
-    public function show(StationMissionCommodity $stationMissionCommodity)
+    public function show(StationTaskCommodity $stationMissionCommodity)
     {
         //
     }
@@ -52,10 +52,10 @@ class StationMissionCommodityController extends Controller
     /**
      * Show the form for editing the specified resource.
      *
-     * @param  \App\StationMissionCommodity  $stationMissionCommodity
+     * @param  \App\StationTaskCommodity  $stationMissionCommodity
      * @return \Illuminate\Http\Response
      */
-    public function edit(StationMissionCommodity $stationMissionCommodity)
+    public function edit(StationTaskCommodity $stationMissionCommodity)
     {
         //
     }
@@ -64,10 +64,10 @@ class StationMissionCommodityController extends Controller
      * Update the specified resource in storage.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @param  \App\StationMissionCommodity  $stationMissionCommodity
+     * @param  \App\StationTaskCommodity  $stationMissionCommodity
      * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, StationMissionCommodity $stationMissionCommodity)
+    public function update(Request $request, StationTaskCommodity $stationMissionCommodity)
     {
         //
     }
@@ -75,10 +75,10 @@ class StationMissionCommodityController extends Controller
     /**
      * Remove the specified resource from storage.
      *
-     * @param  \App\StationMissionCommodity  $stationMissionCommodity
+     * @param  \App\StationTaskCommodity  $stationMissionCommodity
      * @return \Illuminate\Http\Response
      */
-    public function destroy(StationMissionCommodity $stationMissionCommodity)
+    public function destroy(StationTaskCommodity $stationMissionCommodity)
     {
         //
     }

app/Http/Controllers/StationMissionMaterialBoxController.php → app/Http/Controllers/StationTaskMaterialBoxController.php

@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers;
 
-use App\StationMissionMaterialBox;
+use App\StationTaskMaterialBox;
 use Illuminate\Http\Request;
 
-class StationMissionMaterialBoxController extends Controller
+class StationTaskMaterialBoxController extends Controller
 {
     /**
      * Display a listing of the resource.
@@ -41,10 +41,10 @@ class StationMissionMaterialBoxController extends Controller
     /**
      * Display the specified resource.
      *
-     * @param  \App\StationMissionMaterialBox  $stationMissionMaterialBox
+     * @param  \App\StationTaskMaterialBox  $stationMissionMaterialBox
      * @return \Illuminate\Http\Response
      */
-    public function show(StationMissionMaterialBox $stationMissionMaterialBox)
+    public function show(StationTaskMaterialBox $stationMissionMaterialBox)
     {
         //
     }
@@ -52,10 +52,10 @@ class StationMissionMaterialBoxController extends Controller
     /**
      * Show the form for editing the specified resource.
      *
-     * @param  \App\StationMissionMaterialBox  $stationMissionMaterialBox
+     * @param  \App\StationTaskMaterialBox  $stationMissionMaterialBox
      * @return \Illuminate\Http\Response
      */
-    public function edit(StationMissionMaterialBox $stationMissionMaterialBox)
+    public function edit(StationTaskMaterialBox $stationMissionMaterialBox)
     {
         //
     }
@@ -64,10 +64,10 @@ class StationMissionMaterialBoxController extends Controller
      * Update the specified resource in storage.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @param  \App\StationMissionMaterialBox  $stationMissionMaterialBox
+     * @param  \App\StationTaskMaterialBox  $stationMissionMaterialBox
      * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, StationMissionMaterialBox $stationMissionMaterialBox)
+    public function update(Request $request, StationTaskMaterialBox $stationMissionMaterialBox)
     {
         //
     }
@@ -75,10 +75,10 @@ class StationMissionMaterialBoxController extends Controller
     /**
      * Remove the specified resource from storage.
      *
-     * @param  \App\StationMissionMaterialBox  $stationMissionMaterialBox
+     * @param  \App\StationTaskMaterialBox  $stationMissionMaterialBox
      * @return \Illuminate\Http\Response
      */
-    public function destroy(StationMissionMaterialBox $stationMissionMaterialBox)
+    public function destroy(StationTaskMaterialBox $stationMissionMaterialBox)
     {
         //
     }

app/Http/Controllers/TestController.php

@@ -158,14 +158,19 @@ class TestController extends Controller
     }
     public function t($a)
     {
-        StoreCheckingReceiveItem::query()->insert([[
-            "imported_amount" => 1,
-            "produced_at" => null,
-            "invalid_at" => null,
-            "batch_code" => null,
-            "unique_code" => null,
-            "commodity_id" => 36,
-            "store_checking_receive_id" => 2]]);
+        dd(json_encode(
+            [[
+                "taskMode"      => 8,
+                "bins"=>[[
+                    "taskCode"  =>"TEST-BS2011160004",
+                    "binCode"   => "TESTBINCODE-0",
+                    "fromLocCode" => "BIN-IN1",
+                    //"toLocCode" => "BIN-OUT1",
+                ]],
+                "groupCode"     => 4,
+                "priority"      => 20,
+                "sequenceFlag"  => -1,
+            ]]        ));
     }
 
     public function updateLaborRemark(){
@@ -190,17 +195,6 @@ class TestController extends Controller
         }
     }
     public function test2(){
-        $b = Logistic::query()->first();
-        $a = OrderPackage::query()->with("order")->first();
-        $a->bulk = 521;
-        $a->save();
-        if (!$a->order) $a->order = new Order();
-        dd($a);
-        if (!$a->order->logistic)$a->order->logistic = $b;
-        dd($a->order->logistic);
-        dd($a);
-        $a->save();
-        dd($a);
     }
 
     function packageFromLog(Request $request)

app/Http/Controllers/api/thirdPart/haiq/LightController.php

@@ -0,0 +1,27 @@
+<?php
+
+
+namespace App\Http\Controllers\api\thirdPart\haiq;
+
+
+
+
+use App\Services\ForeignHaiRoboticsService;
+use Illuminate\Http\Request;
+
+class LightController
+{
+    protected $request;
+
+    /** @var ForeignHaiRoboticsService $service */
+    private $service;
+    public function __construct(){
+        $this->service=app('ForeignHaiRoboticsService');
+    }
+
+    public function lightOn(Request $request){
+    }
+    public function lightOff(Request $request){
+    }
+
+}

app/Http/Controllers/api/thirdPart/haiq/PickStationController.php

@@ -6,19 +6,25 @@ namespace App\Http\Controllers\api\thirdPart\haiq;
 
 
 
+use App\Services\ForeignHaiRoboticsService;
 use Illuminate\Http\Request;
 
 class PickStationController
 {
     protected $request;
 
-    public function __construct()
-    {
+    /** @var ForeignHaiRoboticsService $service */
+    private $service;
+    public function __construct(){
+        $this->service=app('ForeignHaiRoboticsService');
     }
 
     public function processed(Request $request){
         $success = $request->input('success');
-        $code= $success?200:0;
+        $code = $success?200:0;
+        $this->service->markBinProcessed();
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->all()));
         return ['code'=>$code,'errMsg'=>'','data'=>$request->all()];
     }
+
 }

app/Http/Controllers/api/thirdPart/haiq/StorageController.php

@@ -5,8 +5,8 @@ namespace App\Http\Controllers\api\thirdPart\haiq;
 
 
 use App\Services\LogService;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Request;
 
 class StorageController
 {
@@ -34,12 +34,12 @@ class StorageController
             "bins" => [$bin],//可执行货箱任务
         ]];*/
         $this->request = [[
-            "taskMode"      => 8,
+            "taskMode"      => 2,
             "bins"=>[[
                 "taskCode"  =>"TEST-BS2011160004",
-                "binCode"   => "TESTBINCODE-0",
-                "fromLocCode" => "BIN-IN1",
-                //"toLocCode" => "BIN-OUT1",
+                "binCode"   => "IDE0000034",
+//                "fromLocCode" => "BIN-IN1",
+                "toLocCode" => "BIN-OUT1",
             ]],
             "groupCode"     => 4,
             "priority"      => 20,
@@ -48,10 +48,10 @@ class StorageController
     }
 
     public function relocate(Request $request){
-        $response = Http::post(config('api.haiq.storage.relocate'),$this->request);return $response;
+        $response = Http::post(config('api.haiq.storage.relocate'),$this->request);
         if (!$response->ok()){
             app('LogService')->log(__METHOD__,"haiq-请求失败,路径异常","REQUEST：".json_encode($this->request)." | RESPONSE：".$response);
-            return ['success'=>false,"data"=>"接口异常"];
+            return ['success'=>false,"data"=>$response->body()];
         }
         if (($response["code"] ?? false) && $response["code"] != 200){
             app('LogService')->log(__METHOD__,"haiq-料箱出库失败","REQUEST：".json_encode($this->request)." | RESPONSE：".$response);
@@ -64,4 +64,13 @@ class StorageController
         app('LogService')->log(__METHOD__,"haiq-料箱出库成功","REQUEST：".json_encode($this->request)." | RESPONSE：".$response);
         return ["success"=>true];
     }
+    public function moveBin(Request $request){
+
+    }
+    public function taskUpdate(Request $request){
+
+    }
+    public function exception(Request $request){
+
+    }
 }

app/Providers/AppServiceProvider.php

@@ -13,6 +13,7 @@ use App\Services\common\DataHandlerService;
 use App\Services\CustomerService;
 use App\Services\DepositoryService;
 use App\Services\FeatureService;
+use App\Services\ForeignHaiRoboticsService;
 use App\Services\InventoryAccountMissionService;
 use App\Services\InventoryCompareService;
 use App\Services\LaborReportsCountingRecordService;
@@ -57,6 +58,9 @@ use App\Services\RejectedBillItemService;
 use App\Services\RejectedBillService;
 use App\Services\ShopService;
 use App\Services\RejectedService;
+use App\Services\StationTaskBatchService;
+use App\Services\StationTaskBatchTypeService;
+use App\Services\StationService;
 use App\Services\StoreCheckingReceiveItemService;
 use App\Services\StoreCheckingReceiveService;
 use App\Services\StoreItemService;
@@ -137,6 +141,7 @@ class AppServiceProvider extends ServiceProvider
         app()->singleton('PackageStatisticsService',PackageStatisticsService::class);
         app()->singleton('OracleActAllocationDetailService',OracleActAllocationDetailService::class);
         app()->singleton('ShopService',ShopService::class);
+        app()->singleton('ForeignHaiRoboticsService',ForeignHaiRoboticsService::class);
         app()->singleton('OrderPackageService',OrderPackageService::class);
         app()->singleton('OrderIssueService',OrderIssueService::class);
         app()->singleton('OrderService',OrderService::class);
@@ -153,6 +158,9 @@ class AppServiceProvider extends ServiceProvider
         app()->singleton('InventoryAccountMissionService',InventoryAccountMissionService::class);
         app()->singleton('ProcessesContentService',ProcessesContentService::class);
         app()->singleton('StoreService',StoreService::class);
+        app()->singleton('StationTaskBatchService',StationTaskBatchService::class);
+        app()->singleton('StationTaskBatchTypeService',StationTaskBatchTypeService::class);
+        app()->singleton('StationService',StationService::class);
         app()->singleton('WarehouseService',WarehouseService::class);
         app()->singleton('StoreItemService',StoreItemService::class);
         app()->singleton('PackageService',PackageService::class);

app/Services/BatchService.php

@@ -1,11 +1,12 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\Batch;
+use Exception;
 
 Class BatchService
-{ 
+{
     public function get(array $params)
     {
         $query = Batch::query();
@@ -18,7 +19,25 @@ Class BatchService
 
     public function insert(array $insert)
     {
-        return Batch::query()->insert($insert);
+        $result = Batch::query()->insert($insert);
+        if($result)$this->assignMissions($insert);
+        return $result;
     }
 
-}
+    public function updateWhereIn($key,$values,$updateKeyValues){
+        Batch::query()->whereIn($key,$values)->update($updateKeyValues);
+    }
+
+    /**
+     * 为波次附加任务，已附加的重复任务不影响
+     * @param Batch[] $batches
+     * @throws Exception
+     */
+    public function assignMissions(array $batches)
+    {
+        /** @var StationTaskBatchService $stationTaskBatchService */
+        $stationTaskBatchService=app('StationTaskBatchService');
+        $stationTaskBatchService->createByBatches($batches);
+    }
+
+}

app/Services/ForeignHaiRoboticsService.php

@@ -0,0 +1,22 @@
+<?php
+
+
+namespace App\Services;
+
+
+use Illuminate\Http\Request;
+
+class ForeignHaiRoboticsService
+{
+    public function sendBatch(){
+
+    }
+
+    public function moveBin(){
+
+    }
+
+    public function markBinProcessed(){
+
+    }
+}

app/Services/StationService.php

@@ -0,0 +1,28 @@
+<?php
+
+
+namespace App\Services;
+
+
+use App\Station;
+use App\StationType;
+use Exception;
+use Illuminate\Support\Facades\Cache;
+
+class StationService
+{
+    /**
+     * @param string $typeName
+     * @return Station
+     * @throws Exception
+     */
+    public function getDefaultStation(string $typeName):Station{
+        $station= Cache::remember('StationType_default_name_'.$typeName,config('rarelyChange'), function ()use($typeName) {
+            $stationType= StationType::query()->where('name',$typeName)->orderBy('id')->get('id')->first();
+            if(!$stationType) throw new Exception('指定站类型获取不到');
+            return Station::query()->where('station_type_id',$stationType['id'])->first();
+        });
+        if(!$station)throw new Exception('默认站获取不到');
+        return $station;
+    }
+}

app/Services/StationTaskBatchService.php

@@ -0,0 +1,58 @@
+<?php
+
+
+namespace App\Services;
+
+
+use App\Batch;
+use App\StationTaskBatch;
+use App\StationTaskBatchType;
+use Exception;
+use Illuminate\Support\Facades\Cache;
+
+class StationTaskBatchService
+{
+    /** @var StationService $stationService */
+    private $stationService;
+    /** @var StationTaskBatchTypeService $stationTaskBatchTypeService */
+    private $stationTaskBatchTypeService;
+    /** @var BatchService $batchService */
+    private $batchService;
+    public function __construct(){
+        $this->stationService=null;
+        $this->stationTaskBatchTypeService=null;
+        $this->batchService=null;
+    }
+
+    /**
+     * @param $batches Batch[]
+     * @throws Exception
+     */
+    public function createByBatches(array $batches){
+        $this->stationService=app('StationService');
+        $this->stationTaskBatchTypeService=app('StationTaskBatchTypeService');
+        $this->batchService=app('BatchService');
+
+        $stationMissionBatches_toCreate=[];
+        $station=$this->stationService->getDefaultStation('料箱出货口');
+        $id_stationMissionBatchType=$this->stationTaskBatchTypeService->firstByWhere('name','U型线分捡');
+
+        foreach ($batches as &$batch){
+            if ($batch['status']=='未处理'){
+                $stationMissionBatches_toCreate[]=[
+                    'batch_id'=>$batch['id'],
+                    'station_id'=>$station['id'],
+                    'station_mission_batch_type_id'=> $id_stationMissionBatchType,
+                    'status'=>'待处理'
+                ];
+                $batch = '已处理';
+            }
+        }
+        $this->batchService->updateWhereIn('id',data_get($batches,'*.id'),['status'=>'处理中']);
+        $this->insert($stationMissionBatches_toCreate);
+    }
+
+    public function insert(array $stationMissionBatches_inArray){
+        return StationTaskBatch::query()->insert($stationMissionBatches_inArray);
+    }
+}

app/Services/StationTaskBatchTypeService.php

@@ -0,0 +1,26 @@
+<?php
+
+
+namespace App\Services;
+
+
+use App\Station;
+use App\StationTaskBatchType;
+use App\StationType;
+use Illuminate\Support\Facades\Cache;
+
+class StationTaskBatchTypeService
+{
+    /**
+     * @param string $key
+     * @param string $value
+     * @return Station
+     */
+    public function firstByWhere(string $key,string $value):Station{
+        return Cache::remember('station_mission_batch_type_id_by_'.$key.$value, config('rarelyChange'), function ()use($key,$value) {
+            $stationMissionBatchType =StationTaskBatchType::query()->where($key, $value)->first();
+            if(!$stationMissionBatchType)throw new \Exception("找不到 StationMissionBatchType,where $key = $value");
+            return $stationMissionBatchType;
+        });
+    }
+}

app/StationMissionBatchType.php

@@ -1,10 +0,0 @@
-<?php
-
-namespace App;
-
-use Illuminate\Database\Eloquent\Model;
-
-class StationMissionBatchType extends Model
-{
-    //
-}

app/StationMissionBatch.php → app/StationTaskBatch.php

@@ -4,7 +4,7 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class StationMissionBatch extends Model
+class StationTaskBatch extends Model
 {
     protected $fillable=['batch_id','station_id','station_mission_batch_type_id','status'];
 }

app/StationTaskBatchType.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class StationTaskBatchType extends Model
+{
+    protected $fillable=['name'];
+}

app/StationMissionCommodity.php → app/StationTaskCommodity.php

@@ -4,7 +4,7 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class StationMissionCommodity extends Model
+class StationTaskCommodity extends Model
 {
     protected $fillable= ['station_id','material_box_id','commodity_id','amount','order_id','status','station_id'];
 }

app/StationMissionMaterialBox.php → app/StationTaskMaterialBox.php

@@ -4,7 +4,7 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class StationMissionMaterialBox extends Model
+class StationTaskMaterialBox extends Model
 {
     protected $fillable=['station_id','material_box_id','status'];
 }

config/api.php

@@ -39,7 +39,8 @@ return [
 
     'haiq'=>[
         'storage'=>[
-            'relocate' => "http://59.37.126.227:65448/api/haiqEss/gr/relocate",
+//            'relocate' => "http://59.37.126.227:65448/api/haiqEss/gr/relocate",
+            'relocate' => "http://192.168.1.201:2011/api/haiqEss/gr/relocate",
         ],
     ],
 

config/cache.php

@@ -5,11 +5,11 @@ use Illuminate\Support\Str;
 return [
 
     'expirations'=>[
-        'default'=>10,
-        'oftenChange'=>5,
-        'rarelyChange'=>60,
-        'commonFrequent'=>20,
-        'owners'=>20,
+        'default'=>10,          //默认
+        'oftenChange'=>5,       //经常改
+        'rarelyChange'=>60,     //几乎不变
+        'commonFrequent'=>20,  //一般频率
+        'owners'=>20,           //模型Owner
     ],
     /*
     |--------------------------------------------------------------------------

database/factories/StationMissionBatchFactory.php

@@ -2,10 +2,10 @@
 
 /** @var \Illuminate\Database\Eloquent\Factory $factory */
 
-use App\StationMissionBatch;
+use App\StationTaskBatch;
 use Faker\Generator as Faker;
 
-$factory->define(StationMissionBatch::class, function (Faker $faker) {
+$factory->define(StationTaskBatch::class, function (Faker $faker) {
     return [
         //
     ];

database/factories/StationMissionBatchTypeFactory.php

@@ -2,10 +2,10 @@
 
 /** @var \Illuminate\Database\Eloquent\Factory $factory */
 
-use App\StationMissionBatchType;
+use App\StationTaskBatchType;
 use Faker\Generator as Faker;
 
-$factory->define(StationMissionBatchType::class, function (Faker $faker) {
+$factory->define(StationTaskBatchType::class, function (Faker $faker) {
     return [
         //
     ];

database/factories/StationMissionCommodityFactory.php

@@ -2,10 +2,10 @@
 
 /** @var \Illuminate\Database\Eloquent\Factory $factory */
 
-use App\StationMissionCommodity;
+use App\StationTaskCommodity;
 use Faker\Generator as Faker;
 
-$factory->define(StationMissionCommodity::class, function (Faker $faker) {
+$factory->define(StationTaskCommodity::class, function (Faker $faker) {
     return [
         //
     ];

database/factories/StationMissionMaterialBoxFactory.php

@@ -2,10 +2,10 @@
 
 /** @var \Illuminate\Database\Eloquent\Factory $factory */
 
-use App\StationMissionMaterialBox;
+use App\StationTaskMaterialBox;
 use Faker\Generator as Faker;
 
-$factory->define(StationMissionMaterialBox::class, function (Faker $faker) {
+$factory->define(StationTaskMaterialBox::class, function (Faker $faker) {
     return [
         //
     ];

database/migrations/2020_11_30_142430_create_station_mission_batches_table.php → database/migrations/2020_11_30_142430_create_station_task_batches_table.php

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateStationMissionBatchesTable extends Migration
+class CreateStationTaskBatchesTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,11 +13,11 @@ class CreateStationMissionBatchesTable extends Migration
      */
     public function up()
     {
-        Schema::create('station_mission_batches', function (Blueprint $table) {
+        Schema::create('station_task_batches', function (Blueprint $table) {
             $table->id();
             $table->integer('batch_id')->index();
             $table->integer('station_id')->index();
-            $table->integer('station_mission_batch_type_id')->index();
+            $table->integer('station_task_batch_type_id')->index();
             $table->enum('status',['待处理','挂起','处理中','完成','异常','取消'])->index();
             $table->timestamps();
         });
@@ -30,6 +30,6 @@ class CreateStationMissionBatchesTable extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('station_mission_batches');
+        Schema::dropIfExists('station_task_batches');
     }
 }

database/migrations/2020_11_30_151800_create_station_mission_batch_types_table.php → database/migrations/2020_11_30_151800_create_station_task_batch_types_table.php

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateStationMissionBatchTypesTable extends Migration
+class CreateStationTaskBatchTypesTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,10 +13,12 @@ class CreateStationMissionBatchTypesTable extends Migration
      */
     public function up()
     {
-        Schema::create('station_mission_batch_types', function (Blueprint $table) {
+        Schema::create('station_task_batch_types', function (Blueprint $table) {
             $table->id();
+            $table->string('name');
             $table->timestamps();
         });
+        \App\StationTaskBatchType::query()->firstOrCreate(['name'=>'U型线分捡']);
     }
 
     /**
@@ -26,6 +28,6 @@ class CreateStationMissionBatchTypesTable extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('station_mission_batch_types');
+        Schema::dropIfExists('station_task_batch_types');
     }
 }

database/migrations/2020_11_30_155713_create_station_mission_material_boxes_table.php → database/migrations/2020_11_30_155713_create_station_task_material_boxes_table.php

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateStationMissionMaterialBoxesTable extends Migration
+class CreateStationTaskMaterialBoxesTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,7 +13,7 @@ class CreateStationMissionMaterialBoxesTable extends Migration
      */
     public function up()
     {
-        Schema::create('station_mission_material_boxes', function (Blueprint $table) {
+        Schema::create('station_task_material_boxes', function (Blueprint $table) {
             $table->id();
             $table->integer('station_id')->index();
             $table->integer('material_box_id');  //联合索引
@@ -30,6 +30,6 @@ class CreateStationMissionMaterialBoxesTable extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('station_mission_material_boxes');
+        Schema::dropIfExists('station_task_material_boxes');
     }
 }

database/migrations/2020_11_30_174327_create_station_mission_commodities_table.php → database/migrations/2020_11_30_174327_create_station_task_commodities_table.php

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateStationMissionCommoditiesTable extends Migration
+class CreateStationTaskCommoditiesTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,7 +13,7 @@ class CreateStationMissionCommoditiesTable extends Migration
      */
     public function up()
     {
-        Schema::create('station_mission_commodities', function (Blueprint $table) {
+        Schema::create('station_task_commodities', function (Blueprint $table) {
             $table->id();
             $table->integer('station_id');  //联合索引
             $table->integer('material_box_id');  //联合索引
@@ -21,7 +21,7 @@ class CreateStationMissionCommoditiesTable extends Migration
             $table->integer('amount')->default(0);
             $table->integer('order_id')->index();
             $table->enum('status',['待处理','挂起','处理中','完成','异常','取消'])->index();  //联合索引
-            $table->index(['station_id','material_box_id','status'],'station_mission_commodities_s_m_s_index');
+            $table->index(['station_id','material_box_id','status'],'station_task_commodities_s_m_s_index');
             $table->timestamps();
         });
     }
@@ -33,6 +33,6 @@ class CreateStationMissionCommoditiesTable extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('station_mission_commodities');
+        Schema::dropIfExists('station_task_commodities');
     }
 }

database/migrations/2020_12_01_150439_change_batch_field_status_add_executing.php

@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+class ChangeBatchFieldStatusAddExecuting extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        DB::statement("ALTER TABLE batches MODIFY COLUMN status ENUM('未处理','已处理','取消','处理中','挂起','异常')");
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        DB::statement("ALTER TABLE batches MODIFY COLUMN status ENUM('未处理','已处理','取消')");
+    }
+}

tests/webApi/flux.http

@@ -8,9 +8,7 @@
 POST https://testwas.baoshi56.com/api/thirdPart/flux/package/new
 Content-Type: application/json
 
-{"request":{"TASKID":"3509760355826","Orderno":"SO200302002282","palletid":"3509760355826","SOReference5":"3509760355826",
-  "Customer":"BILI","Consigneename":"吴凡","CarrierID":"YUNDA","USERDEFINE1":"W200302000204","USERDEFINE2":"09.[BILI]截单波次","USERDEFINE3":null}}
-
+"[{"taskMode":8,"bins":[{"taskCode":"TEST-BS2011160004","binCode":"TESTBINCODE-0","fromLocCode":"BIN-IN1"}],"groupCode":4,"priority":20,"sequenceFlag":-1}]
 ###
 
 

tests/webApi/thirdPart/haiq/move.http

@@ -0,0 +1,9 @@
+
+POST http://192.168.1.201:2011/api/haiqEss/gr/relocate
+Content-Type: application/json
+
+{"groupCode":"1","taskMode":2,"priority":1,"sequenceFlag":1,"bins":[{"taskCode":"taskIDE0000034","binCode":"IDE0000034","toWorkStation":"bin-out01","fromWorkStation":"","fromLocCode":"","toLocCode":"","sequence":1,"stockInfo":[{"skuCode":"string","qty":1}]}]}
+###
+
+
+