|
@@ -223,13 +223,11 @@ class Manufacture extends Api
|
|
|
'rtrim(a.Uniqid)' => 'GDUID',
|
|
'rtrim(a.Uniqid)' => 'GDUID',
|
|
|
])
|
|
])
|
|
|
->join('工单_工艺资料 b', 'a.Gd_gdbh = b.Gy0_gdbh')
|
|
->join('工单_工艺资料 b', 'a.Gd_gdbh = b.Gy0_gdbh')
|
|
|
- ->join('产品_基本资料 c', 'a.Gd_cpdh = c.产品编号')
|
|
|
|
|
->where([
|
|
->where([
|
|
|
'a.gd_statu' => '2-生产中',
|
|
'a.gd_statu' => '2-生产中',
|
|
|
'a.行号' => '1',
|
|
'a.行号' => '1',
|
|
|
'b.PD_WG' => '1900-01-01 00:00:00',
|
|
'b.PD_WG' => '1900-01-01 00:00:00',
|
|
|
'b.Gy0_sj1' => ['<>', '1900-01-01 00:00:00'],
|
|
'b.Gy0_sj1' => ['<>', '1900-01-01 00:00:00'],
|
|
|
- 'c.状态' => '',
|
|
|
|
|
])
|
|
])
|
|
|
->where($where)
|
|
->where($where)
|
|
|
->group('a.Gd_gdbh')
|
|
->group('a.Gd_gdbh')
|
|
@@ -813,7 +811,7 @@ class Manufacture extends Api
|
|
|
'b.PD_WG' => '1900-01-01 00:00:00',
|
|
'b.PD_WG' => '1900-01-01 00:00:00',
|
|
|
])
|
|
])
|
|
|
->where($where)
|
|
->where($where)
|
|
|
- ->group('a.Gd_gdbh,b.Gy0_gxh')
|
|
|
|
|
|
|
+ ->group('a.Gd_gdbh,b.Gy0_yjno,b.Gy0_gxh')
|
|
|
->order('Gy0_sj1')
|
|
->order('Gy0_sj1')
|
|
|
->select();
|
|
->select();
|
|
|
if (empty($list)){
|
|
if (empty($list)){
|
