海柔测试修正

app/Console/Commands/SyncBatchTask.php

@@ -249,7 +249,8 @@ sql;
         if (count($updateOrder)>1){
             app("OrderService")->batchUpdate($updateOrder);//反向修改订单
             LogService::log(__METHOD__,"波次同步-修改订单波次号",json_encode($updateOrder));
-            BatchTaskJob::dispatch($updateBatch);    //在这里为波次注册队列任务！
+            LogService::log(__METHOD__,"修改过的波次_",json_encode($updateBatch));
+            //            BatchTaskJob::dispatch($updateBatch);    //在这里为波次注册队列任务！
         }
 
         if ($map){

app/Http/Controllers/TestController.php

@@ -25,6 +25,7 @@ use App\Exceptions\ErrorException;
 use App\Events\CancelOrder;
 use App\Events\SendEmailEvent;
 use App\Exceptions\Exception;
+use App\Http\Controllers\api\thirdPart\haiq\PickStationController;
 use App\Http\Requests\ForeignHaiRobotic_taskUpdateRequest;
 use App\Http\Requests\TestAaRequest;
 use App\Imports\OrderTrackingImport;
@@ -403,22 +404,35 @@ sql;
         return "cacheing get:'$cache'<script>document.write('<br>localStorage:'+localStorage.getItem('storedTest'))</script>";
     }
 
-    function t1(Request $request)
+    function hProcessed(Request $request)
+    {
+        app('ForeignHaiRoboticsService')->markBinProcessed(
+            '1',
+            'IDE0005680',
+            true,
+            "2021-56-24 05-03-15",
+            '',
+            true
+        );
+    }
+    function hBatch(Request $request)
     {
         $a=[
-            new Batch([
-                "id"=> 89906,
-                "code"=> "W210322000262",
-                "status"=> "\u5904\u7406\u4e2d",
-                "type"=> null,
-                "wms_type"=> "09.[BAOSHI]\u622a\u5355\u6ce2\u6b21\u3010\u65e0\u5907\u6ce8\u3011",
-                "wms_status"=> "\u90e8\u5206\u6536\u8d27",
-                "wms_created_at"=> "0000-00-00 00:00:00",
-                "created_at"=> "2021-03-22T10:35:44.000000Z",
-                "updated_at"=> "2021-03-22T10:35:46.000000Z",
-                "remark"=> null,
-                "owner_id"=> "42"
-            ])
+            new Batch(
+                [
+                    "id"=> 90507,
+                    "code"=> "W210324000291",
+                    "status"=> "\u672a\u5904\u7406",
+                    "type"=> null,
+                    "wms_type"=> "09.[BAOSHI]\u622a\u5355\u6ce2\u6b21\u3010\u65e0\u5907\u6ce8\u3011",
+                    "wms_status"=> "\u90e8\u5206\u6536\u8d27",
+                    "wms_created_at"=> "0000-00-00 00=>00=>00",
+                    "created_at"=> "2021-03-24T08=>00=>39.000000Z",
+                    "updated_at"=> "2021-03-24T08=>00=>39.000000Z",
+                    "remark"=> null,
+                    "owner_id"=> "42"
+                ]
+            )
         ];
         app('BatchService')->assignTasks($a);
         dd($a);

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

@@ -33,7 +33,7 @@ class PickStationController
 
         $result = ["code" => 200, "data" => json_encode($request->all())];
         if($failed){
-            $result["code"] = 500;
+            $result["code"] = 400;
             $result["errMsg"] = $processedResult;
         }
         return $result;

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

@@ -39,7 +39,7 @@ class StorageController
             "bins" => [$bin],//可执行货箱任务
         ]];*/
         $this->post = [[
-            "taskMode"      => 1,
+            "taskMode"      => 2,
             "bins"=>[[
                 "taskCode"  =>'t'.microtime(true),
                 "binCode"   => "IDE0000130",
@@ -54,7 +54,7 @@ class StorageController
             "taskMode"      => 1,
             "bins"=>[[
                 "taskCode"  =>'t'.microtime(true),
-                "binCode"   => "IDE0004975",
+                "binCode"   => "IDE0005676",
                 "fromLocCode" => "BIN-IN1",
                 "toLocCode" => "BIN-OUT1",
             ],],
@@ -113,10 +113,16 @@ class StorageController
             "bins"=>[
                 [
                 "taskCode"  =>'t'.Uuid::uuid4(),
-                "binCode"   => "IDE0015711",
-                "fromLocCode" => "HAIB2-03-03", //B1是面对架货右手，从右往左数列，第三个数字从下往上数行
+                "binCode"   => "IDE0005711",
+                "fromLocCode" => "HAIB1-01-02", //B1是面对架货右手，从右往左数列，第三个数字从下往上数行
                 "toLocCode" => "",
-            ]
+            ],
+                [
+                "taskCode"  =>'t'.Uuid::uuid4(),
+                "binCode"   => "IDE0005680",
+                "fromLocCode" => "HAIB1-02-02", //B1是面对架货右手，从右往左数列，第三个数字从下往上数行
+                "toLocCode" => "",
+            ],
 //                ,[
 //                "taskCode"  =>'t'.Uuid::uuid4(),
 //                "binCode"   => "IDE0005680",

app/Services/ForeignHaiRoboticsService.php

@@ -5,11 +5,8 @@ namespace App\Services;
 
 
 use App\Exceptions\ErrorException;
-use App\Exceptions\PanicException;
 use App\MaterialBox;
 use App\StationTaskMaterialBox;
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Http;
 use App\Traits\ServiceAppAop;
@@ -76,13 +73,13 @@ class ForeignHaiRoboticsService
                 "toLocCode" => $toLocation??'',
             ];
         });
-        return [
+        return [[
             "taskMode"  =>$taskMode,
             "bins"=>$bins,
             "groupCode"=>$groupId.$timestampSuffix,
             "priority"=>$priority,
             "sequenceFlag"=>$isSequenced,
-        ];
+        ]];
     }
 
     public function fetchGroup($toLocation, Collection $taskMaterialBoxes, $groupIdPrefix=''): bool
