|
|
@@ -164,12 +164,14 @@ class ProcessDocument extends Api
|
|
|
}
|
|
|
$str = '原纸';
|
|
|
$where = [
|
|
|
- 'Gd_gdbh'=> $data['order'],
|
|
|
- 'Gd_cpmc'=> $data['yjmc']
|
|
|
+ 'a.Gd_gdbh'=> $data['order'],
|
|
|
+ 'b.yj_yjmc'=> $data['yjmc']
|
|
|
];
|
|
|
- $field = 'Gd_gdbh,rtrim(销售订单号) as 销售订单号,rtrim(Gd_cpmc) as Gd_cpmc,rtrim(成品名称) as 成品名称,计划投料,实际投料,rtrim(产品版本号) as 产品版本号,rtrim(警语版面) as 警语版面,
|
|
|
- rtrim(Gd_desc) as Gd_desc';
|
|
|
+ $field = 'a.Gd_gdbh,rtrim(a.销售订单号) as 销售订单号,rtrim(a.Gd_cpmc) as Gd_cpmc,rtrim(a.成品名称) as 成品名称,a.计划投料,a.实际投料,rtrim(a.产品版本号) as 产品版本号,rtrim(a.警语版面) as 警语版面,
|
|
|
+ rtrim(a.Gd_desc) as Gd_desc';
|
|
|
$gdinfo = db('工单_基本资料')
|
|
|
+ ->alias('a')
|
|
|
+ ->join('工单_印件资料 b','a.Gd_gdbh = b.Yj_Gdbh AND a.Gd_cpdh = b.yj_Yjdh')
|
|
|
->where($where)
|
|
|
->field($field)
|
|
|
->select();
|
