|
@@ -80,15 +80,15 @@ class TestController extends BaseController
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- public function test(){dd(1111);
|
|
|
|
|
|
|
+ public function test(){dd(1);
|
|
|
$dispatch = DispatchSub::where('del_time',0)
|
|
$dispatch = DispatchSub::where('del_time',0)
|
|
|
->where('finished_num', '>',0)
|
|
->where('finished_num', '>',0)
|
|
|
->where('process_id',14)
|
|
->where('process_id',14)
|
|
|
- ->select('finished_num','upd_time','device_id')
|
|
|
|
|
- ->orderBy('upd_time','asc')
|
|
|
|
|
|
|
+ ->select('finished_num','dispatch_time_start as upd_time','device_id')
|
|
|
|
|
+ ->orderBy('dispatch_time_start','asc')
|
|
|
->get()->toArray();
|
|
->get()->toArray();
|
|
|
foreach ($dispatch as $key => $value){
|
|
foreach ($dispatch as $key => $value){
|
|
|
- if(! $value['device_id']) $dispatch[$key]['device_id'] = 8;
|
|
|
|
|
|
|
+ if(! $value['device_id']) $dispatch[$key]['device_id'] = 12;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 生成数据
|
|
// 生成数据
|
|
@@ -125,7 +125,7 @@ class FeederDataGenerator
|
|
|
{
|
|
{
|
|
|
// 首先按设备和日期分组汇总产量
|
|
// 首先按设备和日期分组汇总产量
|
|
|
$this->processRawData($rawData);
|
|
$this->processRawData($rawData);
|
|
|
-//dd($this->devices);
|
|
|
|
|
|
|
+dd($this->devices);
|
|
|
// 为每个设备生成运行明细
|
|
// 为每个设备生成运行明细
|
|
|
$result = [];
|
|
$result = [];
|
|
|
foreach ($this->devices as $deviceId => $deviceData) {
|
|
foreach ($this->devices as $deviceId => $deviceData) {
|
cqp