Merge branch 'zzd'

app/Http/Controllers/TestController.php

@@ -14,6 +14,8 @@ use App\OracleActAllocationDetails;
 use App\OracleDOCOrderHeader;
 use App\OracleDocOrderPackingSummary;
 use App\OracleDOCWaveDetails;
+use App\Order;
+use App\OrderPackage;
 use App\Owner;
 use App\Package;
 use App\RejectedBillItem;
@@ -325,6 +327,21 @@ class TestController extends Controller
         if (count($error) > 0)LogService::log(__METHOD__,"同步时WMS中未找到这些订单_two",json_encode($error));
     }
 
+    function test1(){
+        $package = OrderPackage::query()->whereNull('order_id')->first();
+        $package->load(['order'=>function($query){
+            $query->with('owner','logistic');
+        },'paperBox','measuringMachine']);
+        $logisticNumberController = new LogisticNumberFeatureController();
+        if (!$package->order){
+            $package->order = new Order();
+        }
+        if (!$package->order->logistic){
+            $package->order->logistic = $logisticNumberController->getLogisticByFeatures($package->logistic_number);
+        }
+        dd($package);
+    }
+
     /*1*/
     function socket(Request $request)
     {/**/

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

@@ -4,8 +4,10 @@ namespace App\Http\Controllers\Api\thirdPart\weight;
 
 use App\Events\WeighedEvent;
 use App\Http\Controllers\Controller;
+use App\Http\Controllers\LogisticNumberFeatureController;
 use App\Jobs\FetchPackageFromOracle;
 use App\MeasuringMachine;
+use App\Order;
 use App\OrderPackage;
 use App\Services\OrderService;
 use App\Waybill;
@@ -213,7 +215,23 @@ class PackageController extends Controller
                 }catch (\Exception $e){
                     $package->status="未上传";
                 }
+            }
+            try{
                 $package->save();
+                $package->load(['order'=>function($query){
+                    $query->with('owner','logistic');
+                },'paperBox','measuringMachine']);
+                $logisticNumberController = new LogisticNumberFeatureController();
+                if (!$package->order){
+                    $package->order = new Order();
+                }
+                if (!$package->order->logistic){
+                    $package->order->logistic = $logisticNumberController->getLogisticByFeatures($package->logistic_number);
+                }
+            }catch (\Exception $e){
+                $response=["msg"=>"称重下发修改时发生错误!".json_encode($e),"code"=>500,"data"=>null];
+                $this->log(__METHOD__,'weightApi(ERROR)'.__FUNCTION__,json_encode($request).'||'.json_encode($response).'||'.json_encode($e),null);
+                return json_encode($response,JSON_UNESCAPED_UNICODE);
             }
         }
         if (!$package){
@@ -241,7 +259,16 @@ class PackageController extends Controller
             $package->fetchPaperBox();
             try{
                 $package->save();
-                $package->load(['order','paperBox','measuringMachine']);
+                $package->load(['order'=>function($query){
+                    $query->with('owner','logistic');
+                },'paperBox','measuringMachine']);
+                $logisticNumberController = new LogisticNumberFeatureController();
+                if (!$package->order){
+                    $package->order = new Order();
+                }
+                if (!$package->order->logistic){
+                    $package->order->logistic = $logisticNumberController->getLogisticByFeatures($package->logistic_number);
+                }
             }catch (\Exception $e){
                 $response=["msg"=>$e->getMessage(),"code"=>500,"data"=>$e->getTraceAsString()];
                 $this->log(__METHOD__,'weightApi(ERROR)'.__FUNCTION__,json_encode($request).'||'.json_encode($response).'||'.$e->getTraceAsString(),null);

app/Order.php

@@ -23,7 +23,7 @@ class Order extends Model
 
     public function logistic()
     {
-        return $this->belongsTo('App\Logistic', 'logistic_id', 'id');
+        return $this->hasOne('App\Logistic', 'id', 'logistic_id');
     }
 
     public function issue()
@@ -38,7 +38,7 @@ class Order extends Model
 
     public function owner()
     {
-        return $this->belongsTo('App\Owner', 'owner_id', 'id');
+        return $this->hasOne('App\Owner', 'id', 'owner_id');
     }
 
     public function packages()

tests/Routes/WebTest.php

@@ -44,10 +44,22 @@ class WebTest extends TestCase
                 'remember_token' => Str::random(10),
             ]);
         }
-
+        $getMethod = self::GET;
+        $postMethod = self::POST;
+        $putMethod = self::PUT;
+        $deleteMethod = self::DELETE;
         foreach (self::MATCH as $method => $route){
             if ($method == 'get'){
-
+                array_push($getMethod,$route);
+            }
+            if ($method == 'post'){
+                array_push($postMethod,$route);
+            }
+            if ($method == 'put'){
+                array_push($putMethod,$route);
+            }
+            if ($method == 'delete'){
+                array_push($deleteMethod,$route);
             }
         }
         $urls = array_merge(self::GET,self::RESTFUL);