临时提交

app/Services/OrderService.php

@@ -977,17 +977,14 @@ class OrderService
          */
         $orderPackageService = app('OrderPackageService');
         $orderPackageCommoditiesService = app('OrderPackageCommoditiesService');
-        $order = Order::query()->with('packages.commodities')->where('code',$orderHeader->orderno)->first();
-        if($order) return $order;
-        $create_param = $this->getParamByOrderHeader($orderHeader);
+        $orderHeaders = [$orderHeader];
         try {
-            $orderHeaders = [$orderHeader];
-            $order = Order::query()->create($create_param);
+            $this->syncOrderByWMSOrderHeaders($orderHeaders);
             $orderPackageService->syncOrderPackage($orderHeaders);
             $orderPackageCommoditiesService->syncOrderPackageCommodities($orderHeaders);
             return  Order::query()->with('packages.commodities')->where('code',$orderHeader->orderno)->first();
         } catch (\Exception $e) {
-            app('LogService')->log(__METHOD__, 'Error'.__FUNCTION__, '创建 Order Error' .' || '. json_encode($order).' || '.json_encode($e->getMessage()).' || '.json_encode($e->getTraceAsString()));
+            app('LogService')->log(__METHOD__, 'Error'.__FUNCTION__, '创建 Order Error' .' || '. json_encode($orderHeader).' || '.json_encode($e->getMessage()).' || '.json_encode($e->getTraceAsString()));
             return null;
         }
     }

tests/Services/OrderService/CreateOrFindOrderInfoTest.php

@@ -17,6 +17,7 @@ class CreateOrFindOrderInfoTest extends TestCase
 
     /**
      * @var OrderService $orderService
+     * @var Order $order
      */
     public $orderService;
     public $data = [];
@@ -37,4 +38,13 @@ class CreateOrFindOrderInfoTest extends TestCase
         $this->order->delete();
     }
 
+    public function testCreateOrFindOrderInfo1()
+    {
+        $orderHeader = $this->data['orderHeader'];
+        $orderHeader->customerid = null;
+        $orderHeader->warehouseid = null;
+        $orderHeader->UserDefine1 = null;
+
+    }
+
 }

tests/Services/OrderService/SyncOrderByWMSOrderHeaderTest.php

@@ -48,9 +48,7 @@ class SyncOrderByWMSOrderHeaderTest extends TestCase
         $date = '2020-09-18 18:13:50';
         $orderHeaders = $this->orderHeaderService->getWMSOrderOnStartDate($carbon);
         $this->service->syncOrderByWMSOrderHeaders($orderHeaders);
-        $existOrders = $this->service->getByWmsOrders($orderHeaders);
         $collect =null;
-
         foreach ($orderHeaders as $orderHeader) {
             $code = $orderHeader->orderno;
             $order = $collect->where('code',$code)->first();
@@ -77,11 +75,9 @@ class SyncOrderByWMSOrderHeaderTest extends TestCase
             $this->assertEquals($order->province ,$orderHeader->c_province);
             $this->assertEquals($order->city ,$orderHeader->c_city);
             $this->assertEquals($order->district ,$orderHeader->c_district);
-
             $this->assertEquals($order->client_code ,$orderHeader->soreference1);
             $this->assertEquals($order->wms_edittime ,(string)$orderHeader->edittime);
             $this->assertEquals($order->wms_status ,$orderHeader->oracleBASCode_codename_c);
-
             $this->assertEquals((string)$order->created_at ,(string)$orderHeader->addtime);
         }
     }

tests/Services/OrderService/SyncOrderTest.php

@@ -48,8 +48,6 @@ class SyncOrderTest extends TestCase
         $carbon =Carbon::now()->subHours(1);
         $date = '2020-05-18 18:13:50';
         var_dump(((string)Carbon::now()));
-        //   SO201112029795
-//        $orderHeader = $this->orderHeaderService->getWMSOrderOnStartDate($carbon);
         $orderHeader = OracleDOCOrderHeader::query()->selectRaw(implode(',',OracleDOCOrderHeaderService::$columns))
             ->with(['oracleBASCustomer'=>function($query){
                 $query->selectRaw('BAS_CUSTOMER.CustomerID,BAS_CUSTOMER.Customer_Type,BAS_CUSTOMER.Descr_C,BAS_CUSTOMER.Active_Flag');