|
@@ -148,10 +148,15 @@ class ProductionLot extends Api
|
|
|
->where('a.sczl_num',$param['num'])
|
|
->where('a.sczl_num',$param['num'])
|
|
|
->order('工序号,生产日期')
|
|
->order('工序号,生产日期')
|
|
|
->select();
|
|
->select();
|
|
|
|
|
+ $total = count($list);
|
|
|
|
|
+ $data = [
|
|
|
|
|
+ 'data' => $list,
|
|
|
|
|
+ 'total' => $total
|
|
|
|
|
+ ];
|
|
|
if (empty($list)){
|
|
if (empty($list)){
|
|
|
$this->success('未找到该流程单的工艺数据');
|
|
$this->success('未找到该流程单的工艺数据');
|
|
|
}else{
|
|
}else{
|
|
|
- $this->success('成功',$list);
|
|
|
|
|
|
|
+ $this->success('成功',$data);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -179,10 +184,15 @@ class ProductionLot extends Api
|
|
|
->where('类别', 'neq', '现场巡查记录')
|
|
->where('类别', 'neq', '现场巡查记录')
|
|
|
->order('流程单号')
|
|
->order('流程单号')
|
|
|
->select();
|
|
->select();
|
|
|
|
|
+ $total = count($list);
|
|
|
|
|
+ $data = [
|
|
|
|
|
+ 'data' => $list,
|
|
|
|
|
+ 'total' => $total
|
|
|
|
|
+ ];
|
|
|
if (empty($list)){
|
|
if (empty($list)){
|
|
|
$this->error('未找到制程检验记录');
|
|
$this->error('未找到制程检验记录');
|
|
|
}
|
|
}
|
|
|
- $this->success('成功',$list);
|
|
|
|
|
|
|
+ $this->success('成功',$data);
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -216,7 +226,12 @@ class ProductionLot extends Api
|
|
|
$list[$key]['数量'] = '';
|
|
$list[$key]['数量'] = '';
|
|
|
$list[$key]['用户'] = '';
|
|
$list[$key]['用户'] = '';
|
|
|
}
|
|
}
|
|
|
- $this->success('成功',$list);
|
|
|
|
|
|
|
+ $total = count($list);
|
|
|
|
|
+ $data = [
|
|
|
|
|
+ 'data' => $list,
|
|
|
|
|
+ 'total' => $total
|
|
|
|
|
+ ];
|
|
|
|
|
+ $this->success('成功',$data);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@@ -340,7 +355,11 @@ class ProductionLot extends Api
|
|
|
}
|
|
}
|
|
|
$data[] = $baseData;
|
|
$data[] = $baseData;
|
|
|
}
|
|
}
|
|
|
- $this->success('成功',$data);
|
|
|
|
|
|
|
+ $result = [
|
|
|
|
|
+ 'data' => $data,
|
|
|
|
|
+ 'total' => count($data),
|
|
|
|
|
+ ];
|
|
|
|
|
+ $this->success('成功',$result);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -458,7 +477,10 @@ class ProductionLot extends Api
|
|
|
usort($data, function($a, $b) {
|
|
usort($data, function($a, $b) {
|
|
|
return strcmp($a['流程单号'] ?? '', $b['流程单号'] ?? '');
|
|
return strcmp($a['流程单号'] ?? '', $b['流程单号'] ?? '');
|
|
|
});
|
|
});
|
|
|
-
|
|
|
|
|
- $this->success('成功', $data);
|
|
|
|
|
|
|
+ $result = [
|
|
|
|
|
+ 'data' => $data,
|
|
|
|
|
+ 'total' => count($data),
|
|
|
|
|
+ ];
|
|
|
|
|
+ $this->success('成功', $result);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|