|
|
@@ -3,6 +3,7 @@
|
|
|
namespace App\Services;
|
|
|
|
|
|
use App\Http\Controllers\Controller;
|
|
|
+use App\OracleDOCASNHeader;
|
|
|
use App\OracleDOCOrderHeader;
|
|
|
use App\OrderIssue;
|
|
|
use App\OrderIssueProcessLog;
|
|
|
@@ -282,12 +283,17 @@ class OrderIssueService
|
|
|
public function createOrFind($clientCode)
|
|
|
{
|
|
|
$orderService = app('orderService');
|
|
|
- $orderHeader = OracleDOCOrderHeader::query()->where('SOREFERENCE1', $clientCode)->first();
|
|
|
+ $orderHeader = OracleDOCOrderHeader::query()->where('SOReference1', $clientCode)->first();
|
|
|
if (!$orderHeader) {
|
|
|
return null;
|
|
|
}
|
|
|
$order = $orderService->findOrCreateByClientCode($clientCode);
|
|
|
$rejectedBill = RejectedBill::query()->where('order_number', $orderHeader['soreference1'])->first();
|
|
|
+ if(!($rejectedBill ?? false)){
|
|
|
+ $asnHeader = OracleDOCASNHeader::query()->where('ASNReference2', $orderHeader['soreference1'])->first();
|
|
|
+ if($asnHeader['asnreference3'] ?? false)
|
|
|
+ $rejectedBill = RejectedBill::query()->where('logistic_number_return',$asnHeader['asnreference3'])->first();
|
|
|
+ }
|
|
|
$arr = [
|
|
|
'order_id' => $order['id'],
|
|
|
'rejected_bill_id' => $rejectedBill['id'] ?? '',
|