LD 4 лет назад
Родитель
Сommit
7a0d4daac5

+ 6 - 4
app/Http/Controllers/api/thirdPart/haiq/StorageController.php

@@ -325,12 +325,14 @@ class StorageController
         $result = ['status'=>'失败'];
         LogService::log(__CLASS__,__METHOD__,$responseBody);
         if(strstr($responseBody,'200')){
-            $responseJson=json_decode($responseBody);
+            $responseJson=json_decode($responseBody,true);
             $result = ['status'=>'成功'];
             $responseBody = '取料箱成功:' . implode(',', $codes);
-            if($responseJson['data']['code']==10007
-                && count($responseJson['data']['datas'])>0){
-                $responseBody = '以下料箱不在库内,无法取出:' . implode(',', $responseJson['data']['datas']);
+            $data0part = $responseJson['data'][0]??[];
+            if($data0part['code']==10007
+                && count($data0part['datas'])>0){
+                $responseBody = '以下料箱不在库内,无法取出:' . implode(',', $data0part['datas']).
+                '| 成功取出料箱:'.implode(',', array_diff($codes, $data0part['datas']));
                 $result = ['status'=>'部分成功'];
             }
         }

+ 4 - 24
public/t.php

@@ -1,26 +1,6 @@
 <?php
 
-
-class Aa
-{
-    static public $enums=[
-        'status'=>[
-            '在库外'=>6,
-            '在U型线'=>1,
-            '在出库中'=>2,
-            '在入库中'=>3,
-            '在立库'=>4,
-            '异常'=>5,
-        ],
-    ];
-    function __construct(array $attributes = [])
-    {
-        foreach (self::$enums as &$enum) {
-            $enum=$enum+array_flip($enum);
-        }
-    }
-
-}
-
-$aa = new Aa();
-var_dump(Aa::$enums['status'][1]);
+$j = json_decode(
+    '{"code":200,"errMsg":"","data":[{"code":10007,"msg":"参数错误或状态错误","datas":["IDE0000001"]}],"taskCode":"","cancelStatus":0}'
+,true);
+var_dump($j['data'][0]['datas']);

+ 2 - 1
resources/views/station/monitor/show.blade.php

@@ -403,6 +403,7 @@
                         this.current_stationTaskBatch.runningStatus=''
                 },
                 manuallyTakeBoxOut(){
+                    let _this=this;
                     if(typeof(window.manuallyHairouRequesting)==='undefined'
                         ||window.manuallyHairouRequesting===false){
                         window.manuallyHairouRequesting=true;
@@ -418,7 +419,7 @@
                         }).catch(function(err){
                         tempTip.okWindow(err,'确定')
                     }).finally(function(){
-                        this.inputs.manuallyTakeBox.text='';
+                        _this.inputs.manuallyTakeBox.text='';
                         window.manuallyHairouRequesting=false;
                     })
                 },