公管公司火车进站

Modules/Admin/Http/Controllers/Api/ApiController.php

@@ -1799,6 +1799,49 @@ class ApiController extends BaseController
         $start_time = date('Y-m-d 18:00:00', strtotime($date . ' -1 day')); // 2025-10-08 18:00:00
         $end_time = date('Y-m-d 18:00:00', strtotime($date)); // 2025-10-09 18:00:00
 
+        $result['pm1_jh_mmls'] = '/';//配煤一计划末煤列数
+        $result['pm1_jh_xhmls'] = '/';//配煤一计划洗混煤列数
+        $result['pm1_jh_jmls'] = '/';//配煤一计划精煤列数
+        $result['pm1_jh_mmjl'] = '/';//配煤一计划末煤进量
+        $result['pm1_jh_xhmjl'] = '/';//配煤一计划洗混煤进量
+        $result['pm1_jh_jmjl'] = '/';//配煤一计划精煤进量
+        $result['pm1_jh_mmmx'] = '/';//配煤一计划末煤明细
+        $result['pm1_jh_xhmmx'] = '/';//配煤一计划洗混煤明细
+        $result['pm1_jh_jmmx'] = '/';//配煤一计划精煤明细
+        $result['pm1_jh_ls'] = '/';//配煤一计划列数
+        $result['pm2_jh_mmls'] = '/';//配煤二计划末煤列数
+        $result['pm2_jh_xhmls'] = '/';//配煤二计划洗混煤列数
+        $result['pm2_jh_jmls'] = '/';//配煤二计划精煤列数
+        $result['pm2_jh_mmjl'] = '/';//配煤二计划末煤进量
+        $result['pm2_jh_xhmjl'] = '/';//配煤二计划洗混煤进量
+        $result['pm2_jh_jmjl'] = '/';//配煤二计划精煤进量
+        $result['pm2_jh_mmmx'] = '/';//配煤二计划末煤明细
+        $result['pm2_jh_xhmmx'] = '/';//配煤二计划洗混煤明细
+        $result['pm2_jh_jmmx'] = '/';//配煤二计划精煤明细
+        $result['pm2_jh_ls'] = '/';//配煤二计划列数
+        $result['pm1_sj_mmls'] = '/';//配煤一实际末煤列数
+        $result['pm1_sj_xhmls'] = '/';//配煤一实际洗混煤列数
+        $result['pm1_sj_jmls'] = '/';//配煤一实际精煤列数
+        $result['pm1_sj_mmjl'] = '/';//配煤一实际末煤进量
+        $result['pm1_sj_xhmjl'] = '/';//配煤一实际洗混煤进量
+        $result['pm1_sj_jmjl'] = '/';//配煤一实际精煤进量
+        $result['pm1_sj_mmmx'] = '/';//配煤一实际末煤明细
+        $result['pm1_sj_xhmmx'] = '/';//配煤一实际洗混煤明细
+        $result['pm1_sj_jmmx'] = '/';//配煤一实际精煤明细
+        $result['pm1_sj_ls'] = '/';//配煤一计划列数
+        $result['pm1_xhc'] = '/';//配煤一卸火车情况
+        $result['pm2_sj_mmls'] = '/';//配煤二实际末煤列数
+        $result['pm2_sj_xhmls'] = '/';//配煤二实际洗混煤列数
+        $result['pm2_sj_jmls'] = '/';//配煤二实际精煤列数
+        $result['pm2_sj_mmjl'] = '/';//配煤二实际末煤进量
+        $result['pm2_sj_xhmjl'] = '/';//配煤二实际洗混煤进量
+        $result['pm2_sj_jmjl'] = '/';//配煤二实际精煤进量
+        $result['pm2_sj_mmmx'] = '/';//配煤二实际末煤明细
+        $result['pm2_sj_xhmmx'] = '/';//配煤二实际洗混煤明细
+        $result['pm2_sj_jmmx'] = '/';//配煤二实际精煤明细
+        $result['pm2_sj_ls'] = '/';//配煤二实际列数
+        $result['pm2_xhc'] = '/';//配煤二卸火车情况
+
         //配煤一计划
         $jh1 = DB::connection('mysql_fwe10')->table('uf_gggs_hcjmjh')
             ->where('create_time', '>=', $start_time)
@@ -1834,73 +1877,85 @@ class ApiController extends BaseController
             ->where('is_delete',0)
             ->orderBy('create_time', 'desc')
             ->first();
-        //计划
-        $result['pm1_jh_mmls'] = $jh1->mmls;//配煤一计划末煤列数
-        $result['pm1_jh_xhmls'] = $jh1->xhmls;//配煤一计划洗混煤列数
-        $result['pm1_jh_jmls'] = $jh1->jmls;//配煤一计划精煤列数
 
