实际投料计算

application/api/controller/OrderSuperLoss.php

@@ -141,8 +141,8 @@ class OrderSuperLoss extends Api
                     ->where('d.仓库编号','Y101')
                     ->whereRaw('LEFT(a.成品编码, ' . $num . ') = "' . $params['code'] . '"')
                     ->field('DISTINCT(a.jjcp_gdbh) as Gd_gdbh,a.jjcp_yjno,rtrim(a.jjcp_cpdh) as 成品编码,rtrim(a.jjcp_cpmc) as 成品名称,a.jjcp_sj,a.jjcp_smb,b.计量单位,
-                b.Gd_khdh, d.st_sl as 实际投料 ,c.yj_Yjno, c.yj_ls,c.yj_ks')
-                    ->order('b.Gd_khdh,a.成品编码 asc,a.jjcp_yjno')
+                b.Gd_khdh, SUM(d.st_sl) as 实际投料 ,c.yj_Yjno, c.yj_ls,c.yj_ks')
+                    ->order('b.Gd_khdh,a.成品编码 asc,a.jjcp_yjno,d.st_rq desc')
                     ->group('a.jjcp_gdbh,a.jjcp_yjno')
                     ->page($pages)
                     ->limit($limit)
@@ -161,8 +161,8 @@ class OrderSuperLoss extends Api
                     ->where($where)
                     ->where('d.仓库编号','Y101')
                     ->field('DISTINCT(a.jjcp_gdbh) as Gd_gdbh,a.jjcp_yjno,rtrim(a.jjcp_cpdh) as 成品编码,rtrim(a.jjcp_cpmc) as 成品名称,a.jjcp_sj,a.jjcp_smb,b.计量单位,
-                b.Gd_khdh, d.st_sl as 实际投料,c.yj_Yjno, c.yj_ls,c.yj_ks')
-                    ->order('b.Gd_khdh,a.成品编码 asc,a.jjcp_yjno')
+                b.Gd_khdh, SUM(d.st_sl) as 实际投料,c.yj_Yjno, c.yj_ls,c.yj_ks')
+                    ->order('b.Gd_khdh,a.成品编码 asc,a.jjcp_yjno,d.st_rq desc')
                     ->group('a.jjcp_gdbh,a.jjcp_yjno')
                     ->page($pages)
                     ->limit($limit)
@@ -202,7 +202,7 @@ class OrderSuperLoss extends Api
 //                        $machine_plan_loss = $v['Gy0_计划损耗'];
 //                    }
                 }
-                if ($value['yj_ls'] > 0){
+                if ((int)$value['yj_ls'] > 0){
                     $value['实际投料'] = number_format(((int)$value['实际投料']/10000)*$value['yj_ls']*$value['yj_ks'],4);
                 }else{
                     $value['实际投料'] = number_format($value['实际投料']/10000,4);
@@ -365,7 +365,7 @@ class OrderSuperLoss extends Api
             $this->error('参数错误');
         }
         $order = $params['order'];
-        $field = 'a.Gd_gdbh,rtrim(a.成品代号) as 成品代号,rtrim(a.成品名称) as 成品名称,rtrim(a.销售订单号) as 销售订单号,a.订单数量,c.yj_ls as ls,c.yj_ks as ks,b.st_sl as 投料';
+        $field = 'a.Gd_gdbh,rtrim(a.成品代号) as 成品代号,rtrim(a.成品名称) as 成品名称,rtrim(a.销售订单号) as 销售订单号,a.订单数量,c.yj_ls as ls,c.yj_ks as ks,SUM(b.st_sl) as 投料';
         $data =db('工单_基本资料')
             ->alias('a')
             ->join('物料_收发记录 b','a.Gd_cpdh = b.cpdh')