调整退库入库审核状态

app/Http/Controllers/TestController.php

@@ -77,6 +77,7 @@ use App\Services\OrderTrackingOwnerService;
 use App\Services\OrderTrackingService;
 use App\Services\OwnerPriceOperationService;
 use App\Services\OwnerService;
+use App\Services\RejectedBillService;
 use App\Services\ShopService;
 use App\Services\StoreService;
 use App\Services\WarehouseService;
@@ -1611,4 +1612,6 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
                 }
             });
     }
+
+
 }

app/Services/RejectedBillService.php

@@ -64,9 +64,11 @@ 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);
@@ -74,14 +76,15 @@ Class RejectedBillService
 
     public function getNeedUpdateLoadedStatusByWms($asnHerders)
     {
-        if ($asnHerders->isEmpty()) return null;
+
+        if (!$asnHerders) return null;
         $updateCollect = $this->getUpdateCollect($asnHerders);
-        if ($updateCollect->isEmpty()) return null;
+        if (!$updateCollect) return null;
         $logisticNumberReturn = $this->getLogisticNumberReturn($updateCollect);
         $rejectedBills = $this->getRejectedBills($logisticNumberReturn);
         if (!$rejectedBills) return null;
         $updateParams = [[
-            'logistic_number_return', 'is_loaded', 'updated_at'
+            'id','logistic_number_return', 'is_loaded', 'updated_at'
         ]];
         $updated_at = Carbon::now()->toDateTimeString();
         /** @var DataHandlerService $dataHandlerService */
@@ -94,6 +97,7 @@ Class RejectedBillService
             if ($data->asnreference3) {
                 $rejectedBill = $dataHandlerService->getKeyValue(['logistic_number_return' => $data->asnreference3], $rejectedBills_map);
                 if ($rejectedBill && $rejectedBill->is_loaded != 1) $updateParams[] = [
+                    'id'=>$rejectedBill->id,
                     'logistic_number_return' => $data->asnreference3,
                     'is_loaded' => 1,
                     'updated_at' => $updated_at,
@@ -104,6 +108,7 @@ Class RejectedBillService
                 if (count($result)<1) continue;
                 $rejectedBill = $dataHandlerService->getKeyValue(['logistic_number_return' => $result[0]], $rejectedBills_map);
                 if ($rejectedBill && $rejectedBill->is_loaded != 1) $updateParams[] = [
+                    'id'=>$rejectedBill->id,
                     'logistic_number_return' => $result[0],
                     'is_loaded' => 1,
                     'updated_at' => $updated_at,
@@ -158,12 +163,12 @@ Class RejectedBillService
 
     public function getNeedUpdateCheckedStatusByWms($asnHerders)
     {
-        if ($asnHerders->isEmpty()) return null;
+        if (!$asnHerders) return null;
         $logisticNumberReturn = $this->getLogisticNumberReturn($asnHerders);
         $rejectedBills = $this->getRejectedBills($logisticNumberReturn);
         if (!$rejectedBills) return null;
         $updateParams = [[
-            'logistic_number_return', 'is_checked','checked_numbers','updated_at'
+            'id','logistic_number_return', 'is_checked','checked_numbers','updated_at'
         ]];
         $updated_at = Carbon::now()->toDateTimeString();
         /** @var DataHandlerService $dataHandlerService */
@@ -174,6 +179,7 @@ Class RejectedBillService
             if ($data->asnreference3) {
                 $rejectedBill = $dataHandlerService->getKeyValue(['logistic_number_return' => $data->asnreference3], $rejectedBills_map);
                 if ($rejectedBill && $rejectedBill->is_checked != 1) $updateParams[] = [
+                    'id'=>$rejectedBill->id,
                     'logistic_number_return' => $data->asnreference3,
                     'is_checked' => 1,
                     'checked_numbers' => $rejectedBill->makeCheckedNumbers(),
@@ -184,12 +190,14 @@ Class RejectedBillService
                 preg_match("/[a-zA-Z]{0,5}\d{6,20}/", $data->notes, $result);
                 if (count($result)<1) continue;
                 $rejectedBill = $dataHandlerService->getKeyValue(['logistic_number_return' => $result[0]], $rejectedBills_map);
-                if ($rejectedBill && $rejectedBill->is_checked != 1) $updateParams[] = [
-                    'logistic_number_return' => $result[0],
-                    'is_checked' => 1,
-                    'checked_numbers' => $rejectedBill->makeCheckedNumbers(),
-                    'updated_at' => $updated_at,
-                ];
+                if ($rejectedBill && $rejectedBill->is_checked != 1)
+                    $updateParams[] = [
+                        'id'=>$rejectedBill->id,
+                        'logistic_number_return' => $result[0],
+                        'is_checked' => 1,
+                        'checked_numbers' => $rejectedBill->makeCheckedNumbers(),
+                        'updated_at' => $updated_at,
+                    ];
                 unset($result);
             }
         }