From f57cebc64904baf2786172ef4488fbf0437f4d6a Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Tue, 13 Aug 2024 12:00:00 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E4=BA=86=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E4=BA=A7=E5=93=81=E9=80=BB=E8=BE=91=E5=92=8C=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E4=BA=A7=E5=93=81=E5=BA=93=E5=AD=98=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=BA=A7=E5=93=81ID?= =?UTF-8?q?=E5=88=B0=E4=BB=93=E5=BA=93=E4=BA=A7=E5=93=81=E7=9A=84=E5=AD=98?= =?UTF-8?q?=E5=82=A8=E4=B8=AD=EF=BC=8C=E5=B9=B6=E4=BF=AE=E5=A4=8D=E4=BA=86?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=93=8D=E4=BD=9C=E7=9A=84=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E3=80=82=E5=90=8C=E6=97=B6=E5=88=A0=E9=99=A4=E4=BA=86=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E4=BA=A7=E5=93=81=E5=BA=93=E5=AD=98=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E6=9B=B4=E6=96=B0=E4=BA=86=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WarehouseProductLists.php | 2 +- .../WarehouseProductLogic.php | 4 +- .../WarehouseProductStoregeLogic.php | 39 +------------------ app/queue/redis/StoreStorageSend.php | 1 - 4 files changed, 5 insertions(+), 41 deletions(-) diff --git a/app/admin/lists/warehouse_product/WarehouseProductLists.php b/app/admin/lists/warehouse_product/WarehouseProductLists.php index 8183d703e..3b9976f2a 100644 --- a/app/admin/lists/warehouse_product/WarehouseProductLists.php +++ b/app/admin/lists/warehouse_product/WarehouseProductLists.php @@ -89,7 +89,7 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt } if($item->product_id){ $find=StoreProduct::where('id',$item->product_id)->field('image,store_name')->find(); - $item->store_name=$find->store_name; + $item->store_name=$find->store_name.'|'.$item->product_id; $item->image=$find->image; }else{ $item->store_name=''; diff --git a/app/admin/logic/warehouse_product/WarehouseProductLogic.php b/app/admin/logic/warehouse_product/WarehouseProductLogic.php index 78b0db945..508f1f370 100644 --- a/app/admin/logic/warehouse_product/WarehouseProductLogic.php +++ b/app/admin/logic/warehouse_product/WarehouseProductLogic.php @@ -148,7 +148,7 @@ class WarehouseProductLogic extends BaseLogic if ($res) { $res->delete(); if ($res['financial_pm'] == 1) { - WarehouseProductStorege::where('warehouse_id', $res['warehouse_id'])->dec('nums', $res['nums'])->update(); + WarehouseProductStorege::where('warehouse_id', $res['warehouse_id'])->where('product_id',$res['product_id'])->dec('nums', $res['nums'])->update(); } elseif ($res['financial_pm'] == 0) { $find = SystemStoreStorage::where(['outbound_id' => $res['id']])->find(); if ($find) { @@ -162,7 +162,7 @@ class WarehouseProductLogic extends BaseLogic } $find->delete(); } - WarehouseProductStorege::where('warehouse_id', $res['warehouse_id'])->inc('nums', $res['nums'])->update(); + WarehouseProductStorege::where('warehouse_id', $res['warehouse_id'])->where('product_id',$res['product_id'])->inc('nums', $res['nums'])->update(); } return true; diff --git a/app/admin/logic/warehouse_product_storege/WarehouseProductStoregeLogic.php b/app/admin/logic/warehouse_product_storege/WarehouseProductStoregeLogic.php index a1da050dd..2bd0c5e6d 100644 --- a/app/admin/logic/warehouse_product_storege/WarehouseProductStoregeLogic.php +++ b/app/admin/logic/warehouse_product_storege/WarehouseProductStoregeLogic.php @@ -26,24 +26,7 @@ class WarehouseProductStoregeLogic extends BaseLogic */ public static function add(array $params): bool { - Db::startTrans(); - try { - WarehouseProductStorege::create([ - 'warehouse_id' => $params['warehouse_id'], - 'product_id' => $params['product_id'], - 'nums' => $params['nums'], - 'price' => $params['price'], - 'total_price' => $params['total_price'], - 'status' => $params['status'] - ]); - - Db::commit(); - return true; - } catch (\Exception $e) { - Db::rollback(); - self::setError($e->getMessage()); - return false; - } + return true; } @@ -57,24 +40,6 @@ class WarehouseProductStoregeLogic extends BaseLogic public static function edit(array $params): bool { return true; - Db::startTrans(); - try { - WarehouseProductStorege::where('id', $params['id'])->update([ - 'warehouse_id' => $params['warehouse_id'], - 'product_id' => $params['product_id'], - 'nums' => $params['nums'], - 'price' => $params['price'], - 'total_price' => $params['total_price'], - 'status' => $params['status'] - ]); - - Db::commit(); - return true; - } catch (\Exception $e) { - Db::rollback(); - self::setError($e->getMessage()); - return false; - } } @@ -100,6 +65,6 @@ class WarehouseProductStoregeLogic extends BaseLogic */ public static function detail($params): array { - return WarehouseProductStorege::findOrEmpty($params['id'])->toArray(); + return []; } } \ No newline at end of file diff --git a/app/queue/redis/StoreStorageSend.php b/app/queue/redis/StoreStorageSend.php index e9dd5bed0..be8c44b25 100644 --- a/app/queue/redis/StoreStorageSend.php +++ b/app/queue/redis/StoreStorageSend.php @@ -10,7 +10,6 @@ use app\common\model\store_branch_product_exchange\StoreBranchProductExchange; use app\common\model\store_product\StoreProduct; use app\common\model\store_product_attr_value\StoreProductAttrValue; use app\common\model\system_store_storage\SystemStoreStorage; -use app\common\model\warehouse_product_storege\WarehouseProductStorege; use Webman\RedisQueue\Consumer; use support\Log; use think\facade\Db;