cqp 1 hónapja
szülő
commit
30bcbd7cd9
1 módosított fájl, 2 hozzáadás és 1 törlés
  1. 2 1
      app/Service/FinishedOrderService.php

+ 2 - 1
app/Service/FinishedOrderService.php

@@ -1493,8 +1493,9 @@ class FinishedOrderService extends Service
             ->leftjoin("report_working as c",'a.report_working_id', 'c.id')
             ->where("a.del_time", 0)
             ->where('b.del_time', 0)
+            ->where('c.del_time', 0)
             ->select('a.quantity as finished_num','b.id','b.order_no','b.table_header_mark','b.product_no','b.product_title','b.product_size','b.product_unit','b.dispatch_quantity','b.technology_material','b.technology_name','b.wood_name','b.process_mark','b.table_body_mark','b.dispatch_no','b.crt_id','b.process_id','b.dispatch_time_start','b.dispatch_time_end','a.crt_time','b.customer_name','b.order_product_id','b.out_order_no','b.team_id','b.device_id','b.wg_status','b.status','b.type','c.order_number')
-            ->orderBy('b.id','desc');
+            ->orderBy('a.id','desc');
 
         if(isset($data['type'])) $model->where('b.type', $data['type']);
         if(isset($data['status'])) $model->where('b.status', $data['status']);