|
|
@@ -139,27 +139,42 @@ class Decision extends Api
|
|
|
*/
|
|
|
public function MachineProductDetail()
|
|
|
{
|
|
|
- if ($this->request->isGet() === false){
|
|
|
+ if (!$this->request->isGet()) {
|
|
|
$this->error('请求错误');
|
|
|
}
|
|
|
+
|
|
|
$param = $this->request->param();
|
|
|
- if (empty($param['mouth'])){
|
|
|
+
|
|
|
+ // 检查必需的参数
|
|
|
+ if (empty($param['mouth'])) {
|
|
|
$this->error('参数错误');
|
|
|
}
|
|
|
- if (isset($param['machine']) && !empty($param['machine'])){
|
|
|
+
|
|
|
+ // Initializing where conditions
|
|
|
+ $where = [];
|
|
|
+
|
|
|
+ // 添加可选的查询条件
|
|
|
+ if (!empty($param['machine'])) {
|
|
|
$where['a.sczl_jtbh'] = $param['machine'];
|
|
|
}
|
|
|
- if (isset($param['team']) && !empty($param['team'])){
|
|
|
- $where['a.sczl_bzdh'] = ['like',substr($param['team'],0,1).'%'];
|
|
|
+
|
|
|
+ if (!empty($param['team'])) {
|
|
|
+ $where['a.sczl_bzdh'] = ['like', substr($param['team'], 0, 1) . '%'];
|
|
|
}
|
|
|
- //将参数装换成标准日期格式
|
|
|
+
|
|
|
+ // 将参数转换成标准日期格式
|
|
|
$mouth = date_create_from_format('Ym', $param['mouth'])->format('Y-m');
|
|
|
- $where['a.sczl_rq'] = ['like',$mouth.'%'];
|
|
|
-// $team = substr($param['team'],0,1);
|
|
|
+ $where['a.sczl_rq'] = ['like', $mouth . '%'];
|
|
|
+
|
|
|
+ // 分页配置
|
|
|
+ $page = !empty($param['page']) ? (int)$param['page'] : 1;
|
|
|
+ $limit = !empty($param['limit']) ? (int)$param['limit'] : 9999; // 默认查询所有
|
|
|
+
|
|
|
+ // 查询数据
|
|
|
$list = \db('设备_产量计酬')
|
|
|
->alias('a')
|
|
|
- ->join('工单_印件资料 c','a.sczl_gdbh = c.Yj_Gdbh AND a.sczl_yjno = c.yj_Yjno')
|
|
|
- ->join('工单_工艺资料 d','a.sczl_gdbh = d.Gy0_gdbh AND a.sczl_yjno = d.Gy0_yjno AND a.sczl_gxh = d.Gy0_gxh')
|
|
|
+ ->join('工单_印件资料 c', 'a.sczl_gdbh = c.Yj_Gdbh AND a.sczl_yjno = c.yj_Yjno')
|
|
|
+ ->join('工单_工艺资料 d', 'a.sczl_gdbh = d.Gy0_gdbh AND a.sczl_yjno = d.Gy0_yjno AND a.sczl_gxh = d.Gy0_gxh')
|
|
|
->field([
|
|
|
'a.sczl_gdbh' => '工单编号',
|
|
|
'a.sczl_yjno' => '印件号',
|
|
|
@@ -175,25 +190,32 @@ class Decision extends Api
|
|
|
'rtrim(d.版距)' => '版距'
|
|
|
])
|
|
|
->where($where)
|
|
|
- ->group('a.sczl_gdbh,a.sczl_yjno,a.sczl_gxh,a.sczl_rq,a.sczl_jtbh,a.sczl_bzdh')
|
|
|
+ ->group('a.sczl_gdbh, a.sczl_yjno, a.sczl_gxh, a.sczl_rq, a.sczl_jtbh, a.sczl_bzdh')
|
|
|
->order('工作日期')
|
|
|
+ ->page($page, $limit) // 使用 page 和 limit 实现分页
|
|
|
->select();
|
|
|
- if (!empty($list)){
|
|
|
- foreach ($list as $key=>$value){
|
|
|
- $list[$key]['印件名称'] = $value['印件号'].'-'.$value['印件名称'];
|
|
|
- $list[$key]['工序名称'] = $value['工序号'].'-'.$value['工序名称'];
|
|
|
- unset($list[$key]['印件号'],$list[$key]['工序号']);
|
|
|
- if ($value['印刷方式'] === '卷对卷'){
|
|
|
- $list[$key]['产量'] = round($value['产量']/$value['版距']*1000);
|
|
|
+
|
|
|
+ // 数据处理
|
|
|
+ if (!empty($list)) {
|
|
|
+ foreach ($list as $key => $value) {
|
|
|
+ $list[$key]['印件名称'] = $value['印件号'] . '-' . $value['印件名称'];
|
|
|
+ $list[$key]['工序名称'] = $value['工序号'] . '-' . $value['工序名称'];
|
|
|
+ unset($list[$key]['印件号'], $list[$key]['工序号']);
|
|
|
+
|
|
|
+ // 产量计算
|
|
|
+ if ($value['印刷方式'] === '卷对卷') {
|
|
|
+ $list[$key]['产量'] = round($value['产量'] / $value['版距'] * 1000);
|
|
|
}
|
|
|
- if ($value['墨色数'] === '0.00'){
|
|
|
+
|
|
|
+ // 墨色数修正
|
|
|
+ if ($value['墨色数'] === '0.00') {
|
|
|
$list[$key]['墨色数'] = '1.00';
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- $this->success('成功',$list);
|
|
|
- }
|
|
|
|
|
|
+ $this->success('成功', $list);
|
|
|
+ }
|
|
|
/**
|
|
|
* 月度机台运行工时汇总
|
|
|
* @return void
|
|
|
@@ -268,24 +290,37 @@ class Decision extends Api
|
|
|
*/
|
|
|
public function MachineOperationProductDetail()
|
|
|
{
|
|
|
- if ($this->request->isGet() === false){
|
|
|
+ if (!$this->request->isGet()) {
|
|
|
$this->error('请求错误');
|
|
|
}
|
|
|
+
|
|
|
$param = $this->request->param();
|
|
|
- if (empty($param['mouth'])){
|
|
|
+
|
|
|
+ if (empty($param['mouth'])) {
|
|
|
$this->error('参数错误');
|
|
|
}
|
|
|
- if (isset($param['machine']) && !empty($param['machine'])){
|
|
|
+
|
|
|
+ // Initialize where conditions
|
|
|
+ $where = [];
|
|
|
+
|
|
|
+ if (!empty($param['machine'])) {
|
|
|
$where['a.sczl_jtbh'] = $param['machine'];
|
|
|
}
|
|
|
- //将参数装换成标准日期格式
|
|
|
+
|
|
|
+ // 将参数转换成标准日期格式
|
|
|
$mouth = date_create_from_format('Ym', $param['mouth'])->format('Y-m');
|
|
|
- $where['a.sczl_rq'] = ['like',$mouth.'%'];
|
|
|
+ $where['a.sczl_rq'] = ['like', $mouth . '%'];
|
|
|
+
|
|
|
+ // 分页配置
|
|
|
+ $page = !empty($param['page']) ? (int)$param['page'] : 1;
|
|
|
+ $limit = !empty($param['limit']) ? (int)$param['limit'] : 9999; // 默认查询所有
|
|
|
+
|
|
|
+ // 查询数据
|
|
|
$list = \db('设备_产量计酬')
|
|
|
->alias('a')
|
|
|
- ->join('设备_基本资料 b','a.sczl_jtbh = b.设备编号')
|
|
|
- ->join('工单_印件资料 c','a.sczl_gdbh = c.Yj_Gdbh AND a.sczl_yjno = c.yj_Yjno')
|
|
|
- ->join('工单_工艺资料 d','a.sczl_gdbh = d.Gy0_gdbh AND a.sczl_yjno = d.Gy0_yjno AND a.sczl_gxh = d.Gy0_gxh')
|
|
|
+ ->join('设备_基本资料 b', 'a.sczl_jtbh = b.设备编号')
|
|
|
+ ->join('工单_印件资料 c', 'a.sczl_gdbh = c.Yj_Gdbh AND a.sczl_yjno = c.yj_Yjno')
|
|
|
+ ->join('工单_工艺资料 d', 'a.sczl_gdbh = d.Gy0_gdbh AND a.sczl_yjno = d.Gy0_yjno AND a.sczl_gxh = d.Gy0_gxh')
|
|
|
->field([
|
|
|
'a.sczl_jtbh' => '设备编号',
|
|
|
'rtrim(b.设备名称)' => '设备名称',
|
|
|
@@ -294,7 +329,7 @@ class Decision extends Api
|
|
|
'a.sczl_yjno' => '印件号',
|
|
|
'a.sczl_gxh' => '工序号',
|
|
|
'c.yj_yjmc' => '印件名称',
|
|
|
- 'CONCAT(d.Gy0_gxmc,"(",d.Add_gxmc,")")' => '工序名称',
|
|
|
+ 'CONCAT(d.Gy0_gxmc, "(", d.Add_gxmc, ")")' => '工序名称',
|
|
|
'SUM(a.sczl_cl)' => '产量',
|
|
|
'SUM(a.sczl_设备运行工时)' => '设备运行工时',
|
|
|
'SUM(a.sczl_保养工时)' => '保养工时',
|
|
|
@@ -308,24 +343,33 @@ class Decision extends Api
|
|
|
'rtrim(d.版距)' => '版距'
|
|
|
])
|
|
|
->where($where)
|
|
|
- ->group('a.sczl_rq,a.sczl_gdbh,a.sczl_rq,a.sczl_jtbh')
|
|
|
+ ->group('a.sczl_rq, a.sczl_gdbh, a.sczl_gxh, a.sczl_jtbh')
|
|
|
->order('a.sczl_rq')
|
|
|
+ ->page($page, $limit) // 使用 page 和 limit 技术实现分页
|
|
|
->select();
|
|
|
- if (!empty($list)){
|
|
|
- foreach ($list as $key=>$value){
|
|
|
- $list[$key]['工序名称'] = $value['印件号'].'-'.$value['工序号'].'-'.$value['工序名称'];
|
|
|
- unset($list[$key]['印件号'],$list[$key]['工序号']);
|
|
|
- if ($value['印刷方式'] === '卷对卷'){
|
|
|
- $list[$key]['产量'] = round($value['产量']/$value['版距']*1000);
|
|
|
+
|
|
|
+ // 数据处理
|
|
|
+ if (!empty($list)) {
|
|
|
+ foreach ($list as $key => $value) {
|
|
|
+ $list[$key]['工序名称'] = $value['印件号'] . '-' . $value['工序号'] . '-' . $value['工序名称'];
|
|
|
+
|
|
|
+ // 移除不需要的字段
|
|
|
+ unset($list[$key]['印件号'], $list[$key]['工序号']);
|
|
|
+
|
|
|
+ // 产量计算
|
|
|
+ if ($value['印刷方式'] === '卷对卷') {
|
|
|
+ $list[$key]['产量'] = round($value['产量'] / $value['版距'] * 1000);
|
|
|
}
|
|
|
- if ($value['墨色数'] === '0.00'){
|
|
|
+
|
|
|
+ // 墨色数修正
|
|
|
+ if ($value['墨色数'] === '0.00') {
|
|
|
$list[$key]['墨色数'] = '1.00';
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- $this->success('成功',$list);
|
|
|
- }
|
|
|
|
|
|
+ $this->success('成功', $list);
|
|
|
+ }
|
|
|
|
|
|
/**
|
|
|
* 工序产出率月度统计报表
|