超节损显示

application/api/controller/OrderSuperLoss.php

@@ -141,6 +141,7 @@ class OrderSuperLoss extends Api
                     ->field('DISTINCT(a.jjcp_gdbh) as Gd_gdbh,a.jjcp_yjno,rtrim(a.成品编码) as 成品编码,rtrim(a.成品名称) as 成品名称,a.jjcp_sj,a.jjcp_smb,b.计量单位,
                 b.Gd_khdh, b.实际投料,c.yj_Yjno, c.yj_ls')
                     ->order('b.Gd_khdh,a.成品编码 asc,a.jjcp_sj desc')
+                    ->group('a.jjcp_gdbh,a.jjcp_yjno')
                     ->page($pages)
                     ->limit($limit)
                     ->select();
@@ -169,7 +170,7 @@ class OrderSuperLoss extends Api
             }
             foreach ($data as $key => $value){
                 //查出成品数量及日期
-                $cp_sql = "SELECT SUM(jjcp_sl) as cp_sl,MAX(jjcp_sj) as jjcp_sj FROM `成品入仓` WHERE jjcp_gdbh = '{$value['Gd_gdbh']}' GROUP BY jjcp_gdbh";
+                $cp_sql = "SELECT SUM(jjcp_sl) as cp_sl,MAX(jjcp_sj) as jjcp_sj FROM `成品入仓` WHERE jjcp_gdbh = '{$value['Gd_gdbh']}' GROUP BY jjcp_gdbh,jjcp_yjno";
                 $cp_data = Db::query($cp_sql);
                 $data[$key]['warehousing_num'] = $cp_data[0]['cp_sl'];
                 $data[$key]['warehousing_date'] = substr($cp_data[0]['jjcp_sj'],0,10);