|
@@ -51,7 +51,7 @@ class U8ServerService extends Service
|
|
|
->leftJoin('Person as e', 'e.cPersonCode', 'a.cPersonCode')// 业务员
|
|
->leftJoin('Person as e', 'e.cPersonCode', 'a.cPersonCode')// 业务员
|
|
|
->leftJoin('PurchaseType as f', 'f.cPTCode', 'a.cPTCode') // 采购类型
|
|
->leftJoin('PurchaseType as f', 'f.cPTCode', 'a.cPTCode') // 采购类型
|
|
|
->when(empty($qx), function ($query) use($user){
|
|
->when(empty($qx), function ($query) use($user){
|
|
|
- return $query->where('a.cMaker', $user['username']);
|
|
|
|
|
|
|
+ return $query->where('a.cMaker', $user['name']);
|
|
|
})
|
|
})
|
|
|
->when(!empty($order_number), function ($query) use($order_number){
|
|
->when(!empty($order_number), function ($query) use($order_number){
|
|
|
return $query->where('a.cPOID', 'LIKE', '%'.$order_number.'%');
|
|
return $query->where('a.cPOID', 'LIKE', '%'.$order_number.'%');
|
|
@@ -161,7 +161,7 @@ class U8ServerService extends Service
|
|
|
->leftJoin('Department as d', 'd.cDepCode', 'a.cDepCode') // 请购部门
|
|
->leftJoin('Department as d', 'd.cDepCode', 'a.cDepCode') // 请购部门
|
|
|
->leftJoin('PurchaseType as f', 'f.cPTCode', 'a.cPTCode') // 采购类型
|
|
->leftJoin('PurchaseType as f', 'f.cPTCode', 'a.cPTCode') // 采购类型
|
|
|
->when(empty($qx), function ($query) use($user){
|
|
->when(empty($qx), function ($query) use($user){
|
|
|
- return $query->where('a.cMaker',$user['username']);
|
|
|
|
|
|
|
+ return $query->where('a.cMaker',$user['name']);
|
|
|
})
|
|
})
|
|
|
->when(! empty($order_number), function ($query) use($order_number){
|
|
->when(! empty($order_number), function ($query) use($order_number){
|
|
|
return $query->where('a.cCode','LIKE', '%'.$order_number.'%');
|
|
return $query->where('a.cCode','LIKE', '%'.$order_number.'%');
|
|
@@ -258,7 +258,7 @@ class U8ServerService extends Service
|
|
|
->leftJoin('PurchaseType as pt', 'pt.cPTCode', 'a.cPTCode')// 采购类型
|
|
->leftJoin('PurchaseType as pt', 'pt.cPTCode', 'a.cPTCode')// 采购类型
|
|
|
->leftJoin('Rd_Style as rs', 'rs.cRdCode', 'a.cRdCode') // 入库类别
|
|
->leftJoin('Rd_Style as rs', 'rs.cRdCode', 'a.cRdCode') // 入库类别
|
|
|
->when(empty($qx), function ($query) use($user){
|
|
->when(empty($qx), function ($query) use($user){
|
|
|
- return $query->where('a.cMaker',$user['username']);
|
|
|
|
|
|
|
+ return $query->where('a.cMaker',$user['name']);
|
|
|
})
|
|
})
|
|
|
->when(! empty($order_number), function ($query) use($order_number){
|
|
->when(! empty($order_number), function ($query) use($order_number){
|
|
|
return $query->where('a.cCode','LIKE', '%'.$order_number.'%');
|
|
return $query->where('a.cCode','LIKE', '%'.$order_number.'%');
|