|
@@ -268,7 +268,10 @@ class U8ServerService extends Service
|
|
|
$end = date('Y-m-d 23:59:59.000', $order_date[1]);
|
|
$end = date('Y-m-d 23:59:59.000', $order_date[1]);
|
|
|
return $query->whereBetween('a.dDate', [$start, $end]);
|
|
return $query->whereBetween('a.dDate', [$start, $end]);
|
|
|
})
|
|
})
|
|
|
- ->whereNull('a.cHandler') // 未审核
|
|
|
|
|
|
|
+ ->where(function ($query) {
|
|
|
|
|
+ $query->whereNull('a.cHandler')
|
|
|
|
|
+ ->orWhere('a.cHandler', '');
|
|
|
|
|
+ })// 未审核
|
|
|
->select(
|
|
->select(
|
|
|
DB::raw("ISNULL(a.cCode, '') as order_number"), // 入库单号
|
|
DB::raw("ISNULL(a.cCode, '') as order_number"), // 入库单号
|
|
|
DB::raw("ISNULL(CONVERT(varchar(10), a.dDate, 120), '') as order_date"), // 入库日期
|
|
DB::raw("ISNULL(CONVERT(varchar(10), a.dDate, 120), '') as order_date"), // 入库日期
|
