From 0c485b8433651ea8fd84623c6490c69fb12c0f5c Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sun, 22 Sep 2024 12:00:36 +0800
Subject: [PATCH] =?UTF-8?q?feat(WarehouseOrderController):=20=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E4=BB=93=E5=BA=93=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E5=8A=A0=E5=85=A5=E8=BD=AF=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/warehouse_order/WarehouseOrderController.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/admin/controller/warehouse_order/WarehouseOrderController.php b/app/admin/controller/warehouse_order/WarehouseOrderController.php
index 787347de1..071cfa386 100644
--- a/app/admin/controller/warehouse_order/WarehouseOrderController.php
+++ b/app/admin/controller/warehouse_order/WarehouseOrderController.php
@@ -228,9 +228,9 @@ class WarehouseOrderController extends BaseAdminController
         $total_price=0;
         foreach ($data as $key => &$value) {
             if(in_array($order['store_id'],[17,18])){
-                $find = StoreBranchProduct::where('product_id', $value->product_id)->where('store_id',$order['store_id'])->find();
+                $find = StoreBranchProduct::where('product_id', $value->product_id)->where('store_id',$order['store_id'])->withTrashed()->find();
             }else{
-                $find = StoreProduct::where('id', $value->product_id)->find();
+                $find = StoreProduct::where('id', $value->product_id)->withTrashed()->find();
             }
             $value->store_name = $find['store_name'] ?? '';
             $value->store_info = $find['store_info'] ?? '';