|
|
@@ -2226,7 +2226,7 @@ class Facility extends Api
|
|
|
sczl_rate8,sczl_rate9,sczl_rate10,sczl_bh98,rtrim(UniqId) as UniqId';
|
|
|
$list = \db('设备_产量计酬')->where('UniqId',$param['UniqId'])->field($field)->find();
|
|
|
$pridata = \db('设备_装版工时')
|
|
|
- ->field('换版联拼数,换版类型')
|
|
|
+ ->field('换版联拼数,换版类型,Uniqid,coefficient')
|
|
|
->where('yieldUid',$param['UniqId'])
|
|
|
->order('Uniqid desc')
|
|
|
->find();
|
|
|
@@ -2235,9 +2235,12 @@ class Facility extends Api
|
|
|
}
|
|
|
$list['换版联拼数'] = '';
|
|
|
$list['换版类型'] = '';
|
|
|
+ $list['Uid'] = '';
|
|
|
if (!empty($pridata)){
|
|
|
$list['换版联拼数'] = $pridata['换版联拼数'];
|
|
|
$list['换版类型'] = $pridata['换版类型'];
|
|
|
+ $list['Uid'] = $pridata['Uniqid'];
|
|
|
+ $list['系数'] = $pridata['coefficient'];
|
|
|
}
|
|
|
$productName = \db('工单_基本资料')->whereIn('Gd_gdbh',$list['工单编号'])->field('rtrim(成品名称) as 成品名称,rtrim(Gd_cpmc) as cpmc')->find();
|
|
|
$list['印件名称'] = $productName['cpmc'];
|