-        $result['pm1_jh_mmjl'] = $jh1->mmjl;//配煤一计划末煤进量
-        $result['pm1_jh_xhmjl'] = $jh1->xhmjl;//配煤一计划洗混煤进量
-        $result['pm1_jh_jmjl'] = $jh1->jmjl;//配煤一计划精煤进量
+        //计划
+        $result['pm1_jh_ls'] = 0;
+        if($jh1 != null){
+            $result['pm1_jh_mmls'] = $jh1->mmls;//配煤一计划末煤列数
+            $result['pm1_jh_xhmls'] = $jh1->xhmls;//配煤一计划洗混煤列数
+            $result['pm1_jh_jmls'] = $jh1->jmls;//配煤一计划精煤列数
 
-        $result['pm1_jh_mmmx'] = $jh1->mmmx;//配煤一计划末煤明细
-        $result['pm1_jh_xhmmx'] = $jh1->xhmmx;//配煤一计划洗混煤明细
-        $result['pm1_jh_jmmx'] = $jh1->jmmx;//配煤一计划精煤明细
+            $result['pm1_jh_mmjl'] = $jh1->mmjl;//配煤一计划末煤进量
+            $result['pm1_jh_xhmjl'] = $jh1->xhmjl;//配煤一计划洗混煤进量
+            $result['pm1_jh_jmjl'] = $jh1->jmjl;//配煤一计划精煤进量
 
-        $result['pm1_jh_ls'] = $jh1->mmls + $jh1->xhmls + $jh1->jmls;//配煤一计划列数
+            $result['pm1_jh_mmmx'] = $jh1->mmmx;//配煤一计划末煤明细
+            $result['pm1_jh_xhmmx'] = $jh1->xhmmx;//配煤一计划洗混煤明细
+            $result['pm1_jh_jmmx'] = $jh1->jmmx;//配煤一计划精煤明细
 
-        $result['pm2_jh_mmls'] = $jh2->mmls;//配煤二计划末煤列数
-        $result['pm2_jh_xhmls'] = $jh2->xhmls;//配煤二计划洗混煤列数
-        $result['pm2_jh_jmls'] = $jh2->jmls;//配煤二计划精煤列数
+            $result['pm1_jh_ls'] = $jh1->mmls + $jh1->xhmls + $jh1->jmls;//配煤一计划列数
+        }
+        $result['pm2_jh_ls'] = 0;
+        if($jh2 != null){
+            $result['pm2_jh_mmls'] = $jh2->mmls;//配煤二计划末煤列数
+            $result['pm2_jh_xhmls'] = $jh2->xhmls;//配煤二计划洗混煤列数
+            $result['pm2_jh_jmls'] = $jh2->jmls;//配煤二计划精煤列数
 
-        $result['pm2_jh_mmjl'] = $jh2->mmjl;//配煤二计划末煤进量
-        $result['pm2_jh_xhmjl'] = $jh2->xhmjl;//配煤二计划洗混煤进量
-        $result['pm2_jh_jmjl'] = $jh2->jmjl;//配煤二计划精煤进量
+            $result['pm2_jh_mmjl'] = $jh2->mmjl;//配煤二计划末煤进量
+            $result['pm2_jh_xhmjl'] = $jh2->xhmjl;//配煤二计划洗混煤进量
+            $result['pm2_jh_jmjl'] = $jh2->jmjl;//配煤二计划精煤进量
 
-        $result['pm2_jh_mmmx'] = $jh2->mmmx;//配煤二计划末煤明细
-        $result['pm2_jh_xhmmx'] = $jh2->xhmmx;//配煤二计划洗混煤明细
-        $result['pm2_jh_jmmx'] = $jh2->jmmx;//配煤二计划精煤明细
+            $result['pm2_jh_mmmx'] = $jh2->mmmx;//配煤二计划末煤明细
+            $result['pm2_jh_xhmmx'] = $jh2->xhmmx;//配煤二计划洗混煤明细
+            $result['pm2_jh_jmmx'] = $jh2->jmmx;//配煤二计划精煤明细
 
-        $result['pm2_jh_ls'] = $jh2->mmls + $jh2->xhmls + $jh2->jmls;//配煤二计划列数
+            $result['pm2_jh_ls'] = $jh2->mmls + $jh2->xhmls + $jh2->jmls;//配煤二计划列数
+        }
 
         $result['jh_hj'] = $result['pm1_jh_ls'] + $result['pm2_jh_ls'];//计划合计
-        //实际
-        $result['pm1_sj_mmls'] = $sj1->mmls;//配煤一实际末煤列数
-        $result['pm1_sj_xhmls'] = $sj1->xhmls;//配煤一实际洗混煤列数
-        $result['pm1_sj_jmls'] = $sj1->jmls;//配煤一实际精煤列数
 
