|
|
@@ -1317,12 +1317,27 @@ class ReportFormsService extends Service
|
|
|
foreach ($dispatch_data as $value){
|
|
|
$dispatch_data_map[$value['sale_orders_product_id']][] = $value;
|
|
|
}
|
|
|
+ $num = ScrappCount::where('del_time',0)
|
|
|
+ ->whereIn('sale_orders_product_id',$sale_orders_product_id)
|
|
|
+ ->select(DB::raw('sum(quantity) as quantity'),DB::raw('sum(scrapp_num) as waste_num'),'process_id','sale_orders_product_id')
|
|
|
+ ->groupBy('sale_orders_product_id', 'process_id')
|
|
|
+ ->orderBy('sale_orders_product_id','desc')
|
|
|
+ ->get()->toArray();
|
|
|
+ $scrapp_map = [];
|
|
|
+ foreach ($num as $value){
|
|
|
+ $tmp = bcadd($value['quantity'], $value['waste_num'],3);
|
|
|
+ $scrapp_map[$value['sale_orders_product_id'] . $value['process_id']] = $tmp;
|
|
|
+ }
|
|
|
$process = Process::where('del_time',0)->pluck('title','id')->toArray();
|
|
|
|
|
|
foreach ($list['data'] as $key => $value){
|
|
|
$tmp = $dispatch_data_map[$value['id']] ?? [];
|
|
|
foreach ($tmp as $k => $v){
|
|
|
+ $num = 0;
|
|
|
+ if(isset($scrapp_map[$v['sale_orders_product_id'] . $v['process_id']])) $num = $scrapp_map[$v['sale_orders_product_id'] . $v['process_id']];
|
|
|
$tmp[$k]['process_title'] = $process[$v['process_id']] ?? "";
|
|
|
+ $tmp[$k]['bg_num'] = $num;
|
|
|
+ $tmp[$k]['zj_num'] = $num;
|
|
|
}
|
|
|
$list['data'][$key]['mul_data'] = $tmp;
|
|
|
}
|
cqp