From 78a122bd4c896ae2d6a36d0c6db3232bd8be633f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=B8=96=E7=95=8C?= <642747453@qq.com>
Date: Wed, 14 Sep 2022 13:18:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20#0909=20=E7=9B=98=E7=82=B9=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Imports/InventoryImport.php        | 14 ++++++++++----
 resources/frontend/src/views/Login.vue | 11 ++++++++++-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/app/Imports/InventoryImport.php b/app/Imports/InventoryImport.php
index 36a27ef..a9ddbbd 100644
--- a/app/Imports/InventoryImport.php
+++ b/app/Imports/InventoryImport.php
@@ -51,8 +51,11 @@ class InventoryImport implements ToCollection, SkipsEmptyRows
                     Log::warning(json_encode($row, 256) . '=====库存导入未找到');
                     continue;
                 }
+                $goodsSku->stock = $row[6] + $row[7];
+                $goodsSku->save();
                 $updateIds[] = $goodsSku->id;
                 DailyStockRecord::where('sku_id', $goodsSku->id)->where('day', $day)->update([
+                    'arrived_today_num' => $row[7],
                     'inventory' => $row[6],
                     'inventory_time' => $dateTime
                 ]);
@@ -64,13 +67,16 @@ class InventoryImport implements ToCollection, SkipsEmptyRows
             throw $exception;
         }
         $onSkuIds = GoodsSku::query()
-            ->where('stock', '>', 0)
             ->where('status', '<>', 0)
             ->pluck('id')
             ->toArray();
-        if ($downSkuIds = array_diff($onSkuIds, $updateIds)) {
-            GoodsSku::whereIn('id', $onSkuIds)->update(['stock' => 0]);
-            event(new StockUpdateEvent($downSkuIds));
+        $downSkuIds = array_diff($onSkuIds, $updateIds);
+        foreach ($downSkuIds as $downSkuId) {
+            $goodsSku = GoodsSku::query()->find($downSkuId);
+            $goodsSku->yesterday_num -= $goodsSku->stock;
+            $goodsSku->stock = 0;
+            $goodsSku->save();
+            event(new StockUpdateEvent($goodsSku));
         }
     }
 }
diff --git a/resources/frontend/src/views/Login.vue b/resources/frontend/src/views/Login.vue
index 8eec54f..9b3d77f 100644
--- a/resources/frontend/src/views/Login.vue
+++ b/resources/frontend/src/views/Login.vue
@@ -12,7 +12,7 @@
             <br />
             <el-checkbox v-model="checked">记住密码</el-checkbox>
             <br />
-            <el-button type="primary" @click="Login()">登录</el-button>
+            <el-button type="primary" @click="Login()" @keyup.enter="Login()">登录</el-button>
         </div>
     </div>
 </template>
@@ -32,6 +32,7 @@ export default {
     },
     mounted() {
         this.getCookie();
+        window.addEventListener('keydown', this.keyDown);
     },
     methods: {
         Login() {
@@ -103,7 +104,15 @@ export default {
         clearCookie: function () {
             this.setCookie("", "", false, -1);
         },
+        keyDown(e) {
+            if (13 === e.keyCode) {
+                this.Login();
+            }
+        }
     },
+    destroyed() {
+        window.removeEventListener('keydown', this.keyDown, false);
+    }
 };
 </script>