Bläddra i källkod

库存比较导入修正

LD 5 år sedan
förälder
incheckning
d926f15b83

+ 5 - 5
app/Http/Controllers/InventoryCompareController.php

@@ -110,16 +110,16 @@ class InventoryCompareController extends Controller
                 return '<h1 class="text-danger">导入Excel失败<br><p style="color: red">' . Cache::pull('error') . '</p></h1>';
             } else {
                 $exception = Cache::get('exception');
-                if ($exception){
+//                if ($exception){
                     $a = '';
                     for ($i = 0; $i < count($exception); $i++) {
                         $a .= implode(',', $exception[$i]) . '&#10';
                     };
                     $this->log(__METHOD__, __FUNCTION__, json_encode($request->toArray()), Auth::user()['id']);
-                    return '<h1 class="text-danger">导入Excel失败<br><textarea style="width: 50%;height: 50%">' . $a . '</textarea></h1>';
-                }else {
-                    return '<h1 class="text-danger">导入Excel成功</h1>';
-                }
+                    return '<h1 class="text-danger">导入Excel成功<br><textarea style="width: 50%;height: 50%">' . $a . '</textarea></h1>';
+//                }else {
+//                    return '<h1 class="text-danger">导入Excel成功</h1>';
+//                }
 
             }
         } else {

+ 2 - 2
app/Imports/InventoryCompareImport.php

@@ -151,12 +151,12 @@ class InventoryCompareImport implements ToCollection, WithHeadingRow, WithMultip
                 array_push($inventoryCompares,$inventoryCompare);
                 $sum++;
             }
-            if(empty($exception)){
+//            if(empty($exception)){
                 /** @var InventoryCompareService $service */
                 $service = app('inventoryCompareService');
                 $inventoryCompare= $service->createInventoryCompares($inventoryCompares);
                 if (!$inventoryCompare) array_push($exception, ['创建库存对比失败!']);
-            }
+//            }
 
         }
         Cache::put('exception', $exception, 86400);