From 4c6d4ff7c9f9f193b1661f20ba9a3abde70633db Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 5 Aug 2024 14:14:20 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=AD=98=E5=82=A8?=
=?UTF-8?q?=E5=BA=93=E4=BA=A7=E5=93=81=E9=80=BB=E8=BE=91=E5=92=8C=E5=BA=97?=
=?UTF-8?q?=E9=93=BA=E5=AD=98=E5=82=A8=E5=8F=91=E9=80=81=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/admin/logic/warehouse_product/WarehouseProductLogic.php | 4 ++--
app/queue/redis/StoreStorageSend.php | 2 --
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/app/admin/logic/warehouse_product/WarehouseProductLogic.php b/app/admin/logic/warehouse_product/WarehouseProductLogic.php
index 8de456ab4..3426c50c6 100644
--- a/app/admin/logic/warehouse_product/WarehouseProductLogic.php
+++ b/app/admin/logic/warehouse_product/WarehouseProductLogic.php
@@ -34,6 +34,7 @@ class WarehouseProductLogic extends BaseLogic
try {
$data = [
'warehouse_id' => $params['warehouse_id'],
+ 'store_id' => $params['store_id']??0,
'product_id' => $params['product_id'],
'financial_pm' => $params['financial_pm'],
'batch' => 0,
@@ -59,6 +60,7 @@ class WarehouseProductLogic extends BaseLogic
return true;
} catch (\Exception $e) {
Db::rollback();
+ Log::error($e->getMessage().',file:'.$e->getFile().',line:'.$e->getLine());
self::setError($e->getMessage());
return false;
}
@@ -80,7 +82,6 @@ class WarehouseProductLogic extends BaseLogic
'warehouse_id' => $params['warehouse_id'],
'product_id' => $params['product_id'],
'financial_pm' => $params['financial_pm'],
- 'batch' => WarehouseProduct::where(['product_id' => $params['product_id'], 'warehouse_id' => $params['warehouse_id'], 'financial_pm' => $params['financial_pm']])->count(),
'nums' => $params['nums'],
'price' => $params['price'],
'admin_id' => $params['admin_id'],
@@ -101,7 +102,6 @@ class WarehouseProductLogic extends BaseLogic
return $res;
} catch (\Exception $e) {
Db::rollback();
- d($e);
self::setError($e->getMessage());
return false;
}
diff --git a/app/queue/redis/StoreStorageSend.php b/app/queue/redis/StoreStorageSend.php
index cea7038a3..21b9d715e 100644
--- a/app/queue/redis/StoreStorageSend.php
+++ b/app/queue/redis/StoreStorageSend.php
@@ -87,7 +87,6 @@ class StoreStorageSend implements Consumer
if ($product_arr['stock'] > 0) {
$this->storage($find, $store_id, $admin_id, $product_arr,$warehouse_id);
}
- StoreProductLogic::updateGoodsclass($find['cate_id'],$store_id);
Db::commit();
return true;
} catch (\Exception $e) {
@@ -138,7 +137,6 @@ class StoreStorageSend implements Consumer
if ($product_arr['stock'] > 0) {
$this->storage($find, $store_id, $admin_id, $product_arr,$warehouse_id);
}
- // StoreProductLogic::updateGoodsclass($find['cate_id'],$store_id);
Db::commit();
return true;
} catch (\Exception $e) {