测试用例修改

tests/Services/OrderService/CreateOrFindOrderInfoTest.php

@@ -35,44 +35,41 @@ class CreateOrFindOrderInfoTest extends TestCase
         parent::setUp(); // TODO: Change the autogenerated stub
         $this->orderService = app('OrderService');
 
+        $wmsOrderHeader = factory(OracleDOCOrderHeader::class)->make([
+            'customerid'=>'TEST_OW','sostatus'=>99,'userdefine1'=>'TEST_CA','warehouseid'=>'WH_TEST'
+        ]);
+        $this->data['warehouse']    = factory(Warehouse::class)->create(['code'=>'WH_TEST']);
+        $this->data['logistic']     = factory(Logistic::class)->create(['code'=>'TEST_CA','name'=>'测试承运商']);
+        $this->data['owner']        = factory(Owner::class)->create(['code'=>'TEST_OW','name'=>'测试货主']);
+        $this->data['shop']         = factory(Shop::class)->create(['owner_id'=>$this->data['owner']['id']]);
+
+        $code_BasCode  = factory(OracleBasCode::class)->make(['codeid'=>'OW','code'=>'99','descr_c'=>'订单完成']);
+        $orderType = factory(OracleBasCode::class)->make(['code'=>'sysy', 'codeid'=>'SO_TYP', 'codename_c'=>'测试状态']);
+
         $basSku1 = factory(OracleBasSKU::class)->make(['customerid' => 'TEST_OW']);
         $basSku2 = factory(OracleBasSKU::class)->make(['customerid' => 'TEST_OW']);
         $basSku3 = factory(OracleBasSKU::class)->make(['customerid' => 'TEST_OW']);
 
-        $this->data['warehouse'] = factory(Warehouse::class)->create(['code'=>'WH_TEST']);
-
-        $logistic_BasCustomer = factory(OracleBasCustomer::class)->make(['customer_type'=>'CA','customerid'=>'TEST_CA','descr_c'=>'测试承运商']);
-        $owner_basCustomer  = factory(OracleBasCustomer::class)->make(['customer_type'=>'OW','customerid'=>'TEST_OW','descr_c'=>'测试货主']);
-        $code_BasCode  = factory(OracleBasCode::class)->make(['codeid'=>'OW','code'=>'99','descr_c'=>'订单完成']);
-
-        $orderType = factory(OracleBasCode::class)->make(['code'=>'sysy', 'codeid'=>'SO_TYP', 'codename_c'=>'测试状态']);
-        $wmsOrderHeader = factory(OracleDOCOrderHeader::class)->make(['customerid'=>'TEST_OW','sostatus'=>99,'orderType'=>'sysy','userdefine1'=>'TEST_CA','warehouseid'=>$this->data['warehouse']['code']]);
+        $this->data['sku'] = [];
+        $this->data['sku'][] = factory(Commodity::class)->create(['owner_id'=>$this->data['owner']['id'],'sku'=>$basSku1['sku']]);
+        $this->data['sku'][] = factory(Commodity::class)->create(['owner_id'=>$this->data['owner']['id'],'sku'=>$basSku2['sku']]);
+        $this->data['sku'][] = factory(Commodity::class)->create(['owner_id'=>$this->data['owner']['id'],'sku'=>$basSku3['sku']]);
 
         $oracleDOCOrderDetail1 = factory(OracleDOCOrderDetail::class)->make(['orderno'=>$wmsOrderHeader->orderno,'customerid'=>'TEST_CA','sku'=>$basSku1->sku]);
         $oracleDOCOrderDetail2 = factory(OracleDOCOrderDetail::class)->make(['orderno'=>$wmsOrderHeader->orderno,'customerid'=>'TEST_CA','sku'=>$basSku2->sku]);
         $oracleDOCOrderDetail3 = factory(OracleDOCOrderDetail::class)->make(['orderno'=>$wmsOrderHeader->orderno,'customerid'=>'TEST_CA','sku'=>$basSku3->sku]);
         $oracleDOCOrderDetails = collect([$oracleDOCOrderDetail1,$oracleDOCOrderDetail3,$oracleDOCOrderDetail2]);
+        $wmsOrderHeader->setRelation('oracleDOCOrderDetails',$oracleDOCOrderDetails);
 
         $OracleActAllocationDetail1 = factory(OracleActAllocationDetails::class)->make(['orderno'=>$wmsOrderHeader->orderno,'customerid'=>'TEST_CA','sku'=>$basSku1->sku]);
         $OracleActAllocationDetail2 = factory(OracleActAllocationDetails::class)->make(['orderno'=>$wmsOrderHeader->orderno,'customerid'=>'TEST_CA','sku'=>$basSku2->sku]);
         $OracleActAllocationDetail3 = factory(OracleActAllocationDetails::class)->make(['orderno'=>$wmsOrderHeader->orderno,'customerid'=>'TEST_CA','sku'=>$basSku3->sku]);
         $OracleActAllocationDetails = collect([$OracleActAllocationDetail1,$OracleActAllocationDetail2,$OracleActAllocationDetail3]);
-
-        $wmsOrderHeader->setRelation('oracleDOCOrderDetails',$oracleDOCOrderDetails);
         $wmsOrderHeader->setRelation('actAllocationDetails',$OracleActAllocationDetails);
-        $wmsOrderHeader->setRelation('orderType',$orderType);
+
         $wmsOrderHeader->setRelation('orderType',$orderType);
         $wmsOrderHeader->setRelation('oracleBASCode',$code_BasCode);
-
         $this->data['orderHeader'] = $wmsOrderHeader;
-
-        $this->data['logistic'] =  factory(Logistic::class)->create(['code'=>$logistic_BasCustomer->customerid,'name'=>$logistic_BasCustomer->descr_c]);
-        $this->data['owner'] = factory(Owner::class)->create(['code'=>$owner_basCustomer->customerid,'name'=>$owner_basCustomer->descr_c]);
-        $this->data['shop'] = factory(Shop::class)->create(['owner_id'=>$this->data['owner']['id']]);
-        $this->data['sku'] = [];
-        $this->data['sku'][] = factory(Commodity::class)->create(['owner_id'=>$this->data['owner']['id'],'sku'=>$basSku1['sku']]);
-        $this->data['sku'][] = factory(Commodity::class)->create(['owner_id'=>$this->data['owner']['id'],'sku'=>$basSku2['sku']]);
-        $this->data['sku'][] = factory(Commodity::class)->create(['owner_id'=>$this->data['owner']['id'],'sku'=>$basSku3['sku']]);
     }
 
     /**