@@ -182,7 +179,7 @@ class ForeignHaiRoboticsService
         $dataToPost=$this->makeJson_move(
             collect([$stationTaskMaterialBox]),
             '缓存架入立架',
-            $this->stationService->getULineExit($stationTaskMaterialBox['station'])['name']??'',
+            'BIN-IN1',//TODO：这里应该是动态取得，参考出立架getULineExit()方法，不然不能从站获得对应的出口，而且要改Station的child为children
             '',
             $stationTaskMaterialBox['stationTaskBatch']['id']
         );
@@ -265,12 +262,16 @@ class ForeignHaiRoboticsService
         LogService::log(__METHOD__,'runMany','波次任务分配6.r5f2c1：'.json_encode($dataToPost));
         try{
             LogService::log(__METHOD__,'runMany','波次任务分配6.r5f2c1.51：');
+            $a = json_encode($dataToPost);
             $response = Http::post(config('api.haiq.storage.moveBin'), $dataToPost);
+            if(isset($response->json()['code'])&&$response->json()['code']==500)
+                throw new ErrorException('机器人500错误：'.json_encode($response->json()));
+            $b=json_encode($response->json());
             LogService::log(__METHOD__,'runMany','波次任务分配6.r5f2c1.52：');
-            LogService::log(__METHOD__,'runMany','波次任务分配6.r5f2c1.53：'.json_encode($response));
+            LogService::log(__METHOD__,'runMany','波次任务分配6.r5f2c1.53：'.json_encode($response->json()));
         }catch (\Exception $e){
             LogService::log(__METHOD__,'runMany','波次任务分配6.r5f2c1.54：');
-            throw new ErrorException('海柔机器人任务执行失败：'.json_encode($dataToPost));
+            throw new ErrorException('海柔机器人任务执行失败：'.json_encode($dataToPost).$e->getMessage());
         }
         LogService::log(__METHOD__,'runMany','波次任务分配6.r5f2c2：'.json_encode($dataToPost));
         $errMsg = (function () use ($response) {

app/Services/StationService.php

@@ -58,6 +58,7 @@ class StationService
         return null;
     }
 
+
     function broadcast($station_id, StationTask $stationTask){
         if($stationTask)
             $json = $stationTask->toJson();

app/Services/StationTaskService.php

@@ -109,6 +109,7 @@ class StationTaskService
     }
     function markProcessed($stationTask_orCollection)
     {
+        $this->instant($this->batchService, 'BatchService');
         if (get_class($stationTask_orCollection)==StationTask::class){
             $stationTask_orCollection = collect([$stationTask_orCollection]);
         }
@@ -117,8 +118,6 @@ class StationTaskService
             $ids_stationTasks
         );
         $stationTaskBatches=StationTaskBatch::query()->whereIn('station_task_id',$ids_stationTasks);
-        $this->batchService->updateWhereIn('id', data_get($stationTaskBatches, '*.batch_id'), ['status' => '已处理']);
+        $this->batchService->updateWhereIn('id', data_get($stationTaskBatches, '*.batch_id')??[], ['status' => '已处理']);
     }
