Przeglądaj źródła

导入时去除空格

Zhouzhendong 4 lat temu
rodzic
commit
86434aed31

+ 2 - 1
app/Http/Controllers/TestController.php

@@ -110,7 +110,7 @@ use PhpOffice\PhpSpreadsheet\Calculation\Web\Service;
 use Ramsey\Uuid\Uuid;
 use Symfony\Component\ErrorHandler\Error\FatalError;
 
-class TestController extends Controller
+class TestController extends \App\Http\Controllers\api\thirdPart\syrius\producer\Controller
 {
     use AsyncResponse, ErrorPush, Database;
 
@@ -202,6 +202,7 @@ class TestController extends Controller
     }
     public function test()
     {
+        dd($this->response("德玛西亚",[]));
        $st = '[{"taskMode":1,"bins":[{"taskCode":"102876_1632099648.1379","binCode":"IDE0000686","fromLocCode":"BIN-IN1","toLocCode":""}],"groupCode":"_1632099648.1379","priority":10,"sequenceFlag":1}]';
        $st = json_decode($st,true);
        $st[0]["sequenceFlag"] = 0;

+ 10 - 1
app/Http/Controllers/api/thirdPart/syrius/producer/BinLocation.php

@@ -4,7 +4,16 @@
 namespace App\Http\Controllers\api\thirdPart\syrius\producer;
 
 
+use Illuminate\Support\Facades\Http;
+
 class BinLocation
 {
-
+    public function createBinLocation()
+    {
+        $token = "";
+        Http::withHeaders([
+            'Accept' => 'application/json',
+            'Authorization' => 'Bearer ' .$token,
+        ])->post("x",[]);
+    }
 }

+ 26 - 0
app/Http/Controllers/api/thirdPart/syrius/producer/Controller.php

@@ -4,7 +4,33 @@
 namespace App\Http\Controllers\api\thirdPart\syrius\producer;
 
 
+use Illuminate\Http\Client\ConnectionException;
+use Illuminate\Http\Client\Response;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Log;
+
 class Controller
 {
+    public function response($url, $data): ?Response
+    {
+        $logInfo = [
+            "param" =>  $data,
+            "user"  =>  Auth::id(),
+            "ip"    =>  request()->ip(),
+        ];
 
+        $token = "";
+        try {
+            return Http::withHeaders([
+                'Accept' => 'application/json',
+                'Authorization' => 'Bearer '.$token,
+            ])->post($url,$data);
+        }catch (ConnectionException $e){
+            Log::warning("syrius:连接异常",$logInfo);
+        }catch (\Exception $e){
+            Log::warning("syrius:请求异常",$logInfo);
+        }
+        return null;
+    }
 }

+ 2 - 2
app/Http/Requests/Api/WaybillDispatch.php

@@ -19,8 +19,8 @@ class WaybillDispatch extends AndroidGateRequest
             "inquire_tel"           => ["required","string","max:20"],
             "amount"                => ["required","integer","min:1"],
             "amount_unit_name"      => ["required",Rule::in(["件","托"])],
-            "carrier_weight_other"  => ["required_without:carrier_weight","numeric","min:0.01"],
-            "carrier_weight"        => ["required_without:carrier_weight_other","numeric","min:0.01"],
+            "carrier_weight_other"  => ["required_without:carrier_weight","nullable","numeric","min:0.01"],
+            "carrier_weight"        => ["required_without:carrier_weight_other","nullable","numeric","min:0.01"],
             "subjoin_fee"           => ["nullable","string"],
         ];
     }

+ 1 - 1
app/Imports/StoreCheckingReceiveImport.php

@@ -96,7 +96,7 @@ class StoreCheckingReceiveImport implements ToCollection,WithHeadingRow
                 "unique_code" => $item["唯一码"],
                 "SKU" => $item["SKU"],
                 "商品名称" => $item["商品名称"],
-                "条码" => $item["条码"],
+                "条码" => rtrim(ltrim($item["条码"])),
             ]);
             if ($isUniqueCommodity){
                 array_push($commodities[$item["条码"]], count($items)-1);

+ 15 - 0
config/api.php

@@ -59,6 +59,21 @@ return [
         ],
     ],
 
+    "syrius" => [
+        "client_id"     => "1dg6clndocrtiugsl4bj83kpk6",
+        "client_secret" => "vthuec06c1jrjr31nt98l8r7kune0uqdgrjeifm0472re923c15",
+        "base_url"      => "",
+        "request"       => [
+            "bin_location"  => "/account/binlocation/",         //GET
+            "find_all_bin_location" => " /account/binlocation/",//POST
+            "delete_bin_location" => " /account/binlocation/",  //DELETE
+            "find_storage_type" =>  "/account/basicdata-type/storage/type/{storageTypeId}", //GET
+            "create_order"  => "/order/warehouse-order/", //POST
+            "find_order"    => "/order/warehouse-order/{id}",//GET
+            "notifications" => "{order-notification-url}"   //POST
+        ],
+    ],
+
     /** goodScan
     https://was.baoshi56.com/api/thirdPart/goodscan/weight/new  //新增包裹
      */