From d58712a26879889fbd6fad4ac42eaf561c3a1260 Mon Sep 17 00:00:00 2001
From: lewis <604446095@qq.com>
Date: Sat, 4 Jan 2025 15:20:20 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=97=A8=E5=BA=97=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E9=94=AE=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system_store_storage/SystemStoreStorageLogic.php  | 11 ++++++++++-
 .../SystemStoreStorageController.php                  |  6 ++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/admin/logic/system_store_storage/SystemStoreStorageLogic.php b/app/admin/logic/system_store_storage/SystemStoreStorageLogic.php
index 0a9208d50..3622c5dbb 100644
--- a/app/admin/logic/system_store_storage/SystemStoreStorageLogic.php
+++ b/app/admin/logic/system_store_storage/SystemStoreStorageLogic.php
@@ -76,7 +76,7 @@ class SystemStoreStorageLogic extends BaseLogic
                         $storeBranchProduct = StoreProductLogic::ordinary(['id' => $find['product_id']], $find['store_id'], 0, $storeProduct);
                         $storeBranchProduct->stock = $find['nums'];
                         $storeBranchProduct->save();
-                        SqlChannelLog('StoreBranchProduct', $branch_product['id'], $find['nums'], 1,Request()->url());
+                        SqlChannelLog('StoreBranchProduct', $storeBranchProduct['id'], $find['nums'], 1,Request()->url());
                     }
                 }else{
                     $find->save(['status'=>1,'staff_id'=>$params['staff_id']??0,'admin_id'=>$params['admin_id']??0,'mark'=>'确认时间:'.date('Y-m-d H:i:s',time())]);
@@ -92,6 +92,15 @@ class SystemStoreStorageLogic extends BaseLogic
         }
     }
 
+    public static function editAll(array $params): bool
+    {
+        $list = SystemStoreStorage::where(['store_id' => $params['store_id'], 'status' => 0])->column('id');
+        foreach ($list as $item) {
+            $params['id'] = $item;
+            self::edit($params);
+        }
+        return true;
+    }
 
     /**
      * @notes 删除门店入库记录
diff --git a/app/store/controller/system_store_storage/SystemStoreStorageController.php b/app/store/controller/system_store_storage/SystemStoreStorageController.php
index 9acddf095..8507fb3a3 100644
--- a/app/store/controller/system_store_storage/SystemStoreStorageController.php
+++ b/app/store/controller/system_store_storage/SystemStoreStorageController.php
@@ -42,5 +42,11 @@ class SystemStoreStorageController extends BaseAdminController
         return $this->success('操作成功');
     }
 
+    public function editAll()
+    {
+        $storeId = $this->request->adminInfo['store_id'] ?? 0;
+        SystemStoreStorageLogic::editAll(['staff_id'=>$this->adminId,'admin_id'=>0, 'store_id'=>$storeId]);
+        return $this->success('操作成功');
+    }
 
 }
\ No newline at end of file

From 81968761f4d995f0a5cb7cb4fa8972e6ba567939 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 4 Jan 2025 15:20:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(warehouse):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E4=BA=A7=E5=93=81=E5=87=8F=E5=BA=93=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在查询 WarehouseProduct 时，使用 withTrashed() 方法以包含软删除的数据
- 确保在减库操作中考虑到已删除的产品，避免数据不一致的问题
---
 app/admin/logic/warehouse_product/WarehouseProductLogic.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/admin/logic/warehouse_product/WarehouseProductLogic.php b/app/admin/logic/warehouse_product/WarehouseProductLogic.php
index 29ee35a5d..76e6a4803 100644
--- a/app/admin/logic/warehouse_product/WarehouseProductLogic.php
+++ b/app/admin/logic/warehouse_product/WarehouseProductLogic.php
@@ -205,7 +205,7 @@ class WarehouseProductLogic extends BaseLogic
         try {
             $find = WarehouseOrder::where('id', $params['oid'])->find();
             if ($find) {
-                $res = WarehouseProduct::where('id', $params['id'])->find();
+                $res = WarehouseProduct::where('id', $params['id'])->withTrashed()->find();
                 self::decStock($res);
                 self::incStock($res, $params);
                 $datas = [