称重问题

app/Http/Controllers/api/thirdPart/weight/PackageController.php

@@ -217,7 +217,9 @@ class PackageController extends Controller
         }
         if (!$package){
             $logisticNumber=$request['barcode'];
-            $order = app('orderService')->logisticNumberCreateOrder($logisticNumber);
+            /** @var $orderService OrderService */
+            $orderService = app('orderService');
+            $order = $orderService->logisticNumberCreateOrder($logisticNumber);
             if (!$order) {
                 $response=["msg"=>"保存时发生错误（未在WMS找到该单）!","code"=>500,"data"=>null];
                 return json_encode($response,JSON_UNESCAPED_UNICODE);
@@ -235,12 +237,12 @@ class PackageController extends Controller
                 'weighed_at'=>$reqDate,
                 'status'=>"无",
             ]);
-            $package->fetchAllFromOracle();
-            $package->fetchPaperBox();
+//            $package->fetchAllFromOracle();
+//            $package->fetchPaperBox();
             try{
                 $package->save();
             }catch (\Exception $e){
-                $response=["msg"=>"保存时发生错误（未下发）!","code"=>500,"data"=>null];
+                $response=["msg"=>$e->getMessage(),"code"=>500,"data"=>$e->getTraceAsString()];
                 $this->log(__METHOD__,'weightApi(ERROR)'.__FUNCTION__,json_encode($request).'||'.json_encode($response).'||'.json_encode($e),null);
                 return json_encode($response,JSON_UNESCAPED_UNICODE);
             }

app/Services/OrderService.php

@@ -116,15 +116,20 @@ class OrderService
          * @var OracleActAllocationDetails $actAllocationDetail
          */
         $actAllocationDetail = app('oracleActAllocationDetailService')->first(['picktotraceid' => $logistic_number]);
-        if (!$actAllocationDetail) return null;
+        if (!$actAllocationDetail) {
+            $orderHeader=OracleDOCOrderHeader::query()->where('soreference5',$logistic_number)->first();
+            $orderno = $orderHeader->orderno;
+        }else{
+            $orderno = $actAllocationDetail->orderno;
+            $actAllocationDetail->load(['oracleDocOrderHeader' => function ($query) {
+                $query->with('oracleBASCode');
+            }]);
+            $orderHeader = $actAllocationDetail->oracleDocOrderHeader ?? null;
+        }
 
-        $order = $this->first(['code' => $actAllocationDetail->orderno]);
+        $order = $this->first(['code' => $orderno]);
         if ($order) return $order;
 
-        $actAllocationDetail->load(['oracleDocOrderHeader' => function ($query) {
-            $query->with('oracleBASCode');
-        }]);
-        $orderHeader = $actAllocationDetail->oracleDocOrderHeader ?? null;
         if ($orderHeader == null) return null;
 
         /** @var OwnerService $owner */

resources/views/weight/package/index.blade.php

@@ -78,7 +78,7 @@
                         weight:'{{$package->weight}}', length:'{{$package->length}}',width:'{{$package->width}}',height:'{{$package->height}}',
                         bulk:'{{$package->bulk}}',paperBoxName:'{{$package->paper_box ? $package->paper_box->name : ''}}',
                         status:'{{$package->status}}',created_at:'{{$package->created_at}}',weighed_at:'{{$package->weighed_at}}',
-                        paperBox : {!! $package->paperBox !!} },
+                        paperBox : {!! $package->paperBox??'""' !!} },
                     @endforeach
                 ],
                 i:0,

tests/package.http

@@ -1,4 +1,4 @@
 POST http://bswas/api/thirdPart/weight/new
 Content-Type: application/json
 
-{"id": "abc6","barcode": "5466422500912e","weight": "13","length": 3,"width": 1,"height": 2}
+{"id": "abc6","barcode": "547181870002","weight": "0.31","length": 3,"width": 1,"height": 2}