|
|
@@ -95,6 +95,7 @@ class ScrappService extends Service
|
|
|
public function zjList($data, $user){
|
|
|
$model = ScrappCount::where('del_time',0)
|
|
|
->select('id','dispatch_sub_id','crt_time','team_id','finished_id','equipment_id','order_number','process_id','sale_orders_product_id')
|
|
|
+ ->orderBy('dispatch_sub_id','desc')
|
|
|
->groupBy('order_number');
|
|
|
|
|
|
if(! empty($data['order_number'])) {
|
|
|
@@ -246,6 +247,7 @@ class ScrappService extends Service
|
|
|
public function blpList($data, $user){
|
|
|
$model = ScrappCount::where('del_time',0)
|
|
|
->select('id','dispatch_sub_id','crt_time','team_id','finished_id','equipment_id','order_number','process_id','sale_orders_product_id')
|
|
|
+ ->orderBy('dispatch_sub_id','desc')
|
|
|
->groupBy('order_number');
|
|
|
|
|
|
if(! empty($data['order_number'])) {
|
cqp