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

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

Browse Source 
Reviewed-on: #402
This commit is contained in:
mkm 2024-12-21 11:21:21 +08:00
commit f8345d1409
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/admin/lists/warehouse_product/WarehouseProductLists.php
View File

@ -110,13 +110,13 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt
if ($item->product_id) {
$find = StoreProduct::where('id', $item->product_id)->field('price,purchase,image,store_name,unit,store_info,top_cate_id')->withTrashed()->find();
if($find){
if($item->purchase<=0){
$item->purchase = $find->purchase;
$item->total_price=bcmul($find->purchase,$item->nums,2);
}
// if($item->purchase<=0){
// $item->purchase = $find->purchase;
// $item->total_price=bcmul($find->purchase,$item->nums,2);
// }
$item->store_name = $find->store_name . '|' . $item->product_id;
$item->image = $find->image;
$item->price = $find->price;
// $item->price = $find->price;
$item->unit_name = StoreProductUnit::where('id', $find->unit)->value('name');
$item->store_info =$find->store_info;
$item->top_cate_name =StoreCategory::where('id', $find->top_cate_id)->value('name');

14
app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php
View File

@ -212,6 +212,16 @@ class BeforehandOrderCartInfoLogic extends BaseLogic
];
$res = WarehouseOrder::create($arr);
foreach ($offer_list as $k => $v) {
if (!empty($v['source_order_info'])) {
// 采购单来源于往期补单，需要减少对应订单的入库数量
$sourceOrderInfo = reset_index($v['source_order_info'], 'source_order_id');
$orders = BeforehandOrder::field('id,order_type')->whereIn('id', array_keys($sourceOrderInfo))->select()->toArray();
foreach ($orders as $order) {
if ($order['order_type'] == 6) {
$v['buyer_nums'] = $v['buyer_nums'] - $sourceOrderInfo[$order['id']]['need_num'];
}
}
}
$data['admin_id'] = $params['admin_id'];
$data['order_type'] = $beforehandOrder['order_type'];
$data['store_id'] = 0;
@ -241,7 +251,9 @@ class BeforehandOrderCartInfoLogic extends BaseLogic
if($product_arr!=[]){
StoreProduct::where('id',$v['product_id'])->save($product_arr);
}
WarehouseProductLogic::add($data);
if ($data['nums'] > 0) {
WarehouseProductLogic::add($data);
}
PurchaseProductOffer::where('id', $v['id'])->update(['status' => 1, 'is_storage' => 1]);
}
$attrs = ['warehousing_id' => $res['id'],'is_warehousing'=>1];