rabin 2 years ago
parent
commit
6fb292e4a5
3 changed files with 15 additions and 15 deletions
  1. 2 2
      app/factory/admin/Excel.php
  2. 10 10
      app/shop/src/Excel.php
  3. 3 3
      app/store/admin/Excel.php

+ 2 - 2
app/factory/admin/Excel.php

@@ -168,7 +168,7 @@ class Excel extends Core
             }
         }
 
-        Dever::excelExport($body, $header, $file);
+        return Dever::excelExport($body, $header, $file);
     }
 
     # 纯米模板
@@ -296,6 +296,6 @@ class Excel extends Core
             }
         }
 
-        Dever::excelExport($body, $header, $file);
+        return Dever::excelExport($body, $header, $file);
     }
 }

+ 10 - 10
app/shop/src/Excel.php

@@ -167,7 +167,7 @@ class Excel
             }
         }
 
-        Dever::excelExport($body, $header, $file);
+        return Dever::excelExport($body, $header, $file);
     }
 
     # 平台零售订单
@@ -331,7 +331,7 @@ class Excel
             }
         }
 
-        Dever::excelExport($body, $header, $file);
+        return Dever::excelExport($body, $header, $file);
     }
 
     # 门店订货单
@@ -409,7 +409,7 @@ class Excel
             }
         }
 
-        Dever::excelExport($body, $header, $file);
+        return Dever::excelExport($body, $header, $file);
     }
 
     # 仓库订货单
@@ -489,7 +489,7 @@ class Excel
             }
         }
 
-        Dever::excelExport($body, $header, $file);
+        return Dever::excelExport($body, $header, $file);
     }
 
     # 仓库发货单
@@ -574,7 +574,7 @@ class Excel
             }
         }
 
-        Dever::excelExport($body, $header, $file);
+        return Dever::excelExport($body, $header, $file);
     }
 
     # 仓库调拨单
@@ -652,7 +652,7 @@ class Excel
             }
         }
 
-        Dever::excelExport($body, $header, $file);
+        return Dever::excelExport($body, $header, $file);
     }
 
     # 工厂发货单
@@ -739,7 +739,7 @@ class Excel
             }
         }
 
-        Dever::excelExport($body, $header, $file);
+        return Dever::excelExport($body, $header, $file);
     }
 
     # 门店出库单
@@ -804,7 +804,7 @@ class Excel
             }
         }
 
-        Dever::excelExport($body, $header, $file);
+        return Dever::excelExport($body, $header, $file);
     }
 
     # 仓库出库单
@@ -865,7 +865,7 @@ class Excel
             }
         }
 
-        Dever::excelExport($body, $header, $file);
+        return Dever::excelExport($body, $header, $file);
     }
 
     public function goods_log()
@@ -945,6 +945,6 @@ class Excel
             Dever::alert('无导出数据');
         }
 
-        Dever::excelExport($body, $header, $file);
+        return Dever::excelExport($body, $header, $file);
     }
 }

+ 3 - 3
app/store/admin/Excel.php

@@ -164,7 +164,7 @@ class Excel extends Core
             $xls = Dever::excelExport($body_0, $header_0, $file, 0, '订单主信息', true);
 
             if ($xls) {
-                Dever::excelExport($body_1, $header_1, $file, 1, '订单货品明细', false, $xls);
+                return Dever::excelExport($body_1, $header_1, $file, 1, '订单货品明细', false, $xls);
             }
         } else {
             
@@ -263,7 +263,7 @@ class Excel extends Core
             $xls = Dever::excelExport($body_0, $header_0, $file, 0, '出库单主表', true);
 
             if ($xls) {
-                Dever::excelExport($body_1, $header_1, $file, 1, '出库单明细', false, $xls);
+                return Dever::excelExport($body_1, $header_1, $file, 1, '出库单明细', false, $xls);
             }
         }
     }
@@ -388,6 +388,6 @@ class Excel extends Core
             }
         }
 
-        Dever::excelExport($body, $header, $file);
+        return Dever::excelExport($body, $header, $file);
     }
 }