产量新增优化，超节损优化

application/api/controller/Facility.php

@@ -607,6 +607,7 @@ class Facility extends Api
         rtrim(码开始行) as 码开始行,rtrim(码结束行) as 码结束行,rtrim(码包) as 码包,rtrim(主电表) as 主电表,rtrim(辅电表) as 辅电表,rtrim(sczl_ms) as 色度,
         rtrim(sczl_sj1) as sj1,rtrim(sczl_sj2) as sj2,rtrim(UniqId) as UniqId,rtrim(sczl_bh98) as 拉料,rtrim(sczl_ls) as ls';
         $list = \db('设备_产量计酬')->where($where)->field($field)->order('UniqId desc')->select();
+
         if (!empty($list)){
             foreach ($list as $k=>$v){
                 $name = \db('工单_印件资料')->where('Yj_Gdbh',$v['工单编号'])->where('yj_Yjno',$v['yjno'])->field('rtrim(yj_yjmc) as cpmc')->find();
@@ -2527,8 +2528,8 @@ class Facility extends Api
                 'yjno' => $params['sczl_yjno'],
                 'gxh' => $params['sczl_gxh'],
                 'jtbh' => $params['sczl_jtbh'],
-                'startTime' => $params['sczl_sj1'],
-                'endTime' => $params['sczl_sj2'],
+                'startTime' => $params['sczl_sj1']??date('Y-m-d H:i:s',time()),
+                'endTime' => $params['sczl_sj2']??date('Y-m-d H:i:s',time()),
                 'yieldUid' => $params['UniqId'],
                 '换版总工时' => $params['sczl_装版总工时'],
                 '换版联拼数' => $params['sczl_换版联拼数'],

application/api/controller/OrderSuperLoss.php

@@ -1963,11 +1963,11 @@ class OrderSuperLoss extends Api
             //报废合计
             $gy_data[$key]['total_waste'] = $value['Gy0_无形损'] + $value['total_fp'] + $value['waste_quality'];
             //工序实际报废率
-            $gy_data[$key]['actual_loss_rate'] = ((number_format($gy_data[$key]['total_waste']/($list['实际投料']*$Multiple),4))*100).'%';
+            $gy_data[$key]['actual_loss_rate'] = ((number_format($gy_data[$key]['total_waste']/$list['实际投料'],4))*100).'%';
             //工序目标报废率
-            $gy_data[$key]['target_loss_rate'] = ((number_format($value['Gy0_计划损耗']/($list['实际投料']*$Multiple),4))*100).'%';
+            $gy_data[$key]['target_loss_rate'] = ((number_format($value['Gy0_计划损耗']/$list['实际投料'],4))*100).'%';
             //占投料报废率
-            $gy_data[$key]['loss_rate'] = ((number_format(($value['Gy0_计划损耗']-$gy_data[$key]['total_waste'])/($list['实际投料']*$Multiple),4))*100).'%';
+            $gy_data[$key]['loss_rate'] = ((number_format(($value['Gy0_计划损耗']-$gy_data[$key]['total_waste'])/$list['实际投料'],4))*100).'%';
         }
         $list['gy_data'] = $gy_data;
         $total = [