|
@@ -37,7 +37,7 @@ class U8ServerService extends Service
|
|
|
$qx = $user['qx'];
|
|
|
$order_date = $data['order_date'] ?? [];
|
|
|
$order_date = array_filter($order_date);
|
|
|
- $order_number = $data['order_number'] ?? [];
|
|
|
+ $order_number = $data['order_number'] ?? "";
|
|
|
|
|
|
$model = $this->databaseService->table('PU_AppVouch as a')
|
|
|
->leftJoin('Person as c', 'c.cPersonCode', 'a.cPersonCode')
|
|
@@ -45,7 +45,7 @@ class U8ServerService extends Service
|
|
|
return $query->where('a.cMaker',$user['username']);
|
|
|
})
|
|
|
->when(! empty($order_number), function ($query) use($order_number){
|
|
|
- return $query->where('a.cCode',$order_number);
|
|
|
+ return $query->where('a.cCode','LIKE', '%'.$order_number.'%');
|
|
|
})
|
|
|
->when(! empty($order_date), function ($query) use($order_date){
|
|
|
$start = date('Y-m-d H:i:s.000', $order_date[0]);
|
|
@@ -91,7 +91,7 @@ class U8ServerService extends Service
|
|
|
$qx = $user['qx'];
|
|
|
$order_date = $data['order_date'] ?? [];
|
|
|
$order_date = array_filter($order_date);
|
|
|
- $order_number = $data['order_number'] ?? [];
|
|
|
+ $order_number = $data['order_number'] ?? "";
|
|
|
|
|
|
$model = $this->databaseService->table('PO_Pomain as a')
|
|
|
->leftJoin('Vendor as c', 'c.cVenCode', 'a.cVenCode')
|
|
@@ -99,7 +99,7 @@ class U8ServerService extends Service
|
|
|
return $query->where('a.cMaker',$user['username']);
|
|
|
})
|
|
|
->when(! empty($order_number), function ($query) use($order_number){
|
|
|
- return $query->where('a.cPOID',$order_number);
|
|
|
+ return $query->where('a.cPOID','LIKE', '%'.$order_number.'%');
|
|
|
})
|
|
|
->when(! empty($order_date), function ($query) use($order_date){
|
|
|
$start = date('Y-m-d H:i:s.000', $order_date[0]);
|
|
@@ -142,7 +142,7 @@ class U8ServerService extends Service
|
|
|
$qx = $user['qx'];
|
|
|
$order_date = $data['order_date'] ?? [];
|
|
|
$order_date = array_filter($order_date);
|
|
|
- $order_number = $data['order_number'] ?? [];
|
|
|
+ $order_number = $data['order_number'] ?? "";
|
|
|
|
|
|
$model = $this->databaseService->table('AP_ApplyPayVouch as a')
|
|
|
->leftJoin('Vendor as c', 'c.cVenCode', 'a.cDwCode')
|
|
@@ -150,7 +150,7 @@ class U8ServerService extends Service
|
|
|
return $query->where('a.cOperator',$user['username']);
|
|
|
})
|
|
|
->when(! empty($order_number), function ($query) use($order_number){
|
|
|
- return $query->where('a.cVouchID',$order_number);
|
|
|
+ return $query->where('a.cVouchID','LIKE', '%'.$order_number.'%');
|
|
|
})
|
|
|
->when(! empty($order_date), function ($query) use($order_date){
|
|
|
$start = date('Y-m-d H:i:s.000', $order_date[0]);
|