Merge branch 'master' into receivingService_edit

app/Jobs/PackageCollectingAllocation.php

@@ -37,7 +37,7 @@ class PackageCollectingAllocation implements ShouldQueue
     {
         /** @var OrderPackageService $orderPackageService */
         $orderPackageService = app('OrderPackageService');
-        if (OrderPackage::query()->select(1)->where('logistic_number',$this->orderPackage->logistic_number)->where('collecting_status',0)->first()){
+        if (OrderPackage::query()->selectRaw('1')->where('logistic_number',$this->orderPackage->logistic_number)->where('collecting_status',0)->first()){
             $orderPackageService->collectUpload([$this->orderPackage->logistic_number]);
         }
     }

app/OracleDOCASNDetail.php

@@ -33,7 +33,7 @@ class OracleDOCASNDetail extends Model
     public function basSku()
     {
         return $this->hasOne(OracleBasSKU::class,['customerid','sku'],['customerid','sku'])
-            ->select('customerid','sku','lotid','alternate_sku1','alternate_sku2','alternate_sku3','descr_c','alternate_sku1','alternate_sku2','alternate_sku3');
+            ->select('customerid','sku','lotid','alternate_sku1','alternate_sku2','alternate_sku3','descr_c');
 
     }
 }