-        $result['pm1_sj_mmjl'] = $sj1->mmjl;//配煤一实际末煤进量
-        $result['pm1_sj_xhmjl'] = $sj1->xhmjl;//配煤一实际洗混煤进量
-        $result['pm1_sj_jmjl'] = $sj1->jmjl;//配煤一实际精煤进量
+        //实际
+        $result['pm1_sj_ls'] = 0;
+        $bz1 = '';
+        if($sj1 != null){
+            $result['pm1_sj_mmls'] = $sj1->mmls;//配煤一实际末煤列数
+            $result['pm1_sj_xhmls'] = $sj1->xhmls;//配煤一实际洗混煤列数
+            $result['pm1_sj_jmls'] = $sj1->jmls;//配煤一实际精煤列数
 
-        $result['pm1_sj_mmmx'] = $sj1->mmmx;//配煤一实际末煤明细
-        $result['pm1_sj_xhmmx'] = $sj1->xhmmx;//配煤一实际洗混煤明细
-        $result['pm1_sj_jmmx'] = $sj1->jmmx;//配煤一实际精煤明细
+            $result['pm1_sj_mmjl'] = $sj1->mmjl;//配煤一实际末煤进量
+            $result['pm1_sj_xhmjl'] = $sj1->xhmjl;//配煤一实际洗混煤进量
+            $result['pm1_sj_jmjl'] = $sj1->jmjl;//配煤一实际精煤进量
 
-        $result['pm1_sj_ls'] = $sj1->mmls + $sj1->xhmls + $sj1->jmls;//配煤一计划列数
+            $result['pm1_sj_mmmx'] = $sj1->mmmx;//配煤一实际末煤明细
+            $result['pm1_sj_xhmmx'] = $sj1->xhmmx;//配煤一实际洗混煤明细
+            $result['pm1_sj_jmmx'] = $sj1->jmmx;//配煤一实际精煤明细
 
-        $result['pm2_sj_mmls'] = $sj2->mmls;//配煤二实际末煤列数
-        $result['pm2_sj_xhmls'] = $sj2->xhmls;//配煤二实际洗混煤列数
-        $result['pm2_sj_jmls'] = $sj2->jmls;//配煤二实际精煤列数
+            $result['pm1_sj_ls'] = $sj1->mmls + $sj1->xhmls + $sj1->jmls;//配煤一计划列数
+            $result['pm1_xhc'] = $sj1->xhcqk;//配煤一卸火车情况
+            $bz1 = trim($sj1->bz ?? '');
+        }
+        $result['pm2_sj_ls'] = 0;
+        $bz2 = '';
+        if($sj2 != null){
+            $result['pm2_sj_mmls'] = $sj2->mmls;//配煤二实际末煤列数
+            $result['pm2_sj_xhmls'] = $sj2->xhmls;//配煤二实际洗混煤列数
+            $result['pm2_sj_jmls'] = $sj2->jmls;//配煤二实际精煤列数
 
-        $result['pm2_sj_mmjl'] = $sj2->mmjl;//配煤二实际末煤进量
-        $result['pm2_sj_xhmjl'] = $sj2->xhmjl;//配煤二实际洗混煤进量
-        $result['pm2_sj_jmjl'] = $sj2->jmjl;//配煤二实际精煤进量
+            $result['pm2_sj_mmjl'] = $sj2->mmjl;//配煤二实际末煤进量
+            $result['pm2_sj_xhmjl'] = $sj2->xhmjl;//配煤二实际洗混煤进量
+            $result['pm2_sj_jmjl'] = $sj2->jmjl;//配煤二实际精煤进量
 
-        $result['pm2_sj_mmmx'] = $sj2->mmmx;//配煤二实际末煤明细
-        $result['pm2_sj_xhmmx'] = $sj2->xhmmx;//配煤二实际洗混煤明细
-        $result['pm2_sj_jmmx'] = $sj2->jmmx;//配煤二实际精煤明细
+            $result['pm2_sj_mmmx'] = $sj2->mmmx;//配煤二实际末煤明细
+            $result['pm2_sj_xhmmx'] = $sj2->xhmmx;//配煤二实际洗混煤明细
+            $result['pm2_sj_jmmx'] = $sj2->jmmx;//配煤二实际精煤明细
 
-        $result['pm2_sj_ls'] = $sj2->mmls + $sj2->xhmls + $sj2->jmls;//配煤二实际列数
+            $result['pm2_sj_ls'] = $sj2->mmls + $sj2->xhmls + $sj2->jmls;//配煤二实际列数
+            $result['pm2_xhc'] = $sj2->xhcqk;//配煤二卸火车情况
+            $bz2 = trim($sj2->bz ?? '');
+        }
 
         $result['sj_hj'] = $result['pm1_sj_ls'] + $result['pm2_sj_ls'];//实际合计
 
-        $result['pm1_xhc'] = $sj1->xhcqk;//配煤一卸火车情况
-
-        $result['pm2_xhc'] = $sj2->xhcqk;//配煤二卸火车情况
-
-        $bz1 = trim($sj1->bz ?? '');
-        $bz2 = trim($sj2->bz ?? '');
         if (empty($bz1) && empty($bz2)) {
             $result['bz'] = '无';
         } else {