实际投料优化

application/api/controller/OrderSuperLoss.php

@@ -368,8 +368,8 @@ class OrderSuperLoss extends Api
         $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')
-            ->join('工单_印件资料 c','c.Yj_Gdbh = a.Gd_gdbh')
+            ->join('物料_收发记录 b','a.Gd_gdbh = b.st_gdbh AND a.Gd_cpdh = b.cpdh')
+            ->join('工单_印件资料 c','c.Yj_Gdbh = a.Gd_gdbh AND c.yj_Yjdh = a.Gd_cpdh')
             ->where('a.Gd_Gdbh',$order)
             ->where('a.行号',$params['yjno'])
             ->where('c.yj_Yjno',$params['yjno'])
@@ -383,6 +383,7 @@ class OrderSuperLoss extends Api
             $data['ks'] === 1;
         }
         $data['实际投料'] = number_format($data['投料']*$data['ls']*$data['ks']/10000,4);
+        halt($data);
         //查出成品数量及日期
         $cp_sql = "SELECT SUM(jjcp_sl) as cp_sl,MAX(jjcp_sj) as jjcp_sj FROM `成品入仓` WHERE jjcp_gdbh = '{$order}' AND jjcp_yjno = '{$params['yjno']}' GROUP BY jjcp_gdbh,jjcp_yjno";
         $cp_data = Db::query($cp_sql);