|
@@ -447,7 +447,7 @@ class ScreenController extends BaseController
|
|
|
->where('crt_time',">=", $startOfDay)
|
|
|
->where('crt_time',"<=", $endOfDay)
|
|
|
->whereColumn('dispatch_quantity','>','finished_num')
|
|
|
- ->select('dispatch_no as order_no','process_id','product_title','dispatch_quantity as product_num','finished_num as finish_num')
|
|
|
+ ->select('dispatch_no as order_no','process_id','product_title','technology_name','dispatch_quantity as product_num','finished_num as finish_num')
|
|
|
->get()->toArray();
|
|
|
if(! empty($result)){
|
|
|
$process_id = array_unique(array_column($result,'process_id'));
|
|
@@ -456,6 +456,7 @@ class ScreenController extends BaseController
|
|
|
->toArray();
|
|
|
foreach ($result as $key => $value){
|
|
|
$result[$key]['procedure'] = $processMap[$value['process_id']] ?? '';
|
|
|
+ $result[$key]['product_title'] = $value['product_title'] . "(". $value['technology_name'] .")";
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -473,7 +474,7 @@ class ScreenController extends BaseController
|
|
|
$result = DispatchSub::where('del_time',0)
|
|
|
// ->where('dispatch_time_start',">=", $startOfDay)
|
|
|
->where('finished_num',0)
|
|
|
- ->select('dispatch_no as order_no','product_title','dispatch_quantity as product_num','process_id')
|
|
|
+ ->select('dispatch_no as order_no','product_title','technology_name','dispatch_quantity as product_num','process_id')
|
|
|
->orderBy('id','desc')
|
|
|
->limit(20)
|
|
|
->get()->toArray();
|
|
@@ -485,6 +486,7 @@ class ScreenController extends BaseController
|
|
|
->toArray();
|
|
|
foreach ($result as $key => $value){
|
|
|
$result[$key]['procedure'] = $processMap[$value['process_id']] ?? '';
|
|
|
+ $result[$key]['product_title'] = $value['product_title'] . "(". $value['technology_name'] .")";
|
|
|
}
|
|
|
}
|
|
|
|