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

Merge pull request 'dev' (#369) from dev into main

Browse Source 
Reviewed-on: #369
This commit is contained in:
mkm 2024-12-02 15:03:38 +08:00
commit 4ce9136f14
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/admin/lists/beforehand_order/BeforehandOrderLists.php
View File

@ -13,6 +13,7 @@ use app\common\lists\ListsExcelInterface;
use app\common\model\beforehand_order_cart_info\BeforehandOrderCartInfo; use app\common\model\beforehand_order_cart_info\BeforehandOrderCartInfo;
use app\common\model\store_order\StoreOrder; use app\common\model\store_order\StoreOrder;
use app\common\model\warehouse_order\WarehouseOrder; use app\common\model\warehouse_order\WarehouseOrder;
use app\common\model\warehouse_product\WarehouseProduct;
/** /**
* 预订单表列表 * 预订单表列表
@ -188,10 +189,14 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte
} }
} }
if($item['outbound_id']>0){ if($item['outbound_id']>0){
$warehouseOrder=WarehouseOrder::where('id',$item['outbound_id'])->field('code,total_price')->find(); $order_ck=WarehouseOrder::where('id',$item['outbound_id'])->value('code');
if($warehouseOrder){ if($order_ck){
$order_ck=$warehouseOrder['code']; $total_price=0;
$outbound_price=$warehouseOrder['total_price']; $arr= WarehouseProduct::where('oid',$item['outbound_id'])->field('nums,purchase')->select();
foreach ($arr as $k=>$v){
$total_price+=bcmul($v['nums'],$v['purchase'],2);
}
$outbound_price=$total_price;
} }
} }
$nickname = $item->other_data?->nickname??''; $nickname = $item->other_data?->nickname??'';
@ -257,9 +262,9 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte
'system_store' => '门店', 'system_store' => '门店',
'admin_name' => '门店', 'admin_name' => '门店',
'warehousing' => '入库', 'warehousing' => '入库',
'warehousing_price' => '入库金额', 'warehousing_price' => '入库采购金额',
'outbound' => '出库', 'outbound' => '出库',
'outbound_price' => '出库金额', 'outbound_price' => '出库门店供货金额',
'total_price' => '总价', 'total_price' => '总价',
'admin_name' => '用户', 'admin_name' => '用户',
'mark' => '备注', 'mark' => '备注',