mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(WarehouseOrderController): 更新仓库订单查询方法，加入软删除功能

Browse Source
This commit is contained in:
mkm 2024-09-22 12:00:36 +08:00
parent 04eabec632
commit 0c485b8433
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/admin/controller/warehouse_order/WarehouseOrderController.php
View File

@ -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'] ?? '';