Merge branch 'Haozi' of ssh://was.baoshi56.com:10022/var/git/bswas

 Conflicts:

	app/Http/Controllers/TestController.php

app/Http/Controllers/TestController.php

@@ -1543,6 +1543,35 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
             });
     }
 
+//    public function testNumber()
+//    {
+//        $asnnos=['ASN2101200684','ASN2101220543','ASN2101220542'];
+//        $asnHeaders=OracleDOCASNHeader::query()->whereIn('asnno',$asnnos)->get();
+//        /**
+//         * @var RejectedBillService $rejectedBillService
+//         */
+//        $rejectedBillService=app(RejectedBillService::class);
+//
+//        $updates = $rejectedBillService->getNeedUpdateCheckedStatusByWms($asnHeaders);
+//        app(BatchUpdateService::class)->batchUpdate('rejected_bills', $updates);
+//        dump($updates);
+//        //$logisticNumberReturn = $rejectedBillService->getLogisticNumberReturn($arr);
+//        //$rejectedBills = $rejectedBillService->getRejectedBills($logisticNumberReturn);
+//    }
 
-
+    public function updateRejectBillCheckedStatus()
+    {
+        $time=Carbon::parse("2021-01-22 00:00:00")->subDays(15)->toDateTimeString();
+        $asnHeaders=OracleDOCASNHeader::query()
+            ->where('addtime','>=',$time)
+            ->select('asnno','addtime','edittime','customerid','notes','asnreference3')
+            ->get();
+        $chunks=$asnHeaders->chunk(1000);
+        foreach ($chunks as $chunk) {
+         /** @var RejectedBillService $rejectedBillService */
+        $rejectedBillService=app(RejectedBillService::class);
+        $updates = $rejectedBillService->getNeedUpdateCheckedStatusByWms($chunk);
+        app(BatchUpdateService::class)->batchUpdate('rejected_bills', $updates);
+        }
+    }
 }

app/Services/RejectedBillService.php

@@ -64,14 +64,12 @@ Class RejectedBillService
 
     public function syncLoadedStatusByAsnHerder($asnHerders)
     {
-        //是否入库
-        $updateParams=$this->getNeedUpdateLoadedStatusByWms($asnHerders);
-        if (!$updateParams)return;
-        if (count($updateParams) > 1) $this->batchUpdate($updateParams);
         //是否审核
         $updates=$this->getNeedUpdateCheckedStatusByWms($asnHerders);
-        if (!$updates)return;
         if (count($updates) > 1) $this->batchUpdate($updates);
+        //是否入库
+        $updateParams=$this->getNeedUpdateLoadedStatusByWms($asnHerders);
+        if (count($updateParams) > 1) $this->batchUpdate($updateParams);
     }
 
     public function getNeedUpdateLoadedStatusByWms($asnHerders)