|
|
@@ -2158,9 +2158,13 @@ class WorkOrder extends Api
|
|
|
// ->where('成品代号',$param['productCode'])
|
|
|
->field('行号,Gd_cpdh')
|
|
|
->select();
|
|
|
+ $cpdhList = \db('工单_基本资料')
|
|
|
+ ->where('Gd_gdbh',$param['workorder'])
|
|
|
+ ->column('Gd_cpdh');
|
|
|
//引用印件资料
|
|
|
$PrintList = \db('产品_印件资料')
|
|
|
->where('yj_cpdh',$param['productCode'])
|
|
|
+ ->whereIn('yj_yjdh',$cpdhList)
|
|
|
->where($priWhere)
|
|
|
->select();
|
|
|
if (empty($PrintList)){
|
|
|
@@ -2201,9 +2205,13 @@ class WorkOrder extends Api
|
|
|
'Gy0_方案' => $param['option'],
|
|
|
'Gy0_cpdh' => $param['productCode']
|
|
|
];
|
|
|
+ $yjnolist = \db('工单_基本资料')
|
|
|
+ ->where('Gd_gdbh',$param['workorder'])
|
|
|
+ ->column('行号');
|
|
|
$ProcessList = \db('产品_工艺资料')
|
|
|
->where($processWhere)
|
|
|
->where($proWhere)
|
|
|
+ ->whereIn('Gy0_yjno',$yjnolist)
|
|
|
->order('Gy0_yjno,Gy0_gxh')
|
|
|
->select();
|
|
|
if (empty($ProcessList)){
|