-
-
 }

database/migrations/2020_11_30_140958_create_stations_table.php

@@ -27,7 +27,7 @@ class CreateStationsTable extends Migration
         $stationType= StationType::query()->firstOrCreate(['name'=>'料箱出货口']);
         $station料箱监视器01= StationType::query()->firstOrCreate(['name'=>'料箱监视器01']);
         $station= Station::query()->firstOrCreate(['name'=>'U型线入货口01'
-            ,'code'=>'BIN-OUT01'
+            ,'code'=>'BIN-OUT1'
             ,'station_type_id'=>$stationType['id']
             ,'parent_id'=>$station料箱监视器01['id']
         ]);

laravel-echo-server.json

@@ -1,5 +1,5 @@
 {
-	"authHost": "http://localhost",
+	"authHost": "https://localhost",
 	"authEndpoint": "/broadcasting/auth",
 	"clients": [
 		{
@@ -21,14 +21,14 @@
 			"databasePath": "/database/laravel-echo-server.sqlite"
 		}
 	},
-	"devMode": true,
+	"devMode": false,
 	"host": null,
 	"port": "6001",
-	"protocol": "http",
+	"protocol": "https",
 	"socketio": {},
 	"secureOptions": 67108864,
-	"sslCertPath": "",
-	"sslKeyPath": "",
+	"sslCertPath": "/etc/letsencrypt/live/was.baoshi56.com/fullchain.pem",
+	"sslKeyPath": "/etc/letsencrypt/live/was.baoshi56.com/privkey.pem",
 	"sslCertChainPath": "",
 	"sslPassphrase": "",
 	"subscribers": {

laravel-echo-server.json.configed

@@ -0,0 +1,44 @@
+{
+	"authHost": "https://localhost",
+	"authEndpoint": "/broadcasting/auth",
+	"clients": [
+		{
+			"appId": "3ce79ec696215d04",
+			"key": "e68440520697de422639b451f760f208"
+		},
+		{
+			"appId": "wcs",
+			"key": "62c8838fa8546ad1f1784327a6d25df2"
+		}
+	],
+	"database": "redis",
+	"databaseConfig": {
+		"redis": {
+            "port": "6379",
+            "host": "127.0.0.1"
+        },
+		"sqlite": {
+			"databasePath": "/database/laravel-echo-server.sqlite"
+		}
+	},
+	"devMode": false,
+	"host": null,
+	"port": "6001",
+	"protocol": "https",
+	"socketio": {},
+	"secureOptions": 67108864,
+	"sslCertPath": "/etc/letsencrypt/live/was.baoshi56.com/fullchain.pem",
+	"sslKeyPath": "/etc/letsencrypt/live/was.baoshi56.com/privkey.pem",
+	"sslCertChainPath": "",
+	"sslPassphrase": "",
+	"subscribers": {
+		"http": true,
+		"redis": true
+	},
+	"apiOriginAllow": {
+        "allowCors" : true,
+        "allowOrigin" : "http://127.0.0.1",
+        "allowMethods" : "GET, POST",
+        "allowHeaders" : "Origin, Content-Type, X-Auth-Token, X-Requested-With, Accept, Authorization, X-CSRF-TOKEN, X-Socket-Id"
+	}
+}

tests/webApi/thirdPart/haiq/move.http

@@ -2,7 +2,7 @@
 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}]}]}
+{"groupCode":"1","taskMode":2,"priority":1,"sequenceFlag":1,"bins":[{"taskCode":"taskIDE0000034","binCode":"IDE0000034","toWorkStation":"BIN-OUT1","fromWorkStation":"","fromLocCode":"","toLocCode":"","sequence":1,"stockInfo":[{"skuCode":"string","qty":1}]}]}
 ###
 
 

tests/webApi/thirdPart/haiq/pickStation.http

@@ -17,7 +17,7 @@
 POST https://was.baoshi56.com/api/thirdPart/haiq/pickStation/processed
 Content-Type: application/json
 
-{"workStation": "", "binCode":"8b839c28-f2e3-3d56-b34a-d9ac4fd81fa2", "success": true, "created_at":"", "exception": "", "is_in_plan":true}
+{"workStation": "1", "binCode":"IDE0005680", "success": true, "created_at":"2021-56-24 05-03-15", "exception": "", "is_in_plan":true}
 ###