|
|
@@ -492,7 +492,7 @@ class OrderSuperLoss extends Api
|
|
|
'a.Gy0_gdbh' => $order,
|
|
|
'a.Gy0_gxh' => ['in', $gxh_values]
|
|
|
])
|
|
|
- ->group('b.sczl_gxh, b.sczl_bh1, b.sczl_bh2, b.sczl_bh3, b.sczl_bh4, c.sczl_bh')
|
|
|
+ ->group('b.sczl_gxh, b.sczl_bh1, b.sczl_bh2, b.sczl_bh3, b.sczl_bh4,b.sczl_bh5,b.sczl_bh6,b.sczl_bh7,b.sczl_bh8,b.sczl_bh9,b.sczl_bh10, c.sczl_bh')
|
|
|
->order('a.Gy0_gxh, b.UniqId DESC, c.UniqId DESC')
|
|
|
->select();
|
|
|
foreach ($gy_data as $key=>$value){
|
|
|
@@ -554,7 +554,6 @@ class OrderSuperLoss extends Api
|
|
|
array_push($nameArr,$name);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
$gy_data[$key]['member'] = implode(' ',$nameArr);
|
|
|
unset($gy_data[$key]['Gy0_计划损耗']);
|
|
|
unset($gy_data[$key]['gxmc']);
|