工序状态更正

application/api/controller/Manufacture.php

@@ -7,6 +7,8 @@ use app\common\controller\Api;
 use Monolog\Handler\IFTTTHandler;
 use think\Db;
 use think\Request;
+use function fast\e;
+
 /**
  *
  * 生产排单管理
@@ -539,7 +541,16 @@ class Manufacture extends Api
         if (empty($list)){
             $this->success('未找到该工单工艺资料');
         }
-        $yieldSql = "SELECT a.Gy0_gxh as gxh,SUM(b.sczl_cl) as cl FROM `工单_工艺资料` AS a JOIN `设备_产量计酬` as b ON a.Gy0_gxh = b.sczl_gxh WHERE a.Gy0_gdbh = '{$workOrder}' AND b.sczl_gdbh = '{$workOrder}' GROUP BY a.Gy0_gxh";
+        $yieldSql = "SELECT
+            a.Gy0_gxh AS gxh,
+            SUM( b.sczl_cl ) AS cl 
+        FROM
+            `工单_工艺资料` AS a
+            JOIN `设备_产量计酬` AS b ON a.Gy0_gxh = b.sczl_gxh AND a.Gy0_yjno = b.sczl_yjno
+        WHERE
+            a.Gy0_gdbh = '{$workOrder}' 
+        GROUP BY
+            a.Gy0_gxh";
         $yield = Db::query($yieldSql);
         foreach ($list as $key=>$value){
             if ($value['yjno']<10){
@@ -551,8 +562,12 @@ class Manufacture extends Api
             $list[$key]['印件及工序'] = $value['yjno'].'-'.$value['gxh'].'-->'.$value['gxmc'];
             foreach ($yield as $k=>$v){
                 if ($v['gxh'] === $list[$key]['gxh']){
-                    $list[$key]['计划产量/已完成'] = (int)($value['计划接货数']/$value['ls']).'/'.$v['cl'];
-                    $list[$key]['完成率'] = number_format($v['cl']/($value['计划接货数']/$value['ls']),4)*100 . '%';
+                    $list[$key]['计划产量/已完成'] = (int)($value['计划接货数']).'/'.$v['cl'];
+                    if ($value['计划接货数'] !== 0 && $value['计划接货数'] !== '' &&  !empty($value['计划接货数'])){
+                        $list[$key]['完成率'] = number_format($v['cl']/$value['计划接货数'],4)*100 . '%';
+                    }else{
+                        $list[$key]['完成率'] = '';
+                    }
                 }else{
                     $list[$key]['计划产量/已完成'] = ($value['计划接货数']/$value['ls']).'/0';
                     $list[$key]['完成率'] = '';