|
@@ -35,7 +35,7 @@ class U8ServerService extends Service
|
|
|
|
|
|
public function purchaseRequisition($data, $user){
|
|
|
$qx = $user['qx'];
|
|
|
- $order_date = $data['order_date'] ?? [];
|
|
|
+ $order_date = array_filter($data['order_date']) ?? [];
|
|
|
$order_number = $data['order_number'] ?? [];
|
|
|
|
|
|
$model = $this->databaseService->table('PU_AppVouch as a')
|
|
@@ -79,7 +79,7 @@ class U8ServerService extends Service
|
|
|
->leftJoin('Inventory as b', 'b.cInvCode', 'a.cInvCode')
|
|
|
->leftJoin('ComputationUnit as c', 'c.cComunitCode', 'b.cComUnitCode')
|
|
|
->where('a.ID', $order['id'])
|
|
|
- ->select('b.cInvName as product_title','b.cInvCode as product_code','a.fQuantity as quantity','c.cComUnitName as unit_title','a.dRequirDate as need_arrived_date')
|
|
|
+ ->select('b.cInvName as product_title','b.cInvCode as product_code','a.fQuantity as quantity','c.cComUnitName as unit_title',DB::raw("CONVERT(varchar(10), a.dRequirDate, 120) as need_arrived_date"))
|
|
|
->get()->toArray();
|
|
|
$order['detail'] = $detail;
|
|
|
|
|
@@ -88,7 +88,7 @@ class U8ServerService extends Service
|
|
|
|
|
|
public function purchaseOrder($data, $user){
|
|
|
$qx = $user['qx'];
|
|
|
- $order_date = $data['order_date'] ?? [];
|
|
|
+ $order_date = array_filter($data['order_date']) ?? [];
|
|
|
$order_number = $data['order_number'] ?? [];
|
|
|
|
|
|
$model = $this->databaseService->table('PO_Pomain as a')
|
|
@@ -105,7 +105,7 @@ class U8ServerService extends Service
|
|
|
return $query->whereBetween('a.dPODate', [$start, $end]);
|
|
|
})
|
|
|
->where('a.iverifystateex',0)
|
|
|
- ->select('a.cMaker as crt_name', 'a.cBusType as business_type','a.cPOID as order_number','a.dPODate as order_date','c.cVenName as supplier_title')
|
|
|
+ ->select('a.cMaker as crt_name', 'a.cBusType as business_type','a.cPOID as order_number',DB::raw("CONVERT(varchar(10), a.dPODate, 120) as order_date"),'c.cVenName as supplier_title')
|
|
|
->orderBy('a.POID','desc');
|
|
|
|
|
|
$list = $this->limit($model,'',$data);
|
|
@@ -120,7 +120,7 @@ class U8ServerService extends Service
|
|
|
->leftJoin('Vendor as c', 'c.cVenCode', 'a.cVenCode')
|
|
|
// ->where('a.cMaker',$user['username'])
|
|
|
// ->where('a.iverifystateex',0)
|
|
|
- ->select('a.cMaker as crt_name', 'a.cBusType as business_type','a.cPOID as order_number','a.dPODate as order_date','c.cVenName as supplier_title','a.POID as id')
|
|
|
+ ->select('a.cMaker as crt_name', 'a.cBusType as business_type','a.cPOID as order_number',DB::raw("CONVERT(varchar(10), a.dPODate, 120) as order_date"),'c.cVenName as supplier_title','a.POID as id')
|
|
|
->first();
|
|
|
if(empty($order)) return [false, '采购单不存在'];
|
|
|
$order = $order->toArray();
|
|
@@ -138,7 +138,7 @@ class U8ServerService extends Service
|
|
|
|
|
|
public function paymentOrder($data, $user){
|
|
|
$qx = $user['qx'];
|
|
|
- $order_date = $data['order_date'] ?? [];
|
|
|
+ $order_date = array_filter($data['order_date']) ?? [];
|
|
|
$order_number = $data['order_number'] ?? [];
|
|
|
|
|
|
$model = $this->databaseService->table('AP_ApplyPayVouch as a')
|
|
@@ -155,7 +155,7 @@ class U8ServerService extends Service
|
|
|
return $query->whereBetween('a.dVouchDate', [$start, $end]);
|
|
|
})
|
|
|
->whereNull('a.cCheckMan')
|
|
|
- ->select('a.cOperator as crt_name', 'c.cVenName as supplier_title','a.cVouchID as order_number','a.dVouchDate as order_date')
|
|
|
+ ->select('a.cOperator as crt_name', 'c.cVenName as supplier_title','a.cVouchID as order_number',DB::raw("CONVERT(varchar(10), a.dVouchDate, 120) as order_date"))
|
|
|
->orderBy('a.PID','desc');
|
|
|
|
|
|
$list = $this->limit($model,'',$data);
|
|
@@ -170,7 +170,7 @@ class U8ServerService extends Service
|
|
|
->leftJoin('Vendor as c', 'c.cVenCode', 'a.cDwCode')
|
|
|
// ->where('a.cOperator',$user['username'])
|
|
|
// ->whereNull('a.cCheckMan')
|
|
|
- ->select('a.cOperator as crt_name', 'c.cVenName as supplier_title','a.cVouchID as order_number','a.dVouchDate as order_date','a.PID as id')
|
|
|
+ ->select('a.cOperator as crt_name', 'c.cVenName as supplier_title','a.cVouchID as order_number',DB::raw("CONVERT(varchar(10), a.dVouchDate, 120) as order_date"),'a.PID as id')
|
|
|
->first();
|
|
|
if(empty($order)) return [false, '付款单不存在'];
|
|
|
$order = $order->toArray();
|