工单超节损检验废

application/api/controller/OrderSuperLoss.php

@@ -1462,10 +1462,10 @@ class OrderSuperLoss extends Api
             if (empty($vv['sczl_bh1'])){
                 $vv['sczl_bh1'] = $vv['sczl_bh'];
             }
-            if (isset($sumBz[$vv['sczl_bh1']])){
-                $sumBz[$vv['sczl_bh1']] += $vv['total_cl'];
+            if (isset($sumBz[$vv['sczl_bh1'].'-'.$vv['Gy0_gxh']])){
+                $sumBz[$vv['sczl_bh1'].'-'.$vv['Gy0_gxh']] += $vv['total_cl'];
             }else{
-                $sumBz[$vv['sczl_bh1']] = $vv['total_cl'];
+                $sumBz[$vv['sczl_bh1'].'-'.$vv['Gy0_gxh']] = $vv['total_cl'];
             }
         }
         foreach ($gy_data as $kk => $vv) {
@@ -1514,7 +1514,7 @@ class OrderSuperLoss extends Api
                     }
                 }
             }
-            $gy_data[$kk]['质检废'] = round($gy_data[$kk]['zjfp']*($gy_data[$kk]['total_cl']/$sumBz[$vv['sczl_bh1']]));
+            $gy_data[$kk]['质检废'] = round($gy_data[$kk]['zjfp']*($gy_data[$kk]['total_cl']/$sumBz[$vv['sczl_bh1'].'-'.$vv['Gy0_gxh']]));
             //无形损分摊
             if ($plan_total > 0) {
                 $gy_data[$kk]['无形损分摊'] = round($gy_data[$kk]['计划损耗'] / $plan_total * $data['intangible_loss']);
@@ -1757,7 +1757,7 @@ class OrderSuperLoss extends Api
                 ->where('Yj_Gdbh', $value['Gd_gdbh'])
                 ->where('yj_Yjno', $value['jjcp_yjno'])
                 ->value('质量考核');
-
+            $list[$key]['工单质检废'] = $value['废品合计'] - $value['zcfp'];
             $list[$key]['质量考核'] = $status;
             $list[$key]['考核'] = ($status == 1) ? '否' : '是';
             if ($value['实际投料'] !== null){
@@ -1835,7 +1835,7 @@ class OrderSuperLoss extends Api
             ->group('Gy0_gdbh, `印件及工序`')
             ->order('sys_rq DESC')
             ->find();
-
+        $list['班组分摊质检废品'] = $list['废品合计'] - $list['zcfp'];
         $list['实际投料'] = $list['实际投料']*10000;
         //目标合格率
         $list['target_rate'] = ($list['实际投料']-$list['计划损耗'])/$list['实际投料']*100;
@@ -1968,6 +1968,7 @@ class OrderSuperLoss extends Api
             ->order('sys_rq DESC')
             ->find();
 
+        $list['班组分摊质检废品'] = $list['废品合计'] - $list['zcfp'];
         $list['实际投料'] = $list['实际投料']*10000;
         //目标合格率
         $list['target_rate'] = ($list['实际投料']-$list['计划损耗'])/$list['实际投料']*100;
@@ -2063,7 +2064,15 @@ class OrderSuperLoss extends Api
 //            ->select();
 //
 //        foreach ($list as $item){
-//            $this->OneOrderSuperLoss($item['jjcp_gdbh'],$item['jjcp_yjno']);
+//            $result = $this->OneOrderSuperLoss($item['jjcp_gdbh'],$item['jjcp_yjno']);
+//            \db('工单_质量考核汇总')
+//            ->where('Gy0_gdbh', $item['jjcp_gdbh'])
+//            ->where('印件及工序', $item['jjcp_yjno'])
+//            ->delete();
+//            $sql = \db('工单_质量考核汇总')
+//                ->fetchSql(true)
+//                ->insertAll($result);
+//            $res = \db()->query($sql);
 //        }
 //    }
 }