Merge branch 'Haozi'

app/Console/Commands/AccordingToOwnersManualBack.php

@@ -134,6 +134,7 @@ class AccordingToOwnersManualBack extends Command
         if (count($ordernos)==0)return;
         OracleDOCOrderHeader::query()
             ->whereIn('orderno',$ordernos)
+            ->whereIn('sostatus',['40','50','60','61'])
             ->whereNotNull('soreference5')
             ->where('manualflag','N')
             ->where('releasestatus','!=','H')

app/Services/StoreItemService.php

@@ -35,14 +35,9 @@ class StoreItemService
 
     public function getAsnDetailsByAsnHerder($asnHerders)
     {
-        $asnnos = collect();
-        foreach ($asnHerders as $asnHerder) {
-            $asnnos->add($asnHerder->asnno);
-        }
-        $asnnos = $asnnos->unique()->toArray();
         return OracleDOCASNDetail::query()
             ->with(['lineStatus', 'qualityStatus'])
-            ->whereIn('asnno',$asnnos)
+            ->whereIn('asnno',array_unique(data_get($asnHerders, '*.asnno')))
             ->select('asnno','asnlineno','customerid','sku','skudescrc','linestatus','lotatt08','lotatt05','receivedqty','expectedqty','addtime','edittime')
             ->get();
     }