|
|
@@ -706,9 +706,34 @@ class WorkOrderVerification extends Api
|
|
|
$total = db('设备_产量计酬')->where('sczl_gdbh',$params['order'])->order('sczl_num')->column('distinct(sczl_num)');
|
|
|
$where['sczl_gxh'] = (int)$params['gxNo'];
|
|
|
$where['sczl_gdbh'] = $params['order'];
|
|
|
+ //机器设备数据
|
|
|
$process = db('设备_产量计酬')->where($where)->order('sczl_num')->column('distinct(sczl_num)');
|
|
|
+ //手工数据
|
|
|
+ $option['qczl_gdbh'] = $params['order'];
|
|
|
+ $option['qczl_gxh'] = (int)$params['gxNo'];
|
|
|
+ $handProcess = db('db_qczl')->where($option)->field('qczl_num,qczl_NumDesc1,qczl_NumDesc2,qczl_NumDesc3,qczl_NumDesc4,qczl_NumDesc5,qczl_NumDesc6,qczl_NumDesc7,qczl_NumDesc8')->select();
|
|
|
+ // 提取数据
|
|
|
+ $result = array();
|
|
|
+ foreach ($handProcess as $subArray) {
|
|
|
+ $qczl_num = $subArray["qczl_num"];
|
|
|
+ $result[] = $qczl_num;
|
|
|
+ // 提取以qczl_NumDesc开头的键对应的值
|
|
|
+ for ($i = 1; $i <= 8; $i++) {
|
|
|
+ $key = "qczl_NumDesc" . $i;
|
|
|
+ if ($subArray[$key] != 0){
|
|
|
+ $result[] = $subArray[$key];
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ // 去重
|
|
|
+ $result = array_unique($result);
|
|
|
+ // 对结果进行排序
|
|
|
+ sort($result);
|
|
|
$res['total_process'] = $total;
|
|
|
$res['process'] = $process;
|
|
|
+ if (empty($process)){
|
|
|
+ $res['process'] = $result;
|
|
|
+ }
|
|
|
$this->success('请求成功',$res);
|
|
|
}
|
|
|
/**
|