|
|
@@ -307,7 +307,8 @@ class OrderIssue extends Model
|
|
|
->selectRaw('order_issues.* ,order_issue_on_tops.id top_id ,order_issue_on_tops.remark,order_issue_on_tops.updated_at top_update')
|
|
|
->leftJoin('order_issue_on_tops', 'order_issue_on_tops.order_issue_id', '=', 'order_issues.id')
|
|
|
->whereNull('order_issue_on_tops.deleted_at')
|
|
|
- ->orderBy('order_issue_on_tops.updated_at', 'desc');
|
|
|
+ ->orderBy('order_issue_on_tops.updated_at', 'desc')
|
|
|
+ ->orderBy('order_issues.id', 'desc');
|
|
|
}
|
|
|
|
|
|
public function scopeJsonWith($query)
|
|
|
@@ -320,8 +321,8 @@ class OrderIssue extends Model
|
|
|
$query->with(['shop', 'logistic', 'owner', 'packages.commodities.commodity.barcodes']);
|
|
|
},'orderIssueRejectedBills.rejectedBill'=>function($query){
|
|
|
$query->with(['owner','logistic','user','items.quality']);
|
|
|
- },'userWorkgroups'])
|
|
|
- ->orderBy('order_issues.id', 'desc');
|
|
|
+ },'userWorkgroups']);
|
|
|
+
|
|
|
}
|
|
|
|
|
|
public function userWorkgroups(): BelongsToMany
|
ajun