qiuenguang 1 год назад
Родитель
Сommit
5977b445f0
1 измененных файлов с 15 добавлено и 2 удалено
  1. 15 2
      application/api/controller/OrderSuperLoss.php

+ 15 - 2
application/api/controller/OrderSuperLoss.php

@@ -1683,6 +1683,16 @@ class OrderSuperLoss extends Api
             ->limit($limit)
             ->limit($limit)
             ->select();
             ->select();
         foreach ($list as $key=>$value){
         foreach ($list as $key=>$value){
+            $status = \db('工单_印件资料')
+                ->where('Yj_Gdbh',$value['Gd_gdbh'])
+                ->where('yj_Yjno',$value['jjcp_yjno'])
+                ->value('质量考核');
+            $list[$key]['质量考核'] = $status;
+            if ($status == 1){
+                $list[$key]['考核'] = '否';
+            }else{
+                $list[$key]['考核'] = '是';
+            }
             $value['实际投料'] = $value['实际投料']*10000;
             $value['实际投料'] = $value['实际投料']*10000;
             //目标合格率
             //目标合格率
             $list[$key]['target_rate'] = ($value['实际投料']-$value['工单计划损耗'])/$value['实际投料']*100;
             $list[$key]['target_rate'] = ($value['实际投料']-$value['工单计划损耗'])/$value['实际投料']*100;
@@ -1720,7 +1730,7 @@ class OrderSuperLoss extends Api
             `产品名称` AS `成品名称`,  
             `产品名称` AS `成品名称`,  
             `实际投料`,  
             `实际投料`,  
             `计量单位`,  
             `计量单位`,  
-            `入仓日期` AS warehousing_date,  
+            DATE(`入仓日期`) AS warehousing_date,  
             `入仓数量` AS warehousing_num,  
             `入仓数量` AS warehousing_num,  
             SUM(DISTINCT `计划损耗`) AS `计划损耗`,  
             SUM(DISTINCT `计划损耗`) AS `计划损耗`,  
             `废品合计`,  
             `废品合计`,  
@@ -1825,7 +1835,7 @@ class OrderSuperLoss extends Api
             `产品名称` AS `成品名称`,  
             `产品名称` AS `成品名称`,  
             `实际投料`,  
             `实际投料`,  
             `计量单位`,  
             `计量单位`,  
-            `入仓日期` AS warehousing_date,  
+            DATE(`入仓日期`) AS warehousing_date, 
             `入仓数量` AS warehousing_num,  
             `入仓数量` AS warehousing_num,  
             SUM(DISTINCT `计划损耗`) AS `计划损耗`,  
             SUM(DISTINCT `计划损耗`) AS `计划损耗`,  
             `废品合计`,  
             `废品合计`,  
@@ -1901,6 +1911,9 @@ class OrderSuperLoss extends Api
         $this->success('成功',$list);
         $this->success('成功',$list);
 
 
     }
     }
+
+
+    //循环插入超节损数据
 }
 }