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

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

@@ -170,7 +170,7 @@ class StorageController
         ]];
         $this->lightOn = [
             "areaCode"=> "1004",
-            "PTLAction"=> 1,
+            "PTLAction"=> 1, //1是开，0是关
             "PTLSettings"=> [
                 "color"=> 1,
                 "frequency"=> 1
@@ -187,7 +187,7 @@ class StorageController
                 "uomDesc01"=> "uo",
                 "uomDesc02"=> "uo"
             ],
-            "locCode"=> "HAIB2-02-03"
+            "locCode"=> "HAIB2-02-03"//灯条口，B1\B2=设备编号，中间号码代表从右往左数的列，右边号码时从下往上数
         ];
         $this->lightOff = [
             "PTLAction"=> 0,

app/Services/OrderPackageService.php

@@ -135,7 +135,7 @@ class OrderPackageService
         $inner_params = [];
 
         /** 定制京东快递的订单 */
-        $logistic = $logisticService->getLogisticByCodes(['JDKD']);
+        $logistic = $logisticService->getLogisticByCodes(['JDKD'])->first();
         foreach ($orders as $order){
             $orderHeader = $dataHandlerService->getKeyValue(['orderno'=>$order->code],$orderHeaders_map);
             if(!$orderHeader)continue;