|
@@ -777,15 +777,24 @@ class Product extends Api
|
|
|
->join('物料_存货编码 c','a.存货编码 = c.物料代码','left')
|
|
->join('物料_存货编码 c','a.存货编码 = c.物料代码','left')
|
|
|
->where('a.UniqID',$params['UniqID'])->field($field)->order('存货编码')->find();
|
|
->where('a.UniqID',$params['UniqID'])->field($field)->order('存货编码')->find();
|
|
|
$where['Gy0_site'] = [
|
|
$where['Gy0_site'] = [
|
|
|
- ['like','%胶印%'],
|
|
|
|
|
- ['like','%烫模%'],
|
|
|
|
|
|
|
+ ['like','胶印%'],
|
|
|
|
|
+ ['like','烫模%'],
|
|
|
'or'
|
|
'or'
|
|
|
];
|
|
];
|
|
|
$option['Gy0_cpdh'] = $data['YB_cpdh'];
|
|
$option['Gy0_cpdh'] = $data['YB_cpdh'];
|
|
|
$option['Gy0_gxh'] = ['<',10];
|
|
$option['Gy0_gxh'] = ['<',10];
|
|
|
$option['Gy0_sbbh'] = ['neq',''];
|
|
$option['Gy0_sbbh'] = ['neq',''];
|
|
|
- $gyData = \db('产品_工艺资料')->where($option)->where($where)->field('Gy0_方案,Gy0_yjno,Gy0_gxh,gy0_gxmc')->order('Gy0_yjno,Gy0_gxh')->select();
|
|
|
|
|
- halt($gyData);
|
|
|
|
|
|
|
+ $gyData = \db('产品_工艺资料')->where($option)->where($where)
|
|
|
|
|
+ ->field('rtrim(Gy0_方案) as Gy0_方案,Gy0_yjno,Gy0_gxh,rtrim(gy0_gxmc) as gy0_gxmc,rtrim(Add_gxmc) as Add_gxmc')
|
|
|
|
|
+ ->order('Gy0_yjno,Gy0_gxh')->select();
|
|
|
|
|
+ $list = [];
|
|
|
|
|
+ foreach ($gyData as $key=>$value){
|
|
|
|
|
+ $yjno = $value['Gy0_yjno'] > 10 ? $value['Gy0_yjno'] : '0'.$value['Gy0_yjno'];
|
|
|
|
|
+ $gxh = $value['Gy0_gxh'] > 10 ? $value['Gy0_gxh'] : '0'.$value['Gy0_gxh'];
|
|
|
|
|
+ $list[$key]['gy'] = $value['Gy0_方案'].'-->'.$yjno.'-'.$gxh.' '.$value['gy0_gxmc'];
|
|
|
|
|
+ $list[$key]['gxmc'] = $value['Add_gxmc'];
|
|
|
|
|
+ }
|
|
|
|
|
+ $data['gy_data'] = $list;
|
|
|
$this->success('请求成功',$data);
|
|
$this->success('请求成功',$data);
|
|
|
}
|
|
}
|
|
|
/**
|
|
/**
|