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

app/Services/RejectedBillService.php

@@ -82,7 +82,8 @@ class RejectedBillService
         $updateCollect = $this->getUpdateCollect($asnHerders);
         if (!$updateCollect) return null;
         $logisticNumberReturn = $this->getLogisticNumberReturn($updateCollect);
-        $rejectedBills = $this->getRejectedBills($logisticNumberReturn);
+        $checkedNumbers = $this->getCheckNumbers($updateCollect);
+        $rejectedBills = $this->getRejectedBills($logisticNumberReturn,$checkedNumbers);
         if (!$rejectedBills) return null;
         $updateParams = [[
             'id', 'is_loaded', 'updated_at'
@@ -164,16 +165,28 @@ class RejectedBillService
         }
         return $logisticNumberReturn;
     }
+    public function getCheckNumbers($updateCollect){
+        $checkNumbers=[];
+        foreach ($updateCollect as $data){
+            $checkedNumber=$this->screenCheckNumber($data->customerid,$data->notes);
+            if (!$checkedNumber) continue;
+            array_push($checkNumbers, $checkedNumber);
+        }
+        return $checkNumbers;
+    }
 
     public function batchUpdate($params)
     {
         return app(BatchUpdateService::class)->batchUpdate('rejected_bills', $params);
     }
 
-    public function getRejectedBills(array $logisticNumberReturn)
+    public function getRejectedBills(array $logisticNumberReturn,$checkNumbers=[])
     {
         if (count($logisticNumberReturn) < 1) return null;
-        return RejectedBill::query()->whereIn('logistic_number_return', $logisticNumberReturn)->get();
+        return RejectedBill::query()
+            ->whereIn('logistic_number_return', $logisticNumberReturn)
+            ->orWhereIn('checked_numbers',$checkNumbers)
+            ->get();
     }
 
     public function getNeedUpdateCheckedStatusByWms($asnHerders)