订单数量，工艺资料

application/api/controller/WorkOrder.php

@@ -141,7 +141,7 @@ class WorkOrder extends Api
                 '销售订单号' => rtrim($value['销售订单号']),
                 '产品代号' => rtrim($value['Gd_cpdh']),
                 '产品名称' => rtrim($value['Gd_cpmc']),
-                '订单数量' => rtrim($value['订单数量']),
+                '订单数量' => floatval($value['订单数量']),
                 '单位' => rtrim($value['计量单位']),
                 '折合大箱' => rtrim((int)$value['投料大箱']),
                 '投料率' => rtrim($value['投料率']),
@@ -157,6 +157,7 @@ class WorkOrder extends Api
                 '更新时间' => rtrim($value['Mod_rq']),
                 'Uniqid' => rtrim($value['Uniqid'])
             ];
+
             $number = \db('工单_工艺资料')->where('Gy0_gdbh',$data[$key]['工单编号'])->count();
             if ($number === 0){
                 $data[$key]['status'] = '*';
@@ -244,7 +245,7 @@ class WorkOrder extends Api
                 }else{
                     $scrap = ceil(($value['Gy0_Rate0']+((int)($value['Gy0_计划接货数']/$value['Gy0_ls']))*$value['Gy0_Rate1'])*$value['损耗系数']*$value['Gy0_ms']);
                 }
-                if (rtrim($value['Gy0_sbbh']) == ''){
+                if (rtrim($value['Gy0_sbbh']) == '' || $value['Gy0_计划接货数'] == 0){
                     $number = 0;
                 }else{
                     $number = round(($scrap/((int)($value['Gy0_计划接货数']/$value['Gy0_ls'])))*100,2).'%';