|
@@ -302,8 +302,8 @@ class ScreenController extends BaseController
|
|
|
$process = Process::where('del_time',0)->get()->toArray();
|
|
|
|
|
|
$list = DispatchSub::where('del_time',0)
|
|
|
- ->where('finished_num','>=',0)
|
|
|
- ->select('crt_time','finished_num')
|
|
|
+ ->where('dispatch_quantity','>=',0)
|
|
|
+ ->select('crt_time','dispatch_quantity')
|
|
|
->orderBy('id','desc')
|
|
|
->limit(20)
|
|
|
->get()->toArray();
|
|
@@ -312,10 +312,10 @@ class ScreenController extends BaseController
|
|
|
foreach ($list as $value){
|
|
|
$date = date("Ymd",$value['crt_time']);
|
|
|
if(isset($return[$date])){
|
|
|
- $num = bcadd($value['finished_num'], $return[$date],3);
|
|
|
+ $num = bcadd($value['dispatch_quantity'], $return[$date],3);
|
|
|
$return[$date] = $num;
|
|
|
}else{
|
|
|
- $return[$date] = $value['finished_num'];
|
|
|
+ $return[$date] = $value['dispatch_quantity'];
|
|
|
}
|
|
|
}
|
|
|